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 05:56:09 +0000 Message-ID: <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="8249"; mail-complaints-to="usenet@ciao.gmane.io" To: 58676@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Oct 21 08:12:49 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 1ollGy-0001y1-NO for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 21 Oct 2022 08:12:48 +0200 Original-Received: from localhost ([::1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ollGx-0000gV-5d for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 21 Oct 2022 02:12:47 -0400 Original-Received: from [::1] (helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oll1m-0000xF-SY for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 21 Oct 2022 01:57:06 -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 1oll1i-0000wl-Vv for bug-gnu-emacs@gnu.org; Fri, 21 Oct 2022 01:57:03 -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 1oll1i-0006r5-OK for bug-gnu-emacs@gnu.org; Fri, 21 Oct 2022 01:57:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oll1i-0003C8-HM for bug-gnu-emacs@gnu.org; Fri, 21 Oct 2022 01:57: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 05:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58676 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.166633178112157 (code B ref -1); Fri, 21 Oct 2022 05:57:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 21 Oct 2022 05:56:21 +0000 Original-Received: from localhost ([127.0.0.1]:36676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oll12-0003A0-P0 for submit@debbugs.gnu.org; Fri, 21 Oct 2022 01:56:21 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:55414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oll11-00039t-04 for submit@debbugs.gnu.org; Fri, 21 Oct 2022 01:56:19 -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 1oll10-0008Jx-AC for bug-gnu-emacs@gnu.org; Fri, 21 Oct 2022 01:56:18 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oll0x-0006kd-MA for bug-gnu-emacs@gnu.org; Fri, 21 Oct 2022 01:56:18 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 7AFA9240103 for ; Fri, 21 Oct 2022 07:56:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1666331772; bh=HF7aC8g26r2qeI2l2MKnUy6QosM972wx5gpPe/Xr5KY=; h=From:To:Subject:Date:From; b=QviNwah0B828WLLmANMlEq7rgSsOXl+dTKMVKoUxOzKFi1/JfDLOCgApNFbsNROw+ ry5FnPseT5EqKJYeUWn+AE3s1Menlpp+lO0BtIP8RAb1eNP8CocJsF0eigSY3f1mzZ 0zvbVd5/hrELR2l0UqQgUrrujMlQxL4KcoWFv1ajXFiXrq0xxQ0RHqZDEdf64kSDoI I0PrFakCTaOsgJLTS5OY5u6NWh3ENf9YFeIrObhyOZQ8AZBGVwrTS1/HOxg9v01UP6 aE4A82FmjRxBrXa47GY9k/PVqQRUVRr70AIZj6pJnz1ZWBijRjZAqmJXTs2fkGRWy5 XeTWIT6NIBotA== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Mttxl3pZdz6tmM for ; Fri, 21 Oct 2022 07:56:11 +0200 (CEST) Received-SPF: pass client-ip=185.67.36.66; envelope-from=leungbk@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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:245960 Archived-At: --=-=-= Content-Type: text/plain Tags: patch In GNU Emacs 28.2 (build 1, x86_64-pc-linux-gnu, X toolkit, cairo version 1.16.0, Xaw3d scroll bars) Repository revision: emacs-28.2 Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12014000 System Description: NixOS 22.11 (Raccoon) Configured using: 'configure --prefix=/nix/store/dg76kpq89k20ciqqlrzi69xgyl6n13b0-emacs-unstable-28.2 --disable-build-details --with-modules --with-x-toolkit=lucid --with-xft --with-cairo --with-native-compilation' --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Add-nil-to-eglot-server-programs.patch >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. --- 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 --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0002-Add-lua-language-server-to-eglot-server-programs.patch >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, 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 --=-=-=--