From 4ee188898d6b6fef2cecf2e818b66467f849836a Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Wed, 5 Apr 2023 20:32:47 +0200 Subject: Revert "eglot: fix organize imports" This reverts commit a872116f0b1704a1170e948cc982533039ad0aac. The issue has been fixed in eglot 1.14. --- lisp/init-eglot.el | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'lisp/init-eglot.el') diff --git a/lisp/init-eglot.el b/lisp/init-eglot.el index a993765..5cd0cac 100644 --- a/lisp/init-eglot.el +++ b/lisp/init-eglot.el @@ -11,14 +11,6 @@ (defvar mpolden/inhibit-lsp nil "List of modes where `eglot-ensure' should not be called to enable LSP integration.") -(defun mpolden/eglot-organize-imports () - "Organize imports." - ;; this is a workaround for eglot-code-action-organize-imports not working - ;; https://github.com/joaotavora/eglot/issues/1132 - ;; https://github.com/joaotavora/eglot/issues/574#issuecomment-1401023985 - (interactive) - (eglot-code-actions nil nil "source.organizeImports" t)) - (defun mpolden/format-before-save () "Format buffer before saving." (unless (member major-mode mpolden/inhibit-format-before-save) @@ -27,7 +19,7 @@ (defun mpolden/organize-imports-before-save () "Organize imports before saving buffer." (unless (member major-mode mpolden/inhibit-organize-imports-before-save) - (mpolden/eglot-organize-imports))) + (call-interactively 'eglot-code-action-organize-imports))) (defun mpolden/eglot-before-save () "All actions that may run before saving buffer." @@ -84,7 +76,7 @@ present to satisfy `eglot-server-programs'." ;; C-c f formats buffer ("C-c f" . eglot-format) ;; C-c o organizes imports - ("C-c o" . mpolden/eglot-organize-imports) + ("C-c o" . eglot-code-action-organize-imports) ;; C-c q shows code actions (quickfix) ("C-c q" . eglot-code-actions)) :config -- cgit v1.2.3