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#59229: [PATCH] Add tree-sitter-based major modes to eglot-server-programs Date: Sat, 12 Nov 2022 22:35:38 +0000 Message-ID: <87y1sfls1x.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="40123"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Stefan Kangas To: 59229@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Nov 12 23:36:18 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 1otz6n-000ADn-Hw for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 12 Nov 2022 23:36:17 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1otz6d-0006NK-BU; Sat, 12 Nov 2022 17:36:07 -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 1otz6a-0006Mg-HF for bug-gnu-emacs@gnu.org; Sat, 12 Nov 2022 17:36:04 -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 1otz6Z-0003xR-6f for bug-gnu-emacs@gnu.org; Sat, 12 Nov 2022 17:36:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1otz6Y-0008Vo-ID for bug-gnu-emacs@gnu.org; Sat, 12 Nov 2022 17:36:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Brian Leung Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 12 Nov 2022 22:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59229 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.166829255132701 (code B ref -1); Sat, 12 Nov 2022 22:36:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 12 Nov 2022 22:35:51 +0000 Original-Received: from localhost ([127.0.0.1]:49520 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otz6N-0008VN-1Z for submit@debbugs.gnu.org; Sat, 12 Nov 2022 17:35:51 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:45470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1otz6L-0008VE-6V for submit@debbugs.gnu.org; Sat, 12 Nov 2022 17:35:49 -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 1otz6L-0006M7-0r for bug-gnu-emacs@gnu.org; Sat, 12 Nov 2022 17:35:49 -0500 Original-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 1otz6I-0003wm-RQ for bug-gnu-emacs@gnu.org; Sat, 12 Nov 2022 17:35:48 -0500 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 18B83240026 for ; Sat, 12 Nov 2022 23:35:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1668292542; bh=Xcd7IhV352l/Ygbw3c9R2siQZBU+D+2nDvCizyKf06A=; h=From:To:Cc:Subject:Date:From; b=hh4lXN7xR4Yd107xmqMzHjcBMWCf5vdDZ6dj0homL9/60WvNIMOdv/cIwbahjg5mk /dMKIgzD98vEAdopKhLWQ3EWbtL32zklqhYQWnEeknJeHn8VoljqwAHxzKoRAp/jgr srtOg4RNPqvEjd8VGtizDTbko4XWpKoLN9b3dlVqBtA+Rxxd27HGoaChgFHxRcgS9n Rp5MLGuFvFFfZ63rcGShjYU0q7tG8tbsIBUgCRDlgbqJkVn+Avdrs5Ub0IC+PdzuQb hWhGfctTI7euSPv96xtQEtEkbnXhUOoIYxY3XbcAgDktC93X6Qx/JonTq4E6Hpd3PS JTyVL6CDZyOFQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4N8r4r4kVpz6tnC; Sat, 12 Nov 2022 23:35:40 +0100 (CET) Received-SPF: pass client-ip=185.67.36.65; envelope-from=leungbk@posteo.net; helo=mout01.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, 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:247724 Archived-At: --=-=-= Content-Type: text/plain Tags: patch This adds several to-be-merged tree-sitter-based major modes to eglot. 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: be1745606354e8b34325bc9526c9bad9f7302cce 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/09jwzp79mqnhzarmaik6y4lybgkwpg1h-emacs-git-20221111.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-Add-tree-sitter-based-major-modes-to-eglot-server-pr.patch >From 263288ae801e432ca941778c8fbf5103c380dbdb Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 12 Nov 2022 14:30:37 -0800 Subject: [PATCH] Add tree-sitter-based major modes to eglot-server-programs * lisp/progmodes/eglot.el (eglot-server-programs): Update. --- lisp/progmodes/eglot.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 97c674f7aa..3620f64954 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -187,15 +187,16 @@ 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++-ts-mode c-mode c-ts-mode) + . ,(eglot-alternatives + '("clangd" "ccls"))) (((caml-mode :language-id "ocaml") (tuareg-mode :language-id "ocaml") reason-mode) . ("ocamllsp")) @@ -209,7 +210,7 @@ eglot-server-programs (go-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 +228,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.38.1 --=-=-=--