From 68f1c0b3326ea2ddd4f000616d1788af6a21794d Mon Sep 17 00:00:00 2001 From: Zedhugh Chen Date: Wed, 4 Jun 2025 08:44:39 +0800 Subject: [PATCH] update eslint.el from it's old version(emacs-flymake-eslint) --- .gitmodules | 6 +++--- lisp/init-flymake.el | 16 ++++++++-------- site-lisp/emacs-flymake-eslint | 1 - site-lisp/eslint | 1 + 4 files changed, 12 insertions(+), 12 deletions(-) delete mode 160000 site-lisp/emacs-flymake-eslint create mode 160000 site-lisp/eslint diff --git a/.gitmodules b/.gitmodules index 846dda5..ba144ef 100644 --- a/.gitmodules +++ b/.gitmodules @@ -184,9 +184,9 @@ [submodule "site-lisp/emacs-corfu-doc-terminal"] path = site-lisp/emacs-corfu-doc-terminal 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 +[submodule "site-lisp/eslint"] + path = site-lisp/eslint + url = https://github.com/zedhugh/eslint.el.git [submodule "site-lisp/plantuml-mode"] path = site-lisp/plantuml-mode url = https://github.com/skuro/plantuml-mode.git diff --git a/lisp/init-flymake.el b/lisp/init-flymake.el index 8241bf3..7a2f673 100644 --- a/lisp/init-flymake.el +++ b/lisp/init-flymake.el @@ -2,7 +2,7 @@ (require 'init-package) (add-pkg-in-pkg-dir "eslint-disable-rule") -(add-pkg-in-pkg-dir "emacs-flymake-eslint") +(add-pkg-in-pkg-dir "eslint") (defun creature/flymake-show-diagnostics-buffer-and-jump () (interactive) @@ -49,22 +49,22 @@ (autoload 'eslint-disable-rule-flymake "eslint-disable-rule-flymake") (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) +(autoload 'eslint-flymake-enable "eslint-flymake" "" t) +(autoload 'eslint-flymake-backend "eslint-flymake" "" t) -(defun eslint-disable-rule--emacs-flymake-eslint-active-p () +(defun eslint-disable-rule--eslint-flymake-active-p () "Return non nil if `flymake-eslint' is enabled in the current buffer." (and (featurep 'flymake) (or (featurep 'flymake-eslint) - (featurep 'emacs-flymake-eslint)) + (featurep 'eslint-flymake)) 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) + (setq eslint-disable-rule-flymake--checker-fn #'eslint-flymake-backend) (advice-add 'eslint-disable-rule-flymake--eslint-active-p - :override #'eslint-disable-rule--emacs-flymake-eslint-active-p)) + :override #'eslint-disable-rule--eslint-flymake-active-p)) (defun creature/flymake-add-eslint-backend () (when (and flymake-mode @@ -73,7 +73,7 @@ 'typescript-mode 'typescript-ts-base-mode 'web-mode)) - (emacs-flymake-eslint-enable))) + (eslint-flymake-enable))) (provide 'init-flymake) diff --git a/site-lisp/emacs-flymake-eslint b/site-lisp/emacs-flymake-eslint deleted file mode 160000 index 51cf07e..0000000 --- a/site-lisp/emacs-flymake-eslint +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 51cf07e53bfd06af1627e459292216ceee80c79b diff --git a/site-lisp/eslint b/site-lisp/eslint new file mode 160000 index 0000000..9dc8c53 --- /dev/null +++ b/site-lisp/eslint @@ -0,0 +1 @@ +Subproject commit 9dc8c5374f88c8952c9df995995b366f01db864f