From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#58676: Add nil and lua-language-server to eglot-server-programs Date: Fri, 21 Oct 2022 00:28:12 -0700 Message-ID: References: <875ygdwwhy.fsf@posteo.net> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39327"; mail-complaints-to="usenet@ciao.gmane.io" To: Brian Leung , 58676@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Oct 21 10:11:53 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oln8D-0009wF-Eh for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 21 Oct 2022 10:11:53 +0200 Original-Received: from localhost ([::1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oln8B-0005JI-Vz for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 21 Oct 2022 04:11:52 -0400 Original-Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olmSz-00027R-Ix for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 21 Oct 2022 03:29:17 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1olmSm-00023U-Ey for bug-gnu-emacs@gnu.org; Fri, 21 Oct 2022 03:29:06 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1olmSk-0007T5-Uc for bug-gnu-emacs@gnu.org; Fri, 21 Oct 2022 03:29:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1olmSk-0005iO-Pl for bug-gnu-emacs@gnu.org; Fri, 21 Oct 2022 03:29:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 21 Oct 2022 07:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58676 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 58676-submit@debbugs.gnu.org id=B58676.166633730221889 (code B ref 58676); Fri, 21 Oct 2022 07:29:02 +0000 Original-Received: (at 58676) by debbugs.gnu.org; 21 Oct 2022 07:28:22 +0000 Original-Received: from localhost ([127.0.0.1]:36813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olmS6-0005gz-8Z for submit@debbugs.gnu.org; Fri, 21 Oct 2022 03:28:22 -0400 Original-Received: from mail-ot1-f49.google.com ([209.85.210.49]:36496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olmS3-0005gd-B4 for 58676@debbugs.gnu.org; Fri, 21 Oct 2022 03:28:20 -0400 Original-Received: by mail-ot1-f49.google.com with SMTP id v40-20020a056830092800b00661e37421c2so1331674ott.3 for <58676@debbugs.gnu.org>; Fri, 21 Oct 2022 00:28:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:mime-version:references:in-reply-to:from :from:to:cc:subject:date:message-id:reply-to; bh=HGaKNzbZdBOCNSjyjjnrds3tb1jkUQ2CMOr2DA7ILnk=; b=pPXxh/THIS7dgpUkLH1B0GFEc80H1+mDdI6/iy24Ikzn7pcaelJw2y3eLiUFRjJAvM Nf9Hy56/yzY59VpTNTIpKWOeiX87bsB6XUBl6G0cehoHgBw9KUGBKc8LtqIZ4tkMJEJs QciCS8FxVI7ueUCvWEimORuIS6YltW2qCCuZM3m/m4D+PWUhGsbj5jQzNmwWiX5c2yMe 3EeqJT3ppPHidcz8yGC/NgTb7TcvbLCPeXGPT1uK8LgiN8M1+M2cQo6O28BThszcRlzr AqMo62oiY8RmVQiOyEcMeR0B3n4r43Hj5wQUNtb2UjDngCwzLO7z0bkP6CqRSHLAzoeZ K26w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:mime-version:references:in-reply-to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=HGaKNzbZdBOCNSjyjjnrds3tb1jkUQ2CMOr2DA7ILnk=; b=2FOA9mhe1/5i6/370BGtSgGUPQsl5btITP4mvFOgUnIWd0THRbZDxpvS2n+dmN8k+2 vEL2519XKXeq9a1h6RmbVksksuSRyNid5SiXokjZQ7ofSm9Jyzlt9+TJuMwa9J6SpVYm R31JbCyRQJJKa0Hr7uuPQ70TGnAh04eVoAEcwqXUZNNMzBw+WAKCf1BFKqvt2qEuGJ6d G1CYuIwC3kvIFDTsa7JJugaHSP/oxeJPth9/4QGVNdmhoi++clFCkOyTpi8dww3cJmG+ MY0H+sS6SqjRV/c65rq27zRWYoSWPXIQEgxxECf4z9llA1idEZovLtvrrYQRd/zRdd0i vitA== X-Gm-Message-State: ACrzQf2lO407eVBoFe0y3JAcHs5ZPIUedNWCM6GZJaITxsPHccUeE8J0 nEbv4zX6HcgyU0dccFBxghDCEVmE3KY1+aeQ5wQ= X-Google-Smtp-Source: AMsMyM60BzZhf0kgNcoQuOaFjVZO6htUtXTw+X57LZ+XGJ2cSpXupo+46AmQtK7Env+jgd8hAw4xd4N6EZyDUYuGnQw= X-Received: by 2002:a05:6830:3c1:b0:637:28be:7920 with SMTP id p1-20020a05683003c100b0063728be7920mr8982375otc.105.1666337293620; Fri, 21 Oct 2022 00:28:13 -0700 (PDT) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Fri, 21 Oct 2022 00:28:12 -0700 In-Reply-To: <875ygdwwhy.fsf@posteo.net> X-Hashcash: 1:20:221021:leungbk@posteo.net::iz7CugtYcnbpjRz4:0n9d X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:245968 Archived-At: Brian Leung writes: > Tags: patch Thanks! > From 56f5b196ab2a22f9f77109a2e85367527f0cfc97 Mon Sep 17 00:00:00 2001 > From: Brian Leung > 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 > 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