* bug#58676: Add nil and lua-language-server to eglot-server-programs @ 2022-10-21 5:56 Brian Leung 2022-10-21 7:28 ` Stefan Kangas 0 siblings, 1 reply; 4+ messages in thread From: Brian Leung @ 2022-10-21 5:56 UTC (permalink / raw) To: 58676 [-- Attachment #1: Type: text/plain, Size: 514 bytes --] Tags: patch In GNU Emacs 28.2 (build 1, x86_64-pc-linux-gnu, X toolkit, cairo version 1.16.0, Xaw3d scroll bars) Repository revision: emacs-28.2 Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12014000 System Description: NixOS 22.11 (Raccoon) Configured using: 'configure --prefix=/nix/store/dg76kpq89k20ciqqlrzi69xgyl6n13b0-emacs-unstable-28.2 --disable-build-details --with-modules --with-x-toolkit=lucid --with-xft --with-cairo --with-native-compilation' [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-Add-nil-to-eglot-server-programs.patch --] [-- Type: text/patch, Size: 1063 bytes --] From 56f5b196ab2a22f9f77109a2e85367527f0cfc97 Mon Sep 17 00:00:00 2001 From: Brian Leung <leungbk@posteo.net> Date: Wed, 21 Sep 2022 13:38:53 -0700 Subject: [PATCH 1/2] Add nil to eglot-server-programs * eglot.el (eglot-server-programs): Add nil. --- eglot.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eglot.el b/eglot.el index 901bf30..49592f6 100644 --- a/eglot.el +++ b/eglot.el @@ -218,7 +218,7 @@ language-server/bin/php-language-server.php")) . ("digestif")) (erlang-mode . ("erlang_ls" "--transport" "stdio")) (yaml-mode . ("yaml-language-server" "--stdio")) - (nix-mode . ("rnix-lsp")) + (nix-mode . ,(eglot-alternatives '("nil" "rnix-lsp"))) (gdscript-mode . ("localhost" 6008)) ((fortran-mode f90-mode) . ("fortls")) (futhark-mode . ("futhark" "lsp")) -- 2.37.3 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #3: 0002-Add-lua-language-server-to-eglot-server-programs.patch --] [-- Type: text/patch, Size: 1405 bytes --] From 5a41365bbace7b1e6533ee2664ee601dbeb36306 Mon Sep 17 00:00:00 2001 From: Brian Leung <leungbk@posteo.net> Date: Sun, 20 Feb 2022 22:21:27 -0800 Subject: [PATCH 2/2] Add lua-language-server to eglot-server-programs * eglot.el (eglot-server-programs): Add lua-language-server. It is, at the time of writing, more actively developed and more popular than the lua-lsp server, so prioritize that. --- eglot.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eglot.el b/eglot.el index 49592f6..277e04b 100644 --- a/eglot.el +++ b/eglot.el @@ -222,7 +222,8 @@ language-server/bin/php-language-server.php")) (gdscript-mode . ("localhost" 6008)) ((fortran-mode f90-mode) . ("fortls")) (futhark-mode . ("futhark" "lsp")) - (lua-mode . ("lua-lsp")) + (lua-mode . ,(eglot-alternatives + '("lua-language-server" "lua-lsp"))) (zig-mode . ("zls")) (css-mode . ,(eglot-alternatives '(("vscode-css-language-server" "--stdio") ("css-languageserver" "--stdio")))) (html-mode . ,(eglot-alternatives '(("vscode-html-language-server" "--stdio") ("html-languageserver" "--stdio")))) -- 2.37.3 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#58676: Add nil and lua-language-server to eglot-server-programs 2022-10-21 5:56 bug#58676: Add nil and lua-language-server to eglot-server-programs Brian Leung @ 2022-10-21 7:28 ` Stefan Kangas 2022-10-21 7:55 ` Brian Leung 0 siblings, 1 reply; 4+ messages in thread From: Stefan Kangas @ 2022-10-21 7:28 UTC (permalink / raw) To: Brian Leung, 58676 Brian Leung <leungbk@posteo.net> writes: > Tags: patch Thanks! > From 56f5b196ab2a22f9f77109a2e85367527f0cfc97 Mon Sep 17 00:00:00 2001 > From: Brian Leung <leungbk@posteo.net> > Date: Wed, 21 Sep 2022 13:38:53 -0700 > Subject: [PATCH 1/2] Add nil to eglot-server-programs > > * eglot.el (eglot-server-programs): Add nil. ^^^^^^^^ This should be lisp/progmodes/eglot.el. I would also clarify that "nil" is the name of a language server here, and not the Lisp symbol. (BTW, is the language server named "nil"? Weird.) > --- > eglot.el | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/eglot.el b/eglot.el > index 901bf30..49592f6 100644 > --- a/eglot.el > +++ b/eglot.el > @@ -218,7 +218,7 @@ language-server/bin/php-language-server.php")) > . ("digestif")) > (erlang-mode . ("erlang_ls" "--transport" "stdio")) > (yaml-mode . ("yaml-language-server" "--stdio")) > - (nix-mode . ("rnix-lsp")) > + (nix-mode . ,(eglot-alternatives '("nil" "rnix-lsp"))) > (gdscript-mode . ("localhost" 6008)) > ((fortran-mode f90-mode) . ("fortls")) > (futhark-mode . ("futhark" "lsp")) > -- > 2.37.3 Any rationale for why "nil" should be preferred to "rnix-lsp"? It would be good to add that to the commit message. > From 5a41365bbace7b1e6533ee2664ee601dbeb36306 Mon Sep 17 00:00:00 2001 > From: Brian Leung <leungbk@posteo.net> > Date: Sun, 20 Feb 2022 22:21:27 -0800 > Subject: [PATCH 2/2] Add lua-language-server to eglot-server-programs > > * eglot.el (eglot-server-programs): Add lua-language-server. It is, ^^^^^^^^ ^^ This should be lisp/progmodes/eglot.el. Also, our convention is to use two spaces at the end of sentences, also in commit messages. > at the time of writing, more actively developed and more popular than > the lua-lsp server, so prioritize that. > --- > eglot.el | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/eglot.el b/eglot.el > index 49592f6..277e04b 100644 > --- a/eglot.el > +++ b/eglot.el > @@ -222,7 +222,8 @@ language-server/bin/php-language-server.php")) > (gdscript-mode . ("localhost" 6008)) > ((fortran-mode f90-mode) . ("fortls")) > (futhark-mode . ("futhark" "lsp")) > - (lua-mode . ("lua-lsp")) > + (lua-mode . ,(eglot-alternatives > + '("lua-language-server" "lua-lsp"))) > (zig-mode . ("zls")) > (css-mode . ,(eglot-alternatives '(("vscode-css-language-server" "--stdio") ("css-languageserver" "--stdio")))) > (html-mode . ,(eglot-alternatives '(("vscode-html-language-server" "--stdio") ("html-languageserver" "--stdio")))) > -- > 2.37.3 ^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#58676: Add nil and lua-language-server to eglot-server-programs 2022-10-21 7:28 ` Stefan Kangas @ 2022-10-21 7:55 ` Brian Leung 2022-10-21 8:29 ` Stefan Kangas 0 siblings, 1 reply; 4+ messages in thread From: Brian Leung @ 2022-10-21 7:55 UTC (permalink / raw) To: Stefan Kangas; +Cc: 58676 [-- Attachment #1: Type: text/plain, Size: 3982 bytes --] OK, please see attached. Stefan Kangas <stefankangas@gmail.com> writes: > Brian Leung <leungbk@posteo.net> writes: > >> Tags: patch > > Thanks! > >> From 56f5b196ab2a22f9f77109a2e85367527f0cfc97 Mon Sep 17 >> 00:00:00 2001 >> From: Brian Leung <leungbk@posteo.net> >> Date: Wed, 21 Sep 2022 13:38:53 -0700 >> Subject: [PATCH 1/2] Add nil to eglot-server-programs >> >> * eglot.el (eglot-server-programs): Add nil. > ^^^^^^^^ > > This should be lisp/progmodes/eglot.el. I would also clarify > that "nil" > is the name of a language server here, and not the Lisp symbol. > > (BTW, is the language server named "nil"? Weird.) > >> --- >> eglot.el | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/eglot.el b/eglot.el >> index 901bf30..49592f6 100644 >> --- a/eglot.el >> +++ b/eglot.el >> @@ -218,7 +218,7 @@ >> language-server/bin/php-language-server.php")) >> . ("digestif")) >> (erlang-mode . ("erlang_ls" >> "--transport" "stdio")) >> (yaml-mode >> . ("yaml-language-server" >> "--stdio")) >> - (nix-mode . ("rnix-lsp")) >> + (nix-mode >> . ,(eglot-alternatives '("nil" "rnix-lsp"))) >> (gdscript-mode . ("localhost" >> 6008)) >> ((fortran-mode f90-mode) >> . ("fortls")) >> (futhark-mode . ("futhark" >> "lsp")) >> -- >> 2.37.3 > > Any rationale for why "nil" should be preferred to "rnix-lsp"? > It would > be good to add that to the commit message. > >> From 5a41365bbace7b1e6533ee2664ee601dbeb36306 Mon Sep 17 >> 00:00:00 2001 >> From: Brian Leung <leungbk@posteo.net> >> Date: Sun, 20 Feb 2022 22:21:27 -0800 >> Subject: [PATCH 2/2] Add lua-language-server to >> eglot-server-programs >> >> * eglot.el (eglot-server-programs): Add lua-language-server. It >> is, > ^^^^^^^^ > ^^ > > This should be lisp/progmodes/eglot.el. > > Also, our convention is to use two spaces at the end of > sentences, also > in commit messages. > >> at the time of writing, more actively developed and more >> popular than >> the lua-lsp server, so prioritize that. >> --- >> eglot.el | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/eglot.el b/eglot.el >> index 49592f6..277e04b 100644 >> --- a/eglot.el >> +++ b/eglot.el >> @@ -222,7 +222,8 @@ >> language-server/bin/php-language-server.php")) >> (gdscript-mode . ("localhost" >> 6008)) >> ((fortran-mode f90-mode) >> . ("fortls")) >> (futhark-mode . ("futhark" >> "lsp")) >> - (lua-mode . ("lua-lsp")) >> + (lua-mode >> . ,(eglot-alternatives >> + >> '("lua-language-server" "lua-lsp"))) >> (zig-mode . ("zls")) >> (css-mode >> . ,(eglot-alternatives >> '(("vscode-css-language-server" >> "--stdio") >> ("css-languageserver" >> "--stdio")))) >> (html-mode >> . ,(eglot-alternatives >> '(("vscode-html-language-server" >> "--stdio") >> ("html-languageserver" >> "--stdio")))) >> -- >> 2.37.3 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: lua-language-server --] [-- Type: text/x-patch, Size: 1477 bytes --] From ee9dcfdba419319cc92db0172d40a153c8752c9c Mon Sep 17 00:00:00 2001 From: Brian Leung <leungbk@posteo.net> Date: Thu, 20 Oct 2022 22:49:08 -0700 Subject: [PATCH 1/2] Add lua-language-server to eglot-server-programs * lisp/progmodes/eglot.el (eglot-server-programs): Add lua-language-server. It is, at the time of writing, more actively developed and more popular than the lua-lsp server, so prioritize that. --- lisp/progmodes/eglot.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index ada8b01fec..eb41f7f578 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -222,7 +222,8 @@ eglot-server-programs (gdscript-mode . ("localhost" 6008)) ((fortran-mode f90-mode) . ("fortls")) (futhark-mode . ("futhark" "lsp")) - (lua-mode . ("lua-lsp")) + (lua-mode . ,(eglot-alternatives + '("lua-language-server" "lua-lsp"))) (zig-mode . ("zls")) (css-mode . ,(eglot-alternatives '(("vscode-css-language-server" "--stdio") ("css-languageserver" "--stdio")))) (html-mode . ,(eglot-alternatives '(("vscode-html-language-server" "--stdio") ("html-languageserver" "--stdio")))) -- 2.37.3 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #3: nil-ls --] [-- Type: text/x-patch, Size: 1273 bytes --] From 3bb14b73a155a6563da2c00c2ca2e8eee04eaecb Mon Sep 17 00:00:00 2001 From: Brian Leung <leungbk@posteo.net> Date: Thu, 20 Oct 2022 22:47:10 -0700 Subject: [PATCH 2/2] Add the "nil" language server to eglot-server-programs * lisp/progmodes/eglot.el (eglot-server-programs): Add nil. Put it before rnix-lsp since nil is more featureful and more actively updated. See https://github.com/oxalica/nil. --- lisp/progmodes/eglot.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index eb41f7f578..71001ba680 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -218,7 +218,7 @@ eglot-server-programs . ("digestif")) (erlang-mode . ("erlang_ls" "--transport" "stdio")) (yaml-mode . ("yaml-language-server" "--stdio")) - (nix-mode . ("rnix-lsp")) + (nix-mode . ,(eglot-alternatives '("nil" "rnix-lsp"))) (gdscript-mode . ("localhost" 6008)) ((fortran-mode f90-mode) . ("fortls")) (futhark-mode . ("futhark" "lsp")) -- 2.37.3 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#58676: Add nil and lua-language-server to eglot-server-programs 2022-10-21 7:55 ` Brian Leung @ 2022-10-21 8:29 ` Stefan Kangas 0 siblings, 0 replies; 4+ messages in thread From: Stefan Kangas @ 2022-10-21 8:29 UTC (permalink / raw) To: Brian Leung; +Cc: 58676 close 58676 29.1 thanks Brian Leung <leungbk@posteo.net> writes: > OK, please see attached. Thanks! Looks good to me, so pushed to master (commit 81177e77cf and 3ad9ac25a8). For the future, please note the commit message format, where I added the bug number according to our conventions. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-10-21 8:29 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-10-21 5:56 bug#58676: Add nil and lua-language-server to eglot-server-programs Brian Leung 2022-10-21 7:28 ` Stefan Kangas 2022-10-21 7:55 ` Brian Leung 2022-10-21 8:29 ` Stefan Kangas
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/emacs.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).