From unknown Sun Jun 22 17:13:29 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#58769 <58769@debbugs.gnu.org> To: bug#58769 <58769@debbugs.gnu.org> Subject: Status: [PATCH] eglot-server-programs: Account for new modes Reply-To: bug#58769 <58769@debbugs.gnu.org> Date: Mon, 23 Jun 2025 00:13:29 +0000 retitle 58769 [PATCH] eglot-server-programs: Account for new modes reassign 58769 emacs submitter 58769 Brian Leung severity 58769 normal tag 58769 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 25 00:01:25 2022 Received: (at submit) by debbugs.gnu.org; 25 Oct 2022 04:01:26 +0000 Received: from localhost ([127.0.0.1]:49979 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onB81-0000SY-Gb for submit@debbugs.gnu.org; Tue, 25 Oct 2022 00:01:25 -0400 Received: from lists.gnu.org ([209.51.188.17]:40810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onB7y-0000SP-EG for submit@debbugs.gnu.org; Tue, 25 Oct 2022 00:01:24 -0400 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 1onB7x-0000Uk-FH for bug-gnu-emacs@gnu.org; Tue, 25 Oct 2022 00:01:21 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1onB7t-0004LD-Bf for bug-gnu-emacs@gnu.org; Tue, 25 Oct 2022 00:01:20 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 8C2A2240028 for ; Tue, 25 Oct 2022 06:01:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1666670473; bh=wvCl9w/eDjpKaiR4MDWSqtBinkHgnMQHsdFJvBylyyc=; h=From:To:Subject:Date:From; b=QFB0mMbL9fzZpsNtVQSZdQPBFtEtD7zRhIegBwQB3KKwGqpGTJtUsxGb1kPRiY11Y /nHaWc3eyiukDMVD5HbSp5zg3z4n8h/7Ik4mwbbK+SAR8W77jekNVMWs1RMf0PvpzT qFVMXdtQYkY3N7Ky936or0R2Dhv4R5wPX4CpBkLVOAKBp0158GW/KR5kMzfLE2jOx9 yZHsNcOua7x5Y3t8kXNd1d4N6561s8KT8VHt483DniX9SgxBecFho5nPa8Ef8VzcC8 zEV+v/sngYOw1DV7rKhcZYZxTYEgnwDUO7xU92kajVKlKvdqQzSVB2yrLjPNboCDZO aPWmVHxy5Lmew== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4MxJCC4RLBz6tmK for ; Tue, 25 Oct 2022 06:01:11 +0200 (CEST) From: Brian Leung To: bug-gnu-emacs@gnu.org Subject: [PATCH] eglot-server-programs: Account for new modes Date: Tue, 25 Oct 2022 04:01:09 +0000 Message-ID: <87k04osgai.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=185.67.36.65; envelope-from=leungbk@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-=-= Content-Type: text/plain Tags: patch In GNU Emacs 29.0.50 (build 1, x86_64-pc-linux-gnu, X toolkit, cairo version 1.16.0, Xaw3d scroll bars) Repository revision: 8f16578c45fc1d23aacecdb48111f816088c7b83 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/044ilan524hm57j9lhz7fqg2nxfga5n7-emacs-git-20221024.0 --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-eglot-server-programs-Account-for-new-js-json-mode.patch >From 2365a02ac3fecafcffea2e35b3852835bf0177c9 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 24 Oct 2022 20:43:50 -0700 Subject: [PATCH 1/2] eglot-server-programs: Account for new js-json-mode * lisp/progmodes/eglot.el (eglot-server-programs): Move the json-language-server info before the entry for js-mode, and add on js-json-mode. js-json-mode derives from js-mode, so the reordering is necessary to prevent js-mode's eglot server from starting if a user has something like (add-to-hook 'js-json-mode #'eglot-ensure) (add-to-hook 'js-mode #'eglot-ensure) in their config. --- 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 71001ba680..9dca05d5f0 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -186,6 +186,7 @@ eglot-server-programs (python-mode . ,(eglot-alternatives '("pylsp" "pyls" ("pyright-langserver" "--stdio") "jedi-language-server"))) + ((js-json-mode json-mode) . ,(eglot-alternatives '(("vscode-json-language-server" "--stdio") ("json-languageserver" "--stdio")))) ((js-mode typescript-mode) . ("typescript-language-server" "--stdio")) (sh-mode . ("bash-language-server" "start")) @@ -227,7 +228,6 @@ eglot-server-programs (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")))) - (json-mode . ,(eglot-alternatives '(("vscode-json-language-server" "--stdio") ("json-languageserver" "--stdio")))) (dockerfile-mode . ("docker-langserver" "--stdio")) ((clojure-mode clojurescript-mode clojurec-mode) . ("clojure-lsp")) -- 2.38.0 --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0002-eglot-server-programs-Account-for-new-ts-mode.patch >From b022569c136dc6a23e1b4cfe5e23e94cb05e233e Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 24 Oct 2022 20:46:41 -0700 Subject: [PATCH 2/2] eglot-server-programs: Account for new ts-mode * lisp/progmodes/eglot.el (eglot-server-programs): Add new major mode to be used with the typescript-language-server. At the time of writing, this exists only in the unmerged tree-sitter branch. It is not harmful to include, however. --- 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 9dca05d5f0..54756dd21a 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -187,7 +187,7 @@ eglot-server-programs . ,(eglot-alternatives '("pylsp" "pyls" ("pyright-langserver" "--stdio") "jedi-language-server"))) ((js-json-mode json-mode) . ,(eglot-alternatives '(("vscode-json-language-server" "--stdio") ("json-languageserver" "--stdio")))) - ((js-mode typescript-mode) + ((js-mode ts-mode typescript-mode) . ("typescript-language-server" "--stdio")) (sh-mode . ("bash-language-server" "start")) ((php-mode phps-mode) -- 2.38.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 25 06:26:02 2022 Received: (at control) by debbugs.gnu.org; 25 Oct 2022 10:26:02 +0000 Received: from localhost ([127.0.0.1]:50494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onH8D-0006cA-PT for submit@debbugs.gnu.org; Tue, 25 Oct 2022 06:26:02 -0400 Received: from mail-oi1-f176.google.com ([209.85.167.176]:43532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1onH8B-0006bp-4G for control@debbugs.gnu.org; Tue, 25 Oct 2022 06:25:59 -0400 Received: by mail-oi1-f176.google.com with SMTP id g10so13574446oif.10 for ; Tue, 25 Oct 2022 03:25:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=PYkWcwAYJ2wHIuIwEY+uuse/CKZpiRxEr/Xxl2uj7eM=; b=Cuq1ZLqpuj04NnyjuvqnbRA3iGkFDpXqO96mxyjvwer01XGPcl4uq/LZuvNGFBvrJS szE1M6FFEjh1DBzk9WbYWeRhsjTSgCcfun3gdHWVS0LBgI++LsDyRFxUkWYP60Rewmk+ PvPbQWy8Eukh6fG0OuigyMPZj5xbVaqVPI06bEaQ58Mr1FV38hiFugFWYcd3V7yJ8bo4 S4j2eMZLjgvHk7BHjy21Ynel/WHHAiZ0CgONt6PXL7xRLZO40etmD+N9lu1tJH1zd9ma s0p5u7QKLqzCqny0427bbLuJoEhUy3CLNTQ5hPItqDMcsR592f9bHN5lQ+WE4oqubM5P y2Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc: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=PYkWcwAYJ2wHIuIwEY+uuse/CKZpiRxEr/Xxl2uj7eM=; b=OQKiFC+RMCKXX+DcvKZmQvVX/zIhsh6UJxJJ7+mhpHpljyvi7zL3ihST0sKjWc3DN5 AnTRCP1aTcwLidIpBDvfHDrZj0Z7N4qJ7piOIgF48wIx1ANQ95wS2/znxCkYey0Rjhje d5gzS+9vl4UXT8RQE6eISXocztysDWRxFwN2alutqBXBe076RPUAzF+yeh+uZdZEmMeO Et66ZJz1O8hxH96yRKVbGRRvDjamRbawk7F8LCXb4Fie/UKuC5Kj+WOpzf19dxywaWtF uu8TC+LYKiXIKgWm3ljaMmz2N47C21riixFq0/dxdAp8exmSF59DGc2cZvgyP7xTnzay LPng== X-Gm-Message-State: ACrzQf0XnzoDEQjaD0PPc3IPNAYw/d2nkM4J+zb+QchUeKlRqRUq5bpy gZtutDwdyiujRCX/cDCX0bz/pjeuI3mwZwTCC1w= X-Google-Smtp-Source: AMsMyM73CkI0w0yjz1lySN0hY8a8HMA/SjRwEZ+I/Vi4T9XrMZcirsIMAOvP6SM221eHdZGc4YORmavSnrX+vBuwnGo= X-Received: by 2002:a05:6808:1186:b0:353:b77a:a481 with SMTP id j6-20020a056808118600b00353b77aa481mr32930206oil.199.1666693552130; Tue, 25 Oct 2022 03:25:52 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Tue, 25 Oct 2022 03:25:51 -0700 From: Stefan Kangas In-Reply-To: <87k04osgai.fsf@posteo.net> References: <87k04osgai.fsf@posteo.net> X-Hashcash: 1:20:221025:joaotavora@gmail.com::Le55ntafkAEeJ4+L:4ED5 MIME-Version: 1.0 Date: Tue, 25 Oct 2022 03:25:51 -0700 Message-ID: Subject: Re: bug#58769: [PATCH] eglot-server-programs: Account for new modes To: Brian Leung , 58769@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" Bcc: control@debbugs.gnu.org X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control Cc: =?UTF-8?B?Sm/Do28gVMOhdm9yYQ==?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) close 58769 29.1 thanks Brian Leung writes: > Tags: patch Thanks, pushed to master (commit 566e410287 and bb95e597a9). From unknown Sun Jun 22 17:13:29 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 22 Nov 2022 12:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator