From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#65673: [PATCH] Add lua-ts-mode Date: Sun, 10 Sep 2023 11:12:49 +0000 Message-ID: <87msxuxowe.fsf@posteo.net> References: <169352253839.28940.16024479871485106701-0@git.sr.ht> <20230909151834.3613907-1-jm@pub.pink> <20230909151834.3613907-2-jm@pub.pink> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="30829"; mail-complaints-to="usenet@ciao.gmane.io" Cc: arstoffel@gmail.com, maurooaranda@gmail.com, 65673@debbugs.gnu.org, ~emacs/emacs-devel@lists.sr.ht To: john muhl Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Sep 10 13:14:14 2023 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 1qfIOL-0007pr-MV for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 10 Sep 2023 13:14:13 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfIOA-0003ge-AE; Sun, 10 Sep 2023 07:14:02 -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 1qfIO6-0003eq-Rl for bug-gnu-emacs@gnu.org; Sun, 10 Sep 2023 07:13:59 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qfIO6-0007CA-EA for bug-gnu-emacs@gnu.org; Sun, 10 Sep 2023 07:13:58 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qfIO9-0000sf-Pz for bug-gnu-emacs@gnu.org; Sun, 10 Sep 2023 07:14:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 10 Sep 2023 11:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65673 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 65673-submit@debbugs.gnu.org id=B65673.16943443853309 (code B ref 65673); Sun, 10 Sep 2023 11:14:01 +0000 Original-Received: (at 65673) by debbugs.gnu.org; 10 Sep 2023 11:13:05 +0000 Original-Received: from localhost ([127.0.0.1]:49145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfIND-0000rI-D2 for submit@debbugs.gnu.org; Sun, 10 Sep 2023 07:13:05 -0400 Original-Received: from mout01.posteo.de ([185.67.36.65]:49623) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfIN9-0000ql-VR for 65673@debbugs.gnu.org; Sun, 10 Sep 2023 07:13:02 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id B06FE240028 for <65673@debbugs.gnu.org>; Sun, 10 Sep 2023 13:12:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1694344370; bh=I1NfpVbUI+I7lDXatS2W3pf/3W4TA/NWAGql+WEwmNY=; h=From:To:Cc:Subject:Autocrypt:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=KiwkhXUYWFiBMjVS3VFxsw+I/Y5x6DpHyu5lt3o+oTsKTiebaiW69TXUUOqaAz5to YT0WgkpKPe8dVW7Db6zxXqGnHgIBSh30MJFnqtR3tdL9lgRPJpUsyvIcg6ihCkRIEP Hpc8aEXb7ZNbAudbpLzl/VRLeUOQJC7L9hjbAyV1+oe+oBpUKt53fyWQiTXsAlo0/y GAdXmc+juNZs0oic175zeFKC5qSf4ktcr2wIEwvWbzz9tU8znHbEigPvMDbp1GfUg6 H3HoWDHL6XT3hRxdtNAF14zH8WnnjnA8yFyZcBhfyvA8V6ged+g9Jo7upMPw1+56ff CzrQ0VA82E8ZQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Rk6dY40g0z6ty1; Sun, 10 Sep 2023 13:12:49 +0200 (CEST) In-Reply-To: <20230909151834.3613907-2-jm@pub.pink> (john muhl's message of "Sat, 9 Sep 2023 10:17:21 -0500") Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM 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:269949 Archived-At: john muhl writes: > * lisp/progmodes/lua-ts-mode.el: > * test/lisp/progmodes/lua-ts-mode-resources/indent.erts: > * test/lisp/progmodes/lua-ts-mode-tests.el: New file. > * etc/NEWS: Mention new mode. > * lisp/progmodes/eglot.el (eglot-server-programs): > * lisp/progmodes/hideshow.el (hs-special-modes-alist): Support > lua-ts-mode. > * admin/notes/tree-sitter/build-module/batch.sh: > * admin/notes/tree-sitter/build-module/build.sh: Add Lua. > * test/infra/Dockerfile.emba: > * test/infra/test-jobs.yml: Include lua-ts-mode tests. > --- > admin/notes/tree-sitter/build-module/batch.sh | 1 + > admin/notes/tree-sitter/build-module/build.sh | 3 + > etc/NEWS | 4 + > lisp/progmodes/eglot.el | 4 +- > lisp/progmodes/hideshow.el | 1 + > lisp/progmodes/lua-ts-mode.el | 419 +++++++++++++ > test/infra/Dockerfile.emba | 1 + > test/infra/test-jobs.yml | 1 + > .../lua-ts-mode-resources/indent.erts | 152 +++++ > .../lua-ts-mode-resources/movement.erts | 553 ++++++++++++++++++ > test/lisp/progmodes/lua-ts-mode-tests.el | 36 ++ > 11 files changed, 1173 insertions(+), 2 deletions(-) > create mode 100644 lisp/progmodes/lua-ts-mode.el > create mode 100644 test/lisp/progmodes/lua-ts-mode-resources/indent.erts > create mode 100644 test/lisp/progmodes/lua-ts-mode-resources/movement.er= ts > create mode 100644 test/lisp/progmodes/lua-ts-mode-tests.el > > diff --git a/admin/notes/tree-sitter/build-module/batch.sh b/admin/notes/= tree-sitter/build-module/batch.sh > index 3c4e1472c89..9988d1eae4e 100755 > --- a/admin/notes/tree-sitter/build-module/batch.sh > +++ b/admin/notes/tree-sitter/build-module/batch.sh > @@ -16,6 +16,7 @@ languages=3D > 'java' > 'javascript' > 'json' > + 'lua' > 'python' > 'rust' > 'toml' > diff --git a/admin/notes/tree-sitter/build-module/build.sh b/admin/notes/= tree-sitter/build-module/build.sh > index 0832875168b..969187b7f92 100755 > --- a/admin/notes/tree-sitter/build-module/build.sh > +++ b/admin/notes/tree-sitter/build-module/build.sh > @@ -42,6 +42,9 @@ grammardir=3D > "heex") > org=3D"phoenixframework" > ;; > + "lua") > + org=3D"MunifTanjim" > + ;; > "typescript") > sourcedir=3D"tree-sitter-typescript/typescript/src" > grammardir=3D"tree-sitter-typescript/typescript" > diff --git a/etc/NEWS b/etc/NEWS > index 51e89fc96dd..0b7da8b392c 100644 > --- a/etc/NEWS > +++ b/etc/NEWS > @@ -782,6 +782,10 @@ It highlight parens via =E2=80=98show-paren-mode=E2= =80=99 and =E2=80=98blink-matching-paren=E2=80=99 in > a user-friendly way, avoids reporting alleged paren mismatches and makes > sexp navigation more intuitive. >=20=20 > +--- > +*** New major mode 'lua-ts-mode'. > +A major mode based on the tree-sitter library for editing Lua files. > + > --- > ** The highly accessible Modus themes collection has eight items. > The 'modus-operandi' and 'modus-vivendi' are the main themes that have > diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el > index f7c7c29c094..e2f663998d3 100644 > --- a/lisp/progmodes/eglot.el > +++ b/lisp/progmodes/eglot.el > @@ -268,8 +268,8 @@ eglot-server-programs > (gdscript-mode . ("localhost" 6008)) > ((fortran-mode f90-mode) . ("fortls")) > (futhark-mode . ("futhark" "lsp")) > - (lua-mode . ,(eglot-alternatives > - '("lua-language-server" "l= ua-lsp"))) > + ((lua-mode lua-ts-mode) . ,(eglot-altern= atives > + '("lua-langu= age-server" "lua-lsp"))) > (zig-mode . ("zls")) > ((css-mode css-ts-mode) > . ,(eglot-alternatives '(("vscode-css-l= anguage-server" "--stdio") > diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el > index b878986d7a4..78e39fad740 100644 > --- a/lisp/progmodes/hideshow.el > +++ b/lisp/progmodes/hideshow.el > @@ -264,6 +264,7 @@ hs-special-modes-alist > (java-ts-mode "{" "}" "/[*/]" nil nil) > (js-mode "{" "}" "/[*/]" nil) > (js-ts-mode "{" "}" "/[*/]" nil) > + (lua-ts-mode "{\\|\\[\\[" "}\\|\\]\\]" "--" nil) > (mhtml-mode "{\\|<[^/>]*?" "}\\|]*[^/]>" "