use "emacs-flymake-eslint" replace "flymake-eslint"

This commit is contained in:
zedhugh committed 2024-01-10 07:55:04 +08:00
1 parent 694e51c208
commit 6aacfacb67
4 files changed
+20 -37

No files matched your search

+3 -3
View File
@@ -118,9 +118,6 @@
[submodule "site-lisp/emmet-mode"] [submodule "site-lisp/emmet-mode"]
path = site-lisp/emmet-mode path = site-lisp/emmet-mode
url = https://github.com/smihica/emmet-mode.git url = https://github.com/smihica/emmet-mode.git
[submodule "site-lisp/flymake-eslint"]
path = site-lisp/flymake-eslint
url = https://github.com/orzechowskid/flymake-eslint.git
[submodule "site-lisp/eslint-disable-rule"] [submodule "site-lisp/eslint-disable-rule"]
path = site-lisp/eslint-disable-rule path = site-lisp/eslint-disable-rule
url = https://github.com/DamienCassou/eslint-disable-rule.git url = https://github.com/DamienCassou/eslint-disable-rule.git
@@ -187,3 +184,6 @@
[submodule "site-lisp/emacs-corfu-doc-terminal"] [submodule "site-lisp/emacs-corfu-doc-terminal"]
path = site-lisp/emacs-corfu-doc-terminal path = site-lisp/emacs-corfu-doc-terminal
url = https://codeberg.org/akib/emacs-corfu-doc-terminal.git url = https://codeberg.org/akib/emacs-corfu-doc-terminal.git
[submodule "site-lisp/emacs-flymake-eslint"]
path = site-lisp/emacs-flymake-eslint
url = https://github.com/zedhugh/emacs-flymake-eslint.git
+16 -33
View File
@@ -44,48 +44,31 @@
(autoload 'eslint-disable-rule-flymake "eslint-disable-rule-flymake") (autoload 'eslint-disable-rule-flymake "eslint-disable-rule-flymake")
(autoload 'eslint-disable-rule-flycheck "eslint-disable-rule-flycheck") (autoload 'eslint-disable-rule-flycheck "eslint-disable-rule-flycheck")
(autoload 'emacs-flymake-eslint-enable "emacs-flymake-eslint" "" t)
(autoload 'emacs-flymake-eslint--checker "emacs-flymake-eslint" "" t)
(defvar-local creature/eslint-inited nil (defun eslint-disable-rule--emacs-flymake-eslint-active-p ()
"Eslint inited for buffer.") "Return non nil if `flymake-eslint' is enabled in the current buffer."
(and
(featurep 'flymake)
(or (featurep 'flymake-eslint)
(featurep 'emacs-flymake-eslint))
flymake-mode
(member eslint-disable-rule-flymake--checker-fn flymake-diagnostic-functions)))
(with-eval-after-load 'eslint-disable-rule-flymake
(setq eslint-disable-rule-flymake--checker-fn #'emacs-flymake-eslint--checker)
(advice-add 'eslint-disable-rule-flymake--eslint-active-p
:override #'eslint-disable-rule--emacs-flymake-eslint-active-p))
(autoload 'flymake-eslint-enable "flymake-eslint" "" t)
(defun creature/flymake-add-eslint-backend () (defun creature/flymake-add-eslint-backend ()
(when (and flymake-mode (when (and flymake-mode
(not creature/eslint-inited)
(not (derived-mode-p 'js-json-mode 'json-mode 'json-ts-mode)) (not (derived-mode-p 'js-json-mode 'json-mode 'json-ts-mode))
(derived-mode-p 'js-base-mode (derived-mode-p 'js-base-mode
'typescript-mode 'typescript-mode
'typescript-ts-base-mode 'typescript-ts-base-mode
'web-mode)) 'web-mode))
(emacs-flymake-eslint-enable)))
;; flymake-eslint-enable 内部会再次调用 (flymake-mode 1) ,为防止无限
;; 循环调用,用 ‘creature/eslint-inited’ 记录该函数调用状态避免多次调用
(setq creature/eslint-inited t)
(flymake-eslint-enable)
(setq flymake-eslint-project-root
(creature/flymake-eslint-find-work-dir))))
(defun creature/flymake-eslint-find-work-dir ()
(let ((max-len 0)
(curr-len 0)
(temp-dir nil)
(work-dir nil))
(dolist (filename '(".eslintrc"
".eslintrc.js"
".eslintrc.cjs"
".eslintrc.yaml"
".eslintrc.yml"
".eslintrc.json"
"package.json"))
(setq temp-dir (locate-dominating-file buffer-file-name filename))
(when (stringp temp-dir)
(setq curr-len (string-bytes (file-truename temp-dir)))
(when (> curr-len max-len)
(setq max-len curr-len
work-dir temp-dir))))
work-dir))
(provide 'init-flymake) (provide 'init-flymake)