Skip to content

Commit

Permalink
Remove eslint_d support
Browse files Browse the repository at this point in the history
Remove eslint_d support because eslint_d seems to support only older versions
like ESLint 4+, 5+.
  • Loading branch information
sei40kr authored and sdwolfz committed Jan 14, 2019
1 parent 3cf3229 commit 4d5eadd
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 12 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.develop
Original file line number Diff line number Diff line change
Expand Up @@ -1739,7 +1739,6 @@ Benner and Paweł Siudak):
(thanks to Sylvain Benner)
- Open =.jsx= files with =rjsx-mode= (thanks to Thomas de Beauchêne)
- Fixes React imports when using web beautify. (thanks to Ismael)
- Prefer eslint_d to eslint (thanks to Seong Yong-ju)
**** Ruby
- Add support for =org-babel= (thanks to Muneeb Shaikh)
- Highlight debugger keywords (thanks to Alexander Berezovsky and Eivind Fonn)
Expand Down
3 changes: 1 addition & 2 deletions layers/+frameworks/react/packages.el
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
(with-eval-after-load 'flycheck
(dolist (checker '(javascript-eslint javascript-standard))
(flycheck-add-mode checker 'rjsx-mode)))
(spacemacs/enable-flycheck 'rjsx-mode)
(add-hook 'rjsx-mode-hook #'spacemacs//javascript-setup-eslint t))
(spacemacs/enable-flycheck 'rjsx-mode))

(defun react/post-init-js-doc ()
(add-hook 'rjsx-mode-hook 'spacemacs/js-doc-require)
Expand Down
7 changes: 0 additions & 7 deletions layers/+lang/javascript/funcs.el
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,6 @@
(message (concat "Tern was configured as the javascript backend but "
"the `tern' layer is not present in your `.spacemacs'!"))))


;; flycheck

(defun spacemacs//javascript-setup-eslint ()
(when-let ((found (executable-find "eslint_d")))
(set (make-local-variable 'flycheck-javascript-eslint-executable) found)))


;; js-doc

Expand Down
3 changes: 1 addition & 2 deletions layers/+lang/javascript/packages.el
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
(add-hook 'js2-mode-local-vars-hook #'spacemacs//javascript-setup-company))

(defun javascript/post-init-flycheck ()
(spacemacs/enable-flycheck 'js2-mode)
(add-hook 'js2-mode-hook #'spacemacs//javascript-setup-eslint t))
(spacemacs/enable-flycheck 'js2-mode))

(defun javascript/post-init-ggtags ()
(add-hook 'js2-mode-local-vars-hook #'spacemacs/ggtags-mode-enable))
Expand Down

0 comments on commit 4d5eadd

Please sign in to comment.