From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Theodor Thornhill via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#59252: 29.0.50; Add new ts-modes to eglot-server-programs Date: Sun, 13 Nov 2022 21:56:57 +0100 Message-ID: <87h6z2a7za.fsf@thornhill.no> Reply-To: Theodor Thornhill 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="18143"; mail-complaints-to="usenet@ciao.gmane.io" To: 59252@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Nov 13 21:58:11 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 1ouK3P-0004V8-8i for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 13 Nov 2022 21:58:11 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ouK3I-0007jN-Ay; Sun, 13 Nov 2022 15:58:04 -0500 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 1ouK3G-0007iw-Rz for bug-gnu-emacs@gnu.org; Sun, 13 Nov 2022 15:58:02 -0500 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 1ouK3G-0004PL-Jc for bug-gnu-emacs@gnu.org; Sun, 13 Nov 2022 15:58:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ouK3G-0001y2-4i for bug-gnu-emacs@gnu.org; Sun, 13 Nov 2022 15:58:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Theodor Thornhill Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 13 Nov 2022 20:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59252 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.16683730327497 (code B ref -1); Sun, 13 Nov 2022 20:58:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 13 Nov 2022 20:57:12 +0000 Original-Received: from localhost ([127.0.0.1]:48467 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ouK2R-0001wr-QV for submit@debbugs.gnu.org; Sun, 13 Nov 2022 15:57:12 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:35244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ouK2Q-0001wi-2U for submit@debbugs.gnu.org; Sun, 13 Nov 2022 15:57:10 -0500 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 1ouK2P-0007ff-PR for bug-gnu-emacs@gnu.org; Sun, 13 Nov 2022 15:57:09 -0500 Original-Received: from out0.migadu.com ([2001:41d0:2:267::]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ouK2M-0004CX-SB for bug-gnu-emacs@gnu.org; Sun, 13 Nov 2022 15:57:09 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thornhill.no; s=key1; t=1668373024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=cx/AF6xAsl2sSIXjzNJqTn8rQ4QgV8wOgxdoJk67dHU=; b=M6QyGy5u6pnftUGJhrTRSc/Bsr3BA8+UnNlhgVPzScYBCx1YY/azY6Pba6y6wwPiOBLmeS vK0l2RT4wwgFHOTao3X36fPh2ZLWXhILNBGUnXVawK2yUo2vfbOZo3tZhwvUYQnxqpfWKR ugGHyWP/4qUZrgOAa6c9Nqf/cRukUOWrB3kM7+5Va6h3+ac2Fev4GqPLagVkcbQFaOPTGL rh6HiaOpTmTdmz/prJw+eaUvyO2neLpOuhi3pVf3vrT0aeYWXAt2y0MUz1epAq5VoL39On dh5n8//6IBzuitKmj5S66mmzpbLaDy6JogL9uGMGbQGUw3ibLlOp6FdaxG5GmA== X-Migadu-Flow: FLOW_OUT Received-SPF: pass client-ip=2001:41d0:2:267::; envelope-from=theo@thornhill.no; helo=out0.migadu.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, SPF_HELO_PASS=-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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:247817 Archived-At: --=-=-= Content-Type: text/plain Hi there! It seems my new ts-mode was already added to the eglot-server-programs, so why not also add the others that were added to feature/tree-sitter? This patch fixes that :-) Theo --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Add-new-ts-modes-to-eglot-server-programs.patch >From 7ad812237470c6edeb7f2dd21cbec404c76af7a9 Mon Sep 17 00:00:00 2001 From: Theodor Thornhill Date: Sun, 13 Nov 2022 21:54:15 +0100 Subject: [PATCH] Add new *-ts-modes to eglot-server-programs * lisp/progmodes/eglot.el (eglot-server-programs): Add in the new tree-sitter powered modes. --- lisp/progmodes/eglot.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 12808e80c4..a07bbec22e 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -187,15 +187,15 @@ 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-json-mode json-mode json-ts-mode) . ,(eglot-alternatives '(("vscode-json-language-server" "--stdio") ("json-languageserver" "--stdio")))) ((js-mode ts-mode typescript-mode) . ("typescript-language-server" "--stdio")) (sh-mode . ("bash-language-server" "start")) ((php-mode phps-mode) . ("php" "vendor/felixfbecker/\ language-server/bin/php-language-server.php")) - ((c++-mode c-mode) . ,(eglot-alternatives - '("clangd" "ccls"))) + ((c++-mode c-mode c-ts-mode c++-ts-mode) + . ,(eglot-alternatives '("clangd" "ccls"))) (((caml-mode :language-id "ocaml") (tuareg-mode :language-id "ocaml") reason-mode) . ("ocamllsp")) @@ -209,7 +209,7 @@ eglot-server-programs ((go-mode go-dot-mod-mode go-dot-work-mode) . ("gopls")) ((R-mode ess-r-mode) . ("R" "--slave" "-e" "languageserver::run()")) - (java-mode . ("jdtls")) + ((java-mode java-ts-mode) . ("jdtls")) (dart-mode . ("dart" "language-server" "--client-id" "emacs.eglot-dart")) (elixir-mode . ("language_server.sh")) @@ -227,7 +227,7 @@ eglot-server-programs (lua-mode . ,(eglot-alternatives '("lua-language-server" "lua-lsp"))) (zig-mode . ("zls")) - (css-mode . ,(eglot-alternatives '(("vscode-css-language-server" "--stdio") ("css-languageserver" "--stdio")))) + ((css-mode css-ts-mode) . ,(eglot-alternatives '(("vscode-css-language-server" "--stdio") ("css-languageserver" "--stdio")))) (html-mode . ,(eglot-alternatives '(("vscode-html-language-server" "--stdio") ("html-languageserver" "--stdio")))) (dockerfile-mode . ("docker-langserver" "--stdio")) ((clojure-mode clojurescript-mode clojurec-mode) -- 2.34.1 --=-=-=--