[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: master 31945b6c3f: * lisp/progmodes/eglot.el (eglot): Ensure managed

From: João Távora
Subject: Re: master 31945b6c3f: * lisp/progmodes/eglot.el (eglot): Ensure managed-major-mode is a list
Date: Tue, 25 Oct 2022 10:35:22 +0100

Also this patch breaks M-x eglot completely (!), hehe but that was
another type of oversight that I myself commit more than occasionally.

I've just fixed it.


On Tue, Oct 25, 2022 at 10:29 AM João Távora <joaotavora@gmail.com> wrote:
Hello Stephen,

This is a relatively minor nit, but please, in future commits to the file
lisp/progmodes/eglot.el (and maybe other files), try to ensure that whitespace
which is unrelated to the thing being fixed or added does not creep in.  It
makes browsing the history of the file (which I've taken some care to preserve)
much easier.

Personally, I'm quite OK with reviewing whitespace-only cosmetic patches to that
file, as long as they are in separate commits.

If in doubt, please run the final patch by me.


On Tue, Oct 25, 2022 at 10:18 AM Stephen Leake <stephen_leake@stephe-leake.org> wrote:
branch: master
commit 31945b6c3fcbdb6f242f0063811d2fb91e4520cd
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Commit: Stephen Leake <stephen_leake@stephe-leake.org>

    * lisp/progmodes/eglot.el (eglot): Ensure managed-major-mode is a list
 lisp/progmodes/eglot.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 71001ba680..432631691c 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -229,7 +229,7 @@ language-server/bin/php-language-server.php"))
                                 (html-mode . ,(eglot-alternatives '(("vscode-html-language-server" "--stdio") ("html-languageserver" "--stdio"))))
                                 (json-mode . ,(eglot-alternatives '(("vscode-json-language-server" "--stdio") ("json-languageserver" "--stdio"))))
                                 (dockerfile-mode . ("docker-langserver" "--stdio"))
-                                ((clojure-mode clojurescript-mode clojurec-mode)
+                                ((clojure-mode clojurescript-mode clojurec-mode)
                                  . ("clojure-lsp"))
                                 (csharp-mode . ("omnisharp" "-lsp"))
                                 (purescript-mode . ("purescript-language-server" "--stdio"))
@@ -1078,6 +1078,7 @@ MANAGED-MAJOR-MODE, which matters to a minority of servers.

 INTERACTIVE is t if called interactively."
   (interactive (append (eglot--guess-contact t) '(t)))
+  (setq managed-major-mode (eglot--ensure-list managed-mode))
   (let* ((current-server (eglot-current-server))
          (live-p (and current-server (jsonrpc-running-p current-server))))
     (if (and live-p
@@ -2898,7 +2899,7 @@ for which LSP on-type-formatting should be requested."
 (defun eglot--hover-info (contents &optional _range)
   (mapconcat #'eglot--format-markup
              (if (vectorp contents) contents (list contents)) "\n"))
 (defun eglot--sig-info (sigs active-sig sig-help-active-param)
    for (sig . moresigs) on (append sigs nil) for i from 0

João Távora

João Távora

reply via email to

[Prev in Thread] Current Thread [Next in Thread]