From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Brian Leung Newsgroups: gmane.emacs.bugs Subject: bug#58676: Add nil and lua-language-server to eglot-server-programs Date: Fri, 21 Oct 2022 07:55:40 +0000 Message-ID: <87y1t9vccg.fsf@posteo.net> References: <875ygdwwhy.fsf@posteo.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5759"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 58676@debbugs.gnu.org To: Stefan Kangas Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Oct 21 10:49:17 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 1olniO-0001HM-Im for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 21 Oct 2022 10:49:16 +0200 Original-Received: from localhost ([::1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olniD-0007fD-Nw for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 21 Oct 2022 04:49:06 -0400 Original-Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1olmuq-00043S-Er for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 21 Oct 2022 03:58:04 -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 1olmuo-0003un-Kd for bug-gnu-emacs@gnu.org; Fri, 21 Oct 2022 03:58:02 -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 1olmuo-0006md-8G for bug-gnu-emacs@gnu.org; Fri, 21 Oct 2022 03:58:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1olmuo-0006Xm-43 for bug-gnu-emacs@gnu.org; Fri, 21 Oct 2022 03:58:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Brian Leung Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 21 Oct 2022 07:58: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.166633902225082 (code B ref 58676); Fri, 21 Oct 2022 07:58:02 +0000 Original-Received: (at 58676) by debbugs.gnu.org; 21 Oct 2022 07:57:02 +0000 Original-Received: from localhost ([127.0.0.1]:36884 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olmtp-0006WE-MS for submit@debbugs.gnu.org; Fri, 21 Oct 2022 03:57:02 -0400 Original-Received: from mout01.posteo.de ([185.67.36.65]:36595) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1olmtn-0006Vu-B3 for 58676@debbugs.gnu.org; Fri, 21 Oct 2022 03:57:00 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 4E7C0240026 for <58676@debbugs.gnu.org>; Fri, 21 Oct 2022 09:56:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1666339013; bh=GINYqk8u5dir5ccqq5SIbY5Zb3ZStDmV+1cOQO86kKk=; h=From:To:Cc:Subject:Date:From; b=cL0+ej0k7qZp5vFem7sKR2/ZoOVLbbdTAjyQWnJzDou29Wumpv17D9sTeXFisXArG rFF+PX8VH0MTtFbqg0XVPlwP2+gv52PdG9SCnMH2Zozm2W5e2PvtcZdu6kBeacCrMi k50XdE/iyV2mgJiVxHflFpM0d+4phSa3vZ7JnvbwF3CkKqYKe2y65DogTShEHqdzy3 iEf5nsYRdZX6Bzwoq8YDHdUiFuKCXwlEYRrqitNvXOC1LCHCEJuC791eQvAxJu0iAK 6qlsFfBZMZuVUWbG4RzJZAGqZ8aVndE4NALe63YEPvBor1K4JcMeTdUk8Sq8dxt37N 3AQuBwtueoSRg== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Mtxcx4MRsz9rxF; Fri, 21 Oct 2022 09:56:49 +0200 (CEST) In-reply-to: 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:245973 Archived-At: --=-=-= Content-Type: text/plain; format=flowed OK, please see attached. Stefan Kangas writes: > 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 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Add-lua-language-server-to-eglot-server-programs.patch Content-Description: lua-language-server >From ee9dcfdba419319cc92db0172d40a153c8752c9c Mon Sep 17 00:00:00 2001 From: Brian Leung 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 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-Add-the-nil-language-server-to-eglot-server-programs.patch Content-Description: nil-ls >From 3bb14b73a155a6563da2c00c2ca2e8eee04eaecb Mon Sep 17 00:00:00 2001 From: Brian Leung 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 --=-=-=--