bug#58676: Add nil and lua-language-server to eglot-server-programs

[Brian Leung <leungbk@posteo.net>]

[-- 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