diff --git a/lisp/init-eglot.el b/lisp/init-eglot.el index 1a6263c..70279ce 100644 --- a/lisp/init-eglot.el +++ b/lisp/init-eglot.el @@ -60,7 +60,7 @@ ;; json mode is derived from `js-mode', but json file don't need `eglot' (add-hook 'js-base-mode-hook (lambda () - (unless (derived-mode-p 'js-json-mode 'json-mode) + (unless (derived-mode-p 'js-json-mode 'json-mode 'json-ts-mode) (eglot-ensure)))) (dolist (hook '(css-mode-hook diff --git a/lisp/init-flymake.el b/lisp/init-flymake.el index cd195ba..db3ca31 100644 --- a/lisp/init-flymake.el +++ b/lisp/init-flymake.el @@ -25,14 +25,14 @@ (autoload 'eslint-disable-rule-flycheck "eslint-disable-rule-flycheck") -(defvar creature/eslint-inited nil) +(defvar-local creature/eslint-inited nil + "Eslint inited for buffer.") (autoload 'flymake-eslint-enable "flymake-eslint" "" t) (defun creature/flymake-add-eslint-backend () - (make-local-variable 'creature/eslint-inited) - (when (and flymake-mode (not creature/eslint-inited) + (not (derived-mode-p 'js-json-mode 'json-mode 'json-ts-mode)) (derived-mode-p 'js-base-mode 'typescript-mode 'typescript-ts-base-mode