From: João Távora <joaotavora@gmail.com>
Date: Tue, 14 Nov 2023 00:06:24 +0000 (+0000)
Subject: Eglot: Send standard :language-id for typescript-language-server
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=260ba357bbe;p=emacs.git

Eglot: Send standard :language-id for typescript-language-server

bug#67150

* lisp/progmodes/eglot.el (eglot-server-programs): Update
language-id for languages handled by typescript-language-server.

(cherry picked from commit 1fe949888057b0275da041288709bd5690501974)
---

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 4c5b9c30d91..dfeff7143bb 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -193,7 +193,11 @@ chosen (interactively or automatically)."
                                  . ,(eglot-alternatives '(("vscode-json-language-server" "--stdio")
                                                           ("vscode-json-languageserver" "--stdio")
                                                           ("json-languageserver" "--stdio"))))
-                                ((js-mode js-ts-mode tsx-ts-mode typescript-ts-mode typescript-mode)
+                                (((js-mode :language-id javascript)
+                                  (js-ts-mode :language-id javascript)
+                                  (tsx-ts-mode :language-id typescriptreact)
+                                  (typescript-ts-mode :language-id typescript)
+                                  (typescript-mode :language-id typescript))
                                  . ("typescript-language-server" "--stdio"))
                                 ((bash-ts-mode sh-mode) . ("bash-language-server" "start"))
                                 ((php-mode phps-mode)