From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 9 Feb 2023 10:17:18 +0000 (+0200)
Subject: Fix Scala entry in Eglot's DB of LSP servers
X-Git-Tag: emacs-29.0.90~466
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b04cce02ff4;p=emacs.git

Fix Scala entry in Eglot's DB of LSP servers

* lisp/progmodes/eglot.el (eglot-server-programs): Support Scala
LSP named "metals", in addition to "metals-emacs".  (Bug#61312)
---

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index c906890c949..58d519548e0 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -221,7 +221,8 @@ chosen (interactively or automatically)."
                                               "--client-id" "emacs.eglot-dart"))
                                 (elixir-mode . ("language_server.sh"))
                                 (ada-mode . ("ada_language_server"))
-                                (scala-mode . ("metals-emacs"))
+                                (scala-mode . ,(eglot-alternatives
+                                                '("metals" "metals-emacs")))
                                 (racket-mode . ("racket" "-l" "racket-langserver"))
                                 ((tex-mode context-mode texinfo-mode bibtex-mode)
                                  . ,(eglot-alternatives '("digestif" "texlab")))