bug#59252: 29.0.50; Add new ts-modes to eglot-server-programs

bug#59252: 29.0.50; Add new ts-modes to eglot-server-programs

[Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors]

[-- Attachment #1: Type: text/plain, Size: 189 bytes --]


Hi there!

It seems my new ts-mode was already added to the eglot-server-programs,
so why not also add the others that were added to feature/tree-sitter?

This patch fixes that :-)

Theo


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Add-new-ts-modes-to-eglot-server-programs.patch --]
[-- Type: text/x-diff, Size: 3583 bytes --]

From 7ad812237470c6edeb7f2dd21cbec404c76af7a9 Mon Sep 17 00:00:00 2001
From: Theodor Thornhill <theo@thornhill.no>
Date: Sun, 13 Nov 2022 21:54:15 +0100
Subject: [PATCH] Add new *-ts-modes to eglot-server-programs

* lisp/progmodes/eglot.el (eglot-server-programs): Add in the new
tree-sitter powered modes.
---
 lisp/progmodes/eglot.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 12808e80c4..a07bbec22e 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -187,15 +187,15 @@ eglot-server-programs
                                 (python-mode
                                  . ,(eglot-alternatives
                                      '("pylsp" "pyls" ("pyright-langserver" "--stdio") "jedi-language-server")))
-                                ((js-json-mode json-mode) . ,(eglot-alternatives '(("vscode-json-language-server" "--stdio") ("json-languageserver" "--stdio"))))
+                                ((js-json-mode json-mode json-ts-mode) . ,(eglot-alternatives '(("vscode-json-language-server" "--stdio") ("json-languageserver" "--stdio"))))
                                 ((js-mode ts-mode typescript-mode)
                                  . ("typescript-language-server" "--stdio"))
                                 (sh-mode . ("bash-language-server" "start"))
                                 ((php-mode phps-mode)
                                  . ("php" "vendor/felixfbecker/\
 language-server/bin/php-language-server.php"))
-                                ((c++-mode c-mode) . ,(eglot-alternatives
-                                                       '("clangd" "ccls")))
+                                ((c++-mode c-mode c-ts-mode c++-ts-mode)
+                                 . ,(eglot-alternatives '("clangd" "ccls")))
                                 (((caml-mode :language-id "ocaml")
                                   (tuareg-mode :language-id "ocaml") reason-mode)
                                  . ("ocamllsp"))
@@ -209,7 +209,7 @@ eglot-server-programs
                                 ((go-mode go-dot-mod-mode go-dot-work-mode) . ("gopls"))
                                 ((R-mode ess-r-mode) . ("R" "--slave" "-e"
                                                         "languageserver::run()"))
-                                (java-mode . ("jdtls"))
+                                ((java-mode java-ts-mode) . ("jdtls"))
                                 (dart-mode . ("dart" "language-server"
                                               "--client-id" "emacs.eglot-dart"))
                                 (elixir-mode . ("language_server.sh"))
@@ -227,7 +227,7 @@ eglot-server-programs
                                 (lua-mode . ,(eglot-alternatives
                                               '("lua-language-server" "lua-lsp")))
                                 (zig-mode . ("zls"))
-                                (css-mode . ,(eglot-alternatives '(("vscode-css-language-server" "--stdio") ("css-languageserver" "--stdio"))))
+                                ((css-mode css-ts-mode) . ,(eglot-alternatives '(("vscode-css-language-server" "--stdio") ("css-languageserver" "--stdio"))))
                                 (html-mode . ,(eglot-alternatives '(("vscode-html-language-server" "--stdio") ("html-languageserver" "--stdio"))))
                                 (dockerfile-mode . ("docker-langserver" "--stdio"))
                                 ((clojure-mode clojurescript-mode clojurec-mode)
-- 
2.34.1

bug#59252: 29.0.50; Add new ts-modes to eglot-server-programs

[Eli Zaretskii]

> Date: Sun, 13 Nov 2022 21:56:57 +0100
> From:  Theodor Thornhill via "Bug reports for GNU Emacs,
>  the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
> 
> It seems my new ts-mode was already added to the eglot-server-programs,
> so why not also add the others that were added to feature/tree-sitter?

Because I asked to wait with this until tree-sitter lands on master.
As you yourself know, we are still debating whether to make these
modes separate major modes or minor variations of existing modes.
There's no need to rush with trivial changes that will need to be
undone later.

bug#59252: 29.0.50; Add new ts-modes to eglot-server-programs

[Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors]

On 14 November 2022 04:25:06 CET, Eli Zaretskii <eliz@gnu.org> wrote:
>> Date: Sun, 13 Nov 2022 21:56:57 +0100
>> From:  Theodor Thornhill via "Bug reports for GNU Emacs,
>>  the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
>> 
>> It seems my new ts-mode was already added to the eglot-server-programs,
>> so why not also add the others that were added to feature/tree-sitter?
>
>Because I asked to wait with this until tree-sitter lands on master.
>As you yourself know, we are still debating whether to make these
>modes separate major modes or minor variations of existing modes.
>There's no need to rush with trivial changes that will need to be
>undone later.

Sure :-)
You can close this then.

bug#59252: 29.0.50; Add new ts-modes to eglot-server-programs

[Eli Zaretskii]

> Date: Mon, 14 Nov 2022 07:21:54 +0100
> From: Theodor Thornhill <theo@thornhill.no>
> CC: 59252@debbugs.gnu.org
> 
> 
> 
> On 14 November 2022 04:25:06 CET, Eli Zaretskii <eliz@gnu.org> wrote:
> >> Date: Sun, 13 Nov 2022 21:56:57 +0100
> >> From:  Theodor Thornhill via "Bug reports for GNU Emacs,
> >>  the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
> >> 
> >> It seems my new ts-mode was already added to the eglot-server-programs,
> >> so why not also add the others that were added to feature/tree-sitter?
> >
> >Because I asked to wait with this until tree-sitter lands on master.
> >As you yourself know, we are still debating whether to make these
> >modes separate major modes or minor variations of existing modes.
> >There's no need to rush with trivial changes that will need to be
> >undone later.
> 
> Sure :-)
> You can close this then.

Let's wait until the branch lands, and revisit this then.

Thanks.

bug#59252: 29.0.50; Add new ts-modes to eglot-server-programs

[Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Eli Zaretskii <eliz@gnu.org> writes:

>> Date: Mon, 14 Nov 2022 07:21:54 +0100
>> From: Theodor Thornhill <theo@thornhill.no>
>> CC: 59252@debbugs.gnu.org
>> 
>> 
>> 
>> On 14 November 2022 04:25:06 CET, Eli Zaretskii <eliz@gnu.org> wrote:
>> >> Date: Sun, 13 Nov 2022 21:56:57 +0100
>> >> From:  Theodor Thornhill via "Bug reports for GNU Emacs,
>> >>  the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
>> >> 
>> >> It seems my new ts-mode was already added to the eglot-server-programs,
>> >> so why not also add the others that were added to feature/tree-sitter?
>> >
>> >Because I asked to wait with this until tree-sitter lands on master.
>> >As you yourself know, we are still debating whether to make these
>> >modes separate major modes or minor variations of existing modes.
>> >There's no need to rush with trivial changes that will need to be
>> >undone later.
>> 
>> Sure :-)
>> You can close this then.
>
> Let's wait until the branch lands, and revisit this then.
>
> Thanks.

Sure!

bug#59252: 29.0.50; Add new ts-modes to eglot-server-programs

[Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors]

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]


Hi again!

>>> 
>>> Sure :-)
>>> You can close this then.
>>
>> Let's wait until the branch lands, and revisit this then.
>>

It seems like js-ts-mode is the only one missing, so here's a new patch
adding that.

Theo


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Add-js-ts-mode-to-eglot-server-programs.patch --]
[-- Type: text/x-diff, Size: 1257 bytes --]

From 2d179dd436f410bba30790fad60b04f9b338cc7b Mon Sep 17 00:00:00 2001
From: Theodor Thornhill <theo@thornhill.no>
Date: Sat, 26 Nov 2022 21:12:51 +0100
Subject: [PATCH] Add js-ts-mode to eglot-server-programs

* lisp/progmodes/eglot.el (eglot-server-programs): Add js-ts-mode as
an alternative.
---
 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 120d4feb95..7755353396 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -190,7 +190,7 @@ eglot-server-programs
                                 ((js-json-mode json-mode json-ts-mode)
                                  . ,(eglot-alternatives '(("vscode-json-language-server" "--stdio")
                                                           ("json-languageserver" "--stdio"))))
-                                ((js-mode typescript-ts-mode typescript-mode)
+                                ((js-mode js-ts-mode typescript-ts-mode typescript-mode)
                                  . ("typescript-language-server" "--stdio"))
                                 ((bash-ts-mode sh-mode) . ("bash-language-server" "start"))
                                 ((php-mode phps-mode)
-- 
2.34.1

bug#59252: 29.0.50; Add new ts-modes to eglot-server-programs

[Stefan Kangas]

Theodor Thornhill via "Bug reports for GNU Emacs, the Swiss army knife
of text editors" <bug-gnu-emacs@gnu.org> writes:

> It seems like js-ts-mode is the only one missing, so here's a new patch
> adding that.

Thanks, pushed (commit 40ff40198d) and closing this bug.

> From 2d179dd436f410bba30790fad60b04f9b338cc7b Mon Sep 17 00:00:00 2001
> From: Theodor Thornhill <theo@thornhill.no>
> Date: Sat, 26 Nov 2022 21:12:51 +0100
> Subject: [PATCH] Add js-ts-mode to eglot-server-programs
>
> * lisp/progmodes/eglot.el (eglot-server-programs): Add js-ts-mode as
> an alternative.

Please remember to add the bug number, like this:

* lisp/progmodes/eglot.el (eglot-server-programs): Add js-ts-mode as
an alternative.  (Bug#59252)

(I did that for you before pushing.)

bug#59252: 29.0.50; Add new ts-modes to eglot-server-programs

[Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors]

On 27 November 2022 08:04:52 CET, Stefan Kangas <stefankangas@gmail.com> wrote:
>Theodor Thornhill via "Bug reports for GNU Emacs, the Swiss army knife
>of text editors" <bug-gnu-emacs@gnu.org> writes:
>
>> It seems like js-ts-mode is the only one missing, so here's a new patch
>> adding that.
>
>Thanks, pushed (commit 40ff40198d) and closing this bug.
>
>> From 2d179dd436f410bba30790fad60b04f9b338cc7b Mon Sep 17 00:00:00 2001
>> From: Theodor Thornhill <theo@thornhill.no>
>> Date: Sat, 26 Nov 2022 21:12:51 +0100
>> Subject: [PATCH] Add js-ts-mode to eglot-server-programs
>>
>> * lisp/progmodes/eglot.el (eglot-server-programs): Add js-ts-mode as
>> an alternative.
>
>Please remember to add the bug number, like this:
>
>* lisp/progmodes/eglot.el (eglot-server-programs): Add js-ts-mode as
>an alternative.  (Bug#59252)
>
>(I did that for you before pushing.)

Thanks - I can start creating the bug before the patch, so that I know what the bug number will be. It just often take a really long time before I get the acknowledge for the bug :)

bug#59252: 29.0.50; Add new ts-modes to eglot-server-programs

[Eli Zaretskii]

> Date: Sun, 27 Nov 2022 08:11:00 +0100
> From: Theodor Thornhill <theo@thornhill.no>
> CC: 59252-done@debbugs.gnu.org,
>  João Távora <joaotavora@gmail.com>
> 
> >Please remember to add the bug number, like this:
> >
> >* lisp/progmodes/eglot.el (eglot-server-programs): Add js-ts-mode as
> >an alternative.  (Bug#59252)
> >
> >(I did that for you before pushing.)
> 
> Thanks - I can start creating the bug before the patch, so that I know what the bug number will be. It just often take a really long time before I get the acknowledge for the bug :)

If you send only a single message to the bug tracker, and include the patch
there, you indeed don't know the number, and then the person who pushed the
commit needs to add that.  This is okay.  There's no need to send the patch
in two parts (although you can do this if you feel like it).

But if you send an updated patch, and already know the bug number, please
add it.

Thanks.

bug#59252: 29.0.50; Add new ts-modes to eglot-server-programs

[Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors]

On 27 November 2022 08:23:29 CET, Eli Zaretskii <eliz@gnu.org> wrote:
>> Date: Sun, 27 Nov 2022 08:11:00 +0100
>> From: Theodor Thornhill <theo@thornhill.no>
>> CC: 59252-done@debbugs.gnu.org,
>>  João Távora <joaotavora@gmail.com>
>> 
>> >Please remember to add the bug number, like this:
>> >
>> >* lisp/progmodes/eglot.el (eglot-server-programs): Add js-ts-mode as
>> >an alternative.  (Bug#59252)
>> >
>> >(I did that for you before pushing.)
>> 
>> Thanks - I can start creating the bug before the patch, so that I know what the bug number will be. It just often take a really long time before I get the acknowledge for the bug :)
>
>If you send only a single message to the bug tracker, and include the patch
>there, you indeed don't know the number, and then the person who pushed the
>commit needs to add that.  This is okay.  There's no need to send the patch
>in two parts (although you can do this if you feel like it).
>
>But if you send an updated patch, and already know the bug number, please
>add it.
>
>Thanks.

Thanks, I forgot I sent an updated patch on this issue, as I sent several patches yesterday!

Will do that in the future :)
Theo