GNU logs - #76693, boring messages

Message sent to bug-gnu-emacs@HIDDEN:

Subject: bug#76693: [PATCH] Use TS to support 'hs-minor-mode' in 'lua-ts-mode'
Resent-From: jm@HIDDEN
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 02 Mar 2025 21:39:02 +0000
Resent-Message-ID: <handler.76693.B.17409515368753 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 76693 <at> debbugs.gnu.org
Feedback-ID: i74194916:Fastmail
From: jm@HIDDEN
Date: Sun, 02 Mar 2025 15:38:33 -0600
Message-ID: <87zfi3qfja.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
Received-SPF: pass client-ip=103.168.172.145; envelope-from=jm@HIDDEN;
 helo=fout-a2-smtp.messagingengine.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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,
 RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.3 (/)

Tags: patch

This changes the hs-minor-mode suppport to use tree-sitter list
things instead of regexps.

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: jm@HIDDEN
Subject: bug#76693: Acknowledgement ([PATCH] Use TS to support
 'hs-minor-mode' in 'lua-ts-mode')
Message-ID: <handler.76693.B.17409515368753.ack <at> debbugs.gnu.org>
References: <87zfi3qfja.fsf@HIDDEN>
X-Gnu-PR-Message: ack 76693
X-Gnu-PR-Package: emacs
X-Gnu-PR-Keywords: patch
Reply-To: 76693 <at> debbugs.gnu.org
Date: Sun, 02 Mar 2025 21:39:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 bug-gnu-emacs@HIDDEN

If you wish to submit further information on this problem, please
send it to 76693 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
76693: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D76693
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to bug-gnu-emacs@HIDDEN:

Subject: bug#76693: [PATCH] Use TS to support 'hs-minor-mode' in 'lua-ts-mode'
Resent-From: john muhl <jm@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 02 Mar 2025 21:47:02 +0000
Resent-Message-ID: <handler.76693.B76693.174095199011970 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 76693 <at> debbugs.gnu.org
Feedback-ID: i74194916:Fastmail
References: <87zfi3qfja.fsf@HIDDEN>
User-agent: mu4e 1.10.8; emacs 31.0.50
From: john muhl <jm@HIDDEN>
Date: Sun, 02 Mar 2025 15:45:45 -0600
In-reply-to: <87zfi3qfja.fsf@HIDDEN>
Message-ID: <87v7srqf6g.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment;
 filename=0001-Use-TS-to-support-hs-minor-mode-in-lua-ts-mode.patch

From e80d57b1f71af418642f8c13e6bdbbed92ca5339 Mon Sep 17 00:00:00 2001
From: john muhl <jm@HIDDEN>
Date: Wed, 26 Feb 2025 10:31:24 -0600
Subject: [PATCH] Use TS to support 'hs-minor-mode' in 'lua-ts-mode'

* lisp/progmodes/lua-ts-mode.el (lua-ts-mode): Add list type to
'treesit-thing-settings'.
* lisp/progmodes/hideshow.el (hs-special-modes-alist):
Remove regular expression based implementation.
* test/lisp/progmodes/lua-ts-mode-resources/hide-show.lua: New file.
* test/lisp/progmodes/lua-ts-mode-tests.el (lua-ts-test-hideshow):
Add test.  (Bug#76693)
---
 lisp/progmodes/hideshow.el                    |  1 -
 lisp/progmodes/lua-ts-mode.el                 |  7 +++-
 .../lua-ts-mode-resources/hide-show.lua       | 33 +++++++++++++++++++
 test/lisp/progmodes/lua-ts-mode-tests.el      | 12 +++++++
 4 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 test/lisp/progmodes/lua-ts-mode-resources/hide-show.lua

diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index c9b43fe8e16..c1d62fb92ab 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -266,7 +266,6 @@ hs-special-modes-alist
     (java-ts-mode "{" "}" "/[*/]" nil nil)
     (js-mode "{" "}" "/[*/]" nil)
     (js-ts-mode "{" "}" "/[*/]" nil)
-    (lua-ts-mode "{\\|\\[\\[" "}\\|\\]\\]" "--" nil)
     (mhtml-mode "{\\|<[^/>]*?" "}\\|</[^/>]*[^/]>" "<!--" mhtml-forward nil)
     ;; Add more support here.
     )
diff --git a/lisp/progmodes/lua-ts-mode.el b/lisp/progmodes/lua-ts-mode.el
index de93d0fdaba..81a9acb2405 100644
--- a/lisp/progmodes/lua-ts-mode.el
+++ b/lisp/progmodes/lua-ts-mode.el
@@ -815,7 +815,12 @@ lua-ts-mode
                                       "parenthesized_expression"
                                       "string"
                                       "table_constructor"))))
-                   (text "comment"))))
+                   (list (or function
+                             loop-statement
+                             "if_statement"
+                             "table_constructor"
+                             "parenthesized_expression"))
+                   (text (or "string" "comment")))))
 
     ;; Imenu/Outline/Which-function.
     (setq-local treesit-simple-imenu-settings
diff --git a/test/lisp/progmodes/lua-ts-mode-resources/hide-show.lua b/test/lisp/progmodes/lua-ts-mode-resources/hide-show.lua
new file mode 100644
index 00000000000..5dea5dcdb58
--- /dev/null
+++ b/test/lisp/progmodes/lua-ts-mode-resources/hide-show.lua
@@ -0,0 +1,33 @@
+--[[
+This is a
+comment block.
+]]
+local function fun ()
+    print("fun")
+end
+local f = (function ()
+    print(1)
+end)
+for i = 1, 10 do
+  print(i)
+end
+repeat
+    print("repeat")
+until false
+while true do
+    print("while")
+end
+do
+    print(1)
+end
+local t = {
+    a=1,
+    b=2,
+}
+if true then
+    print(1)
+elseif false then
+    print(0)
+else
+    print(0)
+end
diff --git a/test/lisp/progmodes/lua-ts-mode-tests.el b/test/lisp/progmodes/lua-ts-mode-tests.el
index 44c31648586..ba3fdf3fdd0 100644
--- a/test/lisp/progmodes/lua-ts-mode-tests.el
+++ b/test/lisp/progmodes/lua-ts-mode-tests.el
@@ -48,6 +48,18 @@ lua-ts-test-which-function
     (should (equal "f" (which-function)))
     (which-function-mode -1)))
 
+(ert-deftest lua-ts-test-hideshow ()
+  (skip-unless (treesit-ready-p 'lua t))
+  (with-temp-buffer
+    (insert-file-contents (ert-resource-file "hide-show.lua"))
+    (lua-ts-mode)
+    (hs-minor-mode)
+    (hs-hide-all)
+    (should (= 9 (length (overlays-in (point-min) (point-max)))))
+    (hs-show-all)
+    (should (= 0 (length (overlays-in (point-min) (point-max)))))
+    (hs-minor-mode -1)))
+
 (provide 'lua-ts-mode-tests)
 
 ;;; lua-ts-mode-tests.el ends here
-- 
2.48.1


--=-=-=
Content-Type: text/plain



jm@HIDDEN writes:

> Tags: patch
>
> This changes the hs-minor-mode suppport to use tree-sitter list
> things instead of regexps.


--=-=-=--

Message sent to bug-gnu-emacs@HIDDEN:

Subject: bug#76693: [PATCH] Use TS to support 'hs-minor-mode' in 'lua-ts-mode'
Resent-From: Juri Linkov <juri@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Mon, 03 Mar 2025 17:54:02 +0000
Resent-Message-ID: <handler.76693.B76693.174102439029066 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: john muhl <jm@HIDDEN>
Cc: 76693 <at> debbugs.gnu.org
From: Juri Linkov <juri@HIDDEN>
In-Reply-To: <87v7srqf6g.fsf@HIDDEN>
Organization: LINKOV.NET
References: <87zfi3qfja.fsf@HIDDEN> <87v7srqf6g.fsf@HIDDEN>
Date: Mon, 03 Mar 2025 19:33:50 +0200
Message-ID: <8734fu2sjd.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/31.0.50 (x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

>> This changes the hs-minor-mode suppport to use tree-sitter list
>> things instead of regexps.
>
> * lisp/progmodes/lua-ts-mode.el (lua-ts-mode): Add list type to
> 'treesit-thing-settings'.

Coincidentally this is what I'm currently doing for all ts-modes
according to the principles agreed in bug#73404.

And it's nice to see that your changes are aligned with them.

There is no need to follow these principles since only you
as the author of the ts-mode decide what is suitable for this ts-mode.

But it would just make it easier for programmers in different languages
to switch between ts-modes that will meet their expectations.

I noticed only a few things that look like omission:

1. "arguments" and "parameters" are parenthesized expressions,
   but are missing in the 'list' setting;

2. "if_statement" without the anchors "\\`...\\'" (bos/eos in rx)
   matches "elseif_statement" too.  But unlike "if_statement",
   "elseif_statement" doesn't end with the "end" keyword
   (whereas "else_statement" doesn't end with "end" too
    but correctly excluded from matching);

3. Also would be nice to support '(forward-comment 1)'
   with something like (comment ,(rx bos "comment" eos))

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#76693: [PATCH] Use TS to support 'hs-minor-mode' in 'lua-ts-mode'
Resent-From: john muhl <jm@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Tue, 04 Mar 2025 00:39:01 +0000
Resent-Message-ID: <handler.76693.B76693.17410487271348 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76693
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Juri Linkov <juri@HIDDEN>
Cc: 76693 <at> debbugs.gnu.org
X-Debbugs-Original-Cc: 76693 <at> debbugs.gnu.org, bug-gnu-emacs@HIDDEN
Received: via spool by 76693-submit <at> debbugs.gnu.org id=B76693.17410487271348
          (code B ref 76693); Tue, 04 Mar 2025 00:39:01 +0000
Received: (at 76693) by debbugs.gnu.org; 4 Mar 2025 00:38:47 +0000
Received: from localhost ([127.0.0.1]:53082 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tpGJ4-0000Lg-P3
	for submit <at> debbugs.gnu.org; Mon, 03 Mar 2025 19:38:47 -0500
Received: from fhigh-a5-smtp.messagingengine.com ([103.168.172.156]:34179)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <jm@HIDDEN>) id 1tpGJ1-0000LK-Tm
 for 76693 <at> debbugs.gnu.org; Mon, 03 Mar 2025 19:38:44 -0500
Received: from phl-compute-12.internal (phl-compute-12.phl.internal
 [10.202.2.52])
 by mailfhigh.phl.internal (Postfix) with ESMTP id BB73A11401C3;
 Mon,  3 Mar 2025 19:38:38 -0500 (EST)
Received: from phl-mailfrontend-02 ([10.202.2.163])
 by phl-compute-12.internal (MEProxy); Mon, 03 Mar 2025 19:38:38 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pub.pink; h=cc
 :cc:content-transfer-encoding:content-type:content-type:date
 :date:from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:subject:subject:to:to; s=fm1; t=1741048718;
 x=1741135118; bh=VkHsPI/w07SHhuXqZGDF9SGXpmw4fe3RByFC0MtgTVc=; b=
 N0oAsdQQGNeQbsr5kkSxG2iFhMlzkalchVQOOpibVlL12UI+kIPTwF5C0QTpvatN
 jZydXvMfr2XhoSEYx58dvByui58Rm+WEKJi+M9gy/x/ghuOQz8VaTonmLwR9nCYa
 8wmzBLIkUFSw0zYfvfOGK2oQxWgLG0EhnNnNNewaReP3/EF/9rmqiYr4Jroqfot/
 2CSZmCQQf4nw6isGzN7gWrVR9qREixa1gtsZirkplZMgwtU37rIJM/KRIjWhTqXz
 euUH2oRNc+HmGMpvm2uXF1hRcd97sAqeqLMvBlNcyL7kqg2ZI1WWcOK7Mstr6LaF
 UlsUFv9mkMqgsMAKQdScqA==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=cc:cc:content-transfer-encoding
 :content-type:content-type:date:date:feedback-id:feedback-id
 :from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:subject:subject:to:to:x-me-proxy
 :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1741048718; x=
 1741135118; bh=VkHsPI/w07SHhuXqZGDF9SGXpmw4fe3RByFC0MtgTVc=; b=Z
 GVzk+56RYTCf5FoYscVwAX5D+T4MlDh2h53u1i1jIetYEeXNa2RPE/mFw66dSzAy
 agl1OwKgUKSKNJPvfnunMryxE7NNY0eOCP/sHiLfuio5272WPQtA908wprobLLB6
 oSWgeWMQxUrP89ioX5wKk7Ims7Oldr9hNYtzliEO7KK/t4/Y+OtPeHRNUw7yCEBZ
 GnxFLmb3MCgZHvSc1s5EETpvlrDg7Ym38DnzYjaVkbvnA2eJeIaP55D3OMzBJCE4
 Y4KlK70Dai1fSV0lcrUdsKBK8ZUFL3kkNVf4atgII3b9eWvcfUqkDyeumKpVTanK
 ECPYwdRMMEfLGcZkChm3Q==
X-ME-Sender: <xms:jkvGZ4t_evSuav1_dSsMWHAPCF-rRHvFDKy-FpbZ3jzwDFElhrB-NQ>
 <xme:jkvGZ1dM2YxQ3UXgEelEIQd0Dk0B9yYijVBoGwK9mLHM_OQcLVO8s0D7b2x9Uae4i
 Bjwt2wIlS8VxSReKvg>
X-ME-Received: <xmr:jkvGZzwDsPwugBigRS9zCDHTUs1QAojNqoHw8a-gbSdwijG6O0XcXQ>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddutddtheekucetufdoteggodetrf
 dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv
 pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih
 gvnhhtshculddquddttddmnecujfgurhepfhgfhffvvefuffgjkfggtgfgsehtqhertddt
 reejnecuhfhrohhmpehjohhhnhcumhhuhhhluceojhhmsehpuhgsrdhpihhnkheqnecugg
 ftrfgrthhtvghrnhepieeuudegtdevheejheduueeiuddukeffkedvkeekfefhveegtedv
 udegffeuleehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh
 homhepjhhmsehpuhgsrdhpihhnkhdpnhgspghrtghpthhtohepfedpmhhouggvpehsmhht
 phhouhhtpdhrtghpthhtohepsghughdqghhnuhdqvghmrggtshesghhnuhdrohhrghdprh
 gtphhtthhopeejieeileefseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohep
 jhhurhhisehlihhnkhhovhdrnhgvth
X-ME-Proxy: <xmx:jkvGZ7O0DAIlsWyN4paEFVZaGfChHnH3zQdWEGFt8J00VTWMsi9VDA>
 <xmx:jkvGZ4-GCVV3zHNI4PaSMcWJ6U0k20ya2XdxyMGs5SZYj41_IlOwAA>
 <xmx:jkvGZzVhrVL9St4p_UnZjvot7Heb25AuNmuvKPbLhMdczRqS9T_0pA>
 <xmx:jkvGZxeTof49ujO6galMIDhtQEUV3mJCRbGMNT1ZvcGNEDtiXajimw>
 <xmx:jkvGZ3bYCjWcdxopW6Ln99wrbAEflqlEDNyTRRhr2qsLyuFQWOZRM19X>
Feedback-ID: i74194916:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon,
 3 Mar 2025 19:38:37 -0500 (EST)
References: <87zfi3qfja.fsf@HIDDEN> <87v7srqf6g.fsf@HIDDEN>
 <8734fu2sjd.fsf@HIDDEN>
User-agent: mu4e 1.10.8; emacs 31.0.50
From: john muhl <jm@HIDDEN>
Date: Mon, 03 Mar 2025 18:33:03 -0600
In-reply-to: <8734fu2sjd.fsf@HIDDEN>
Message-ID: <87senty6id.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)


Juri Linkov <juri@HIDDEN> writes:

>>> This changes the hs-minor-mode suppport to use tree-sitter list
>>> things instead of regexps.
>>
>> * lisp/progmodes/lua-ts-mode.el (lua-ts-mode): Add list type to
>> 'treesit-thing-settings'.
>
> Coincidentally this is what I'm currently doing for all ts-modes
> according to the principles agreed in bug#73404.
>
> And it's nice to see that your changes are aligned with them.

That=E2=80=99s good to hear.

> There is no need to follow these principles since only you
> as the author of the ts-mode decide what is suitable for this ts-mode.
>
> But it would just make it easier for programmers in different languages
> to switch between ts-modes that will meet their expectations.
>
> I noticed only a few things that look like omission:
>
> 1. "arguments" and "parameters" are parenthesized expressions,
>    but are missing in the 'list' setting;
>
> 2. "if_statement" without the anchors "\\`...\\'" (bos/eos in rx)
>    matches "elseif_statement" too.  But unlike "if_statement",
>    "elseif_statement" doesn't end with the "end" keyword
>    (whereas "else_statement" doesn't end with "end" too
>     but correctly excluded from matching);
>
> 3. Also would be nice to support '(forward-comment 1)'
>    with something like (comment ,(rx bos "comment" eos))

Sounds good. I was aiming for parity with lua-mode but no reason
to stop there. I=E2=80=99ll get an updated patch over soon.

Thanks for the help.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#76693: [PATCH] Use TS to support 'hs-minor-mode' in 'lua-ts-mode'
Resent-From: john muhl <jm@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Tue, 04 Mar 2025 00:40:02 +0000
Resent-Message-ID: <handler.76693.B.17410487461420 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76693
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: Juri Linkov <juri@HIDDEN>
Cc: 76693 <at> debbugs.gnu.org
X-Debbugs-Original-Cc: 76693 <at> debbugs.gnu.org, bug-gnu-emacs@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.17410487461420
          (code B ref -1); Tue, 04 Mar 2025 00:40:02 +0000
Received: (at submit) by debbugs.gnu.org; 4 Mar 2025 00:39:06 +0000
Received: from localhost ([127.0.0.1]:53088 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tpGJO-0000Mp-7W
	for submit <at> debbugs.gnu.org; Mon, 03 Mar 2025 19:39:06 -0500
Received: from lists.gnu.org ([2001:470:142::17]:40290)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <jm@HIDDEN>) id 1tpGJL-0000M3-L5
 for submit <at> debbugs.gnu.org; Mon, 03 Mar 2025 19:39:04 -0500
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 <jm@HIDDEN>) id 1tpGJF-0004jy-G4
 for bug-gnu-emacs@HIDDEN; Mon, 03 Mar 2025 19:38:57 -0500
Received: from fhigh-a5-smtp.messagingengine.com ([103.168.172.156])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <jm@HIDDEN>) id 1tpGJD-0005oC-Ha
 for bug-gnu-emacs@HIDDEN; Mon, 03 Mar 2025 19:38:57 -0500
Received: from phl-compute-12.internal (phl-compute-12.phl.internal
 [10.202.2.52])
 by mailfhigh.phl.internal (Postfix) with ESMTP id BB73A11401C3;
 Mon,  3 Mar 2025 19:38:38 -0500 (EST)
Received: from phl-mailfrontend-02 ([10.202.2.163])
 by phl-compute-12.internal (MEProxy); Mon, 03 Mar 2025 19:38:38 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pub.pink; h=cc
 :cc:content-transfer-encoding:content-type:content-type:date
 :date:from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:subject:subject:to:to; s=fm1; t=1741048718;
 x=1741135118; bh=VkHsPI/w07SHhuXqZGDF9SGXpmw4fe3RByFC0MtgTVc=; b=
 N0oAsdQQGNeQbsr5kkSxG2iFhMlzkalchVQOOpibVlL12UI+kIPTwF5C0QTpvatN
 jZydXvMfr2XhoSEYx58dvByui58Rm+WEKJi+M9gy/x/ghuOQz8VaTonmLwR9nCYa
 8wmzBLIkUFSw0zYfvfOGK2oQxWgLG0EhnNnNNewaReP3/EF/9rmqiYr4Jroqfot/
 2CSZmCQQf4nw6isGzN7gWrVR9qREixa1gtsZirkplZMgwtU37rIJM/KRIjWhTqXz
 euUH2oRNc+HmGMpvm2uXF1hRcd97sAqeqLMvBlNcyL7kqg2ZI1WWcOK7Mstr6LaF
 UlsUFv9mkMqgsMAKQdScqA==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=cc:cc:content-transfer-encoding
 :content-type:content-type:date:date:feedback-id:feedback-id
 :from:from:in-reply-to:in-reply-to:message-id:mime-version
 :references:reply-to:subject:subject:to:to:x-me-proxy
 :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1741048718; x=
 1741135118; bh=VkHsPI/w07SHhuXqZGDF9SGXpmw4fe3RByFC0MtgTVc=; b=Z
 GVzk+56RYTCf5FoYscVwAX5D+T4MlDh2h53u1i1jIetYEeXNa2RPE/mFw66dSzAy
 agl1OwKgUKSKNJPvfnunMryxE7NNY0eOCP/sHiLfuio5272WPQtA908wprobLLB6
 oSWgeWMQxUrP89ioX5wKk7Ims7Oldr9hNYtzliEO7KK/t4/Y+OtPeHRNUw7yCEBZ
 GnxFLmb3MCgZHvSc1s5EETpvlrDg7Ym38DnzYjaVkbvnA2eJeIaP55D3OMzBJCE4
 Y4KlK70Dai1fSV0lcrUdsKBK8ZUFL3kkNVf4atgII3b9eWvcfUqkDyeumKpVTanK
 ECPYwdRMMEfLGcZkChm3Q==
X-ME-Sender: <xms:jkvGZ4t_evSuav1_dSsMWHAPCF-rRHvFDKy-FpbZ3jzwDFElhrB-NQ>
 <xme:jkvGZ1dM2YxQ3UXgEelEIQd0Dk0B9yYijVBoGwK9mLHM_OQcLVO8s0D7b2x9Uae4i
 Bjwt2wIlS8VxSReKvg>
X-ME-Received: <xmr:jkvGZzwDsPwugBigRS9zCDHTUs1QAojNqoHw8a-gbSdwijG6O0XcXQ>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddutddtheekucetufdoteggodetrf
 dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv
 pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih
 gvnhhtshculddquddttddmnecujfgurhepfhgfhffvvefuffgjkfggtgfgsehtqhertddt
 reejnecuhfhrohhmpehjohhhnhcumhhuhhhluceojhhmsehpuhgsrdhpihhnkheqnecugg
 ftrfgrthhtvghrnhepieeuudegtdevheejheduueeiuddukeffkedvkeekfefhveegtedv
 udegffeuleehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh
 homhepjhhmsehpuhgsrdhpihhnkhdpnhgspghrtghpthhtohepfedpmhhouggvpehsmhht
 phhouhhtpdhrtghpthhtohepsghughdqghhnuhdqvghmrggtshesghhnuhdrohhrghdprh
 gtphhtthhopeejieeileefseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohep
 jhhurhhisehlihhnkhhovhdrnhgvth
X-ME-Proxy: <xmx:jkvGZ7O0DAIlsWyN4paEFVZaGfChHnH3zQdWEGFt8J00VTWMsi9VDA>
 <xmx:jkvGZ4-GCVV3zHNI4PaSMcWJ6U0k20ya2XdxyMGs5SZYj41_IlOwAA>
 <xmx:jkvGZzVhrVL9St4p_UnZjvot7Heb25AuNmuvKPbLhMdczRqS9T_0pA>
 <xmx:jkvGZxeTof49ujO6galMIDhtQEUV3mJCRbGMNT1ZvcGNEDtiXajimw>
 <xmx:jkvGZ3bYCjWcdxopW6Ln99wrbAEflqlEDNyTRRhr2qsLyuFQWOZRM19X>
Feedback-ID: i74194916:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon,
 3 Mar 2025 19:38:37 -0500 (EST)
References: <87zfi3qfja.fsf@HIDDEN> <87v7srqf6g.fsf@HIDDEN>
 <8734fu2sjd.fsf@HIDDEN>
User-agent: mu4e 1.10.8; emacs 31.0.50
From: john muhl <jm@HIDDEN>
Date: Mon, 03 Mar 2025 18:33:03 -0600
In-reply-to: <8734fu2sjd.fsf@HIDDEN>
Message-ID: <87senty6id.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass client-ip=103.168.172.156; envelope-from=jm@HIDDEN;
 helo=fhigh-a5-smtp.messagingengine.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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,
 RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.4 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  Juri Linkov <juri@HIDDEN> writes: >>> This changes the
 hs-minor-mode suppport to use tree-sitter list >>> things instead of regexps.
 >> >> * lisp/progmodes/lua-ts-mode.el (lua-ts-mode): Add list type to >>
 'treesit-thing-settings'. > [...] 
 Content analysis details:   (1.4 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL
 blocklist [URIs: linkov.net]
 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL
 blocklist [URIs: linkov.net]
 -0.0 SPF_HELO_PASS          SPF: HELO matches SPF record
 0.7 SPF_NEUTRAL            SPF: sender does not match SPF record (neutral)
 -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at https://www.dnswl.org/,
 no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org]
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.4 (/)


Juri Linkov <juri@HIDDEN> writes:

>>> This changes the hs-minor-mode suppport to use tree-sitter list
>>> things instead of regexps.
>>
>> * lisp/progmodes/lua-ts-mode.el (lua-ts-mode): Add list type to
>> 'treesit-thing-settings'.
>
> Coincidentally this is what I'm currently doing for all ts-modes
> according to the principles agreed in bug#73404.
>
> And it's nice to see that your changes are aligned with them.

That=E2=80=99s good to hear.

> There is no need to follow these principles since only you
> as the author of the ts-mode decide what is suitable for this ts-mode.
>
> But it would just make it easier for programmers in different languages
> to switch between ts-modes that will meet their expectations.
>
> I noticed only a few things that look like omission:
>
> 1. "arguments" and "parameters" are parenthesized expressions,
>    but are missing in the 'list' setting;
>
> 2. "if_statement" without the anchors "\\`...\\'" (bos/eos in rx)
>    matches "elseif_statement" too.  But unlike "if_statement",
>    "elseif_statement" doesn't end with the "end" keyword
>    (whereas "else_statement" doesn't end with "end" too
>     but correctly excluded from matching);
>
> 3. Also would be nice to support '(forward-comment 1)'
>    with something like (comment ,(rx bos "comment" eos))

Sounds good. I was aiming for parity with lua-mode but no reason
to stop there. I=E2=80=99ll get an updated patch over soon.

Thanks for the help.

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#76693: [PATCH] Use TS to support 'hs-minor-mode' in 'lua-ts-mode'
Resent-From: john muhl <jm@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Fri, 07 Mar 2025 14:32:01 +0000
Resent-Message-ID: <handler.76693.B76693.174135790119008 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76693
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: 76693 <at> debbugs.gnu.org
Cc: Juri Linkov <juri@HIDDEN>
Received: via spool by 76693-submit <at> debbugs.gnu.org id=B76693.174135790119008
          (code B ref 76693); Fri, 07 Mar 2025 14:32:01 +0000
Received: (at 76693) by debbugs.gnu.org; 7 Mar 2025 14:31:41 +0000
Received: from localhost ([127.0.0.1]:47582 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tqYjk-0004wR-NM
	for submit <at> debbugs.gnu.org; Fri, 07 Mar 2025 09:31:41 -0500
Received: from fout-a7-smtp.messagingengine.com ([103.168.172.150]:55587)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <jm@HIDDEN>) id 1tqYjg-0004w9-Uq
 for 76693 <at> debbugs.gnu.org; Fri, 07 Mar 2025 09:31:38 -0500
Received: from phl-compute-12.internal (phl-compute-12.phl.internal
 [10.202.2.52])
 by mailfout.phl.internal (Postfix) with ESMTP id 2DED11381136;
 Fri,  7 Mar 2025 09:31:31 -0500 (EST)
Received: from phl-mailfrontend-01 ([10.202.2.162])
 by phl-compute-12.internal (MEProxy); Fri, 07 Mar 2025 09:31:31 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pub.pink; h=cc
 :cc:content-type:content-type:date:date:from:from:in-reply-to
 :in-reply-to:message-id:mime-version:references:reply-to:subject
 :subject:to:to; s=fm1; t=1741357891; x=1741444291; bh=xt81DblGBv
 3MG3MpAZqa5A4h3VnVDPAjHYFuVwrinrM=; b=VgiXiSOyDx8ciqLWFBQZlv0ekL
 5PmDng9t7JjFp5js6/P0bZG7q7ZjeneMjBXQ+9dGSI6zl7xNva/5dyr/R4M6dbV2
 BIftjNe/qcH0qohDTNyP/txuc4SdMW2N947njnbfh6UL9bY1SPhkkr3mB2juNCe8
 L+9Pu8vYT2wUwCKWG92hX58yo0EojmvqzPX2cNOz9wyPFwCmneTWbAljw1mbDtrs
 lozZwJtzhDiiR8BUJK4X+kSikIUS+5Q7jxUKJMdTogsRTDVYHSNvFYiY5AbNAQdz
 y7Zy0mSuVlsXosfSzDRyqnj2OUZKYetIxrwFxk2johc/O3fS1B0SxtjEwvzA==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=cc:cc:content-type:content-type:date:date
 :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to
 :message-id:mime-version:references:reply-to:subject:subject:to
 :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=
 1741357891; x=1741444291; bh=xt81DblGBv3MG3MpAZqa5A4h3VnVDPAjHYF
 uVwrinrM=; b=ZyqLtZMAfzlFm4tfaBMvzAkDqw0yCAkarJEoD8D4YuP2jTPk8vJ
 LDUU/f8lymoys2BiD3T2gCevbjs9pAznEizbQFPQy7DZM0j6SQrEokrVqVQyAklE
 mN9ItlpZ8YEye13HM/U6VnLC2eFutc0GjJP4Q8A3Bwjp9zpQYym3cQNdmA+InmB3
 Hq1xxwgg8gEVQH7r0ATx7Lau+2N/J9I66n+l02QyPkWGpo8GdCCBblMP0wi74Tg4
 8Dl/Ot6FjAeB9Kfze65YHvplx8iGw7krUqA7K1s1POxMjRBKtukKwvuRBBYPB9gc
 GuGMe5FE6NaZRCQRlV5/ms/rmRkJMzZzU8g==
X-ME-Sender: <xms:QgPLZwa399sP85VX9cmNGbauj_60jrKDj--d3zSH7_EwIijPp5e60A>
 <xme:QgPLZ7ZtZmw9RNmBmWFEvdX4C3ZuCBFRM6b7tgUaHaWwrOSyxbQ1g6yV2I-l-7qzo
 nC0lTa64MZ8kY0Y2eQ>
X-ME-Received: <xmr:QgPLZ6-SVh3f7GcHpaqQDWWD5Eg4gXtnLgNkuECtBT65WBYv2FPjsQ>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduuddtledtucetufdoteggodetrf
 dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv
 pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih
 gvnhhtshculddquddttddmnecujfgurhepfhgfhffvvefuffgjkfggtgesmhdtreertder
 jeenucfhrhhomhepjhhohhhnuchmuhhhlhcuoehjmhesphhusgdrphhinhhkqeenucggtf
 frrghtthgvrhhnpefgjeevfeelhfelleehieeiveeuudfhvedvhfetgeffheffkedukeet
 ueejffeuhfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh
 hmpehjmhesphhusgdrphhinhhkpdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhp
 ohhuthdprhgtphhtthhopehjuhhriheslhhinhhkohhvrdhnvghtpdhrtghpthhtohepje
 eiieelfeesuggvsggsuhhgshdrghhnuhdrohhrgh
X-ME-Proxy: <xmx:QgPLZ6oa3YUG0bKyjXPQYLeEkghzlZ4xh1GsdDBViYadpT1O0wcDaA>
 <xmx:QgPLZ7raFOKUXvM08-6-aa5TbB1XdAugeD81EY6TunSKcNo8gFW9LA>
 <xmx:QgPLZ4TZwm9jPMo8bKkEAm9THO3J0hVKyy2L-UtGK9AXOdhK-dgaDA>
 <xmx:QgPLZ7rGsBVSE6GAY782ZwVJ1fdvbA2mR7ZD9yOJrXvc3rB1FPfpZQ>
 <xmx:QwPLZy3FNvjd-k7UKPd7me8tOHWrAMDRuIFRwqRxvntffYclgnB4CfEF>
Feedback-ID: i74194916:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri,
 7 Mar 2025 09:31:30 -0500 (EST)
References: <87zfi3qfja.fsf@HIDDEN> <87v7srqf6g.fsf@HIDDEN>
 <8734fu2sjd.fsf@HIDDEN> <87senty6id.fsf@HIDDEN>
User-agent: mu4e 1.10.8; emacs 31.0.50
From: john muhl <jm@HIDDEN>
Date: Fri, 07 Mar 2025 08:29:55 -0600
In-reply-to: <87senty6id.fsf@HIDDEN>
Message-ID: <877c50x683.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

Updated patch with Juri=E2=80=99s feedback.


--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment;
 filename=0001-Use-TS-to-support-hs-minor-mode-in-lua-ts-mode.patch

From 5f4d527a4a53a0fe7b46dc25a64f2bd3bc7337ce Mon Sep 17 00:00:00 2001
From: john muhl <jm@HIDDEN>
Date: Wed, 26 Feb 2025 10:31:24 -0600
Subject: [PATCH] Use TS to support 'hs-minor-mode' in 'lua-ts-mode'

* lisp/progmodes/lua-ts-mode.el (lua-ts-mode): Add list type to
'treesit-thing-settings'.
* lisp/progmodes/hideshow.el (hs-special-modes-alist):
Remove regular expression based implementation.
* test/lisp/progmodes/lua-ts-mode-resources/hide-show.lua: New file.
* test/lisp/progmodes/lua-ts-mode-tests.el (lua-ts-test-hideshow):
Add test.  (Bug#76693)
---
 lisp/progmodes/hideshow.el                    |  1 -
 lisp/progmodes/lua-ts-mode.el                 | 46 +++++++++++--------
 .../lua-ts-mode-resources/hide-show.lua       | 43 +++++++++++++++++
 test/lisp/progmodes/lua-ts-mode-tests.el      | 13 ++++++
 4 files changed, 83 insertions(+), 20 deletions(-)
 create mode 100644 test/lisp/progmodes/lua-ts-mode-resources/hide-show.lua

diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index c9b43fe8e16..c1d62fb92ab 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -266,7 +266,6 @@ hs-special-modes-alist
     (java-ts-mode "{" "}" "/[*/]" nil nil)
     (js-mode "{" "}" "/[*/]" nil)
     (js-ts-mode "{" "}" "/[*/]" nil)
-    (lua-ts-mode "{\\|\\[\\[" "}\\|\\]\\]" "--" nil)
     (mhtml-mode "{\\|<[^/>]*?" "}\\|</[^/>]*[^/]>" "<!--" mhtml-forward nil)
     ;; Add more support here.
     )
diff --git a/lisp/progmodes/lua-ts-mode.el b/lisp/progmodes/lua-ts-mode.el
index de93d0fdaba..b4025c23649 100644
--- a/lisp/progmodes/lua-ts-mode.el
+++ b/lisp/progmodes/lua-ts-mode.el
@@ -791,31 +791,39 @@ lua-ts-mode
                 (rx (or "function_declaration" "function_definition")))
     (setq-local treesit-thing-settings
                 `((lua
-                   (function ,(rx (or "function_declaration"
-                                      "function_definition")))
+                   (function (or "function_declaration"
+                                 "function_definition"))
                    (keyword ,(regexp-opt lua-ts--keywords 'symbols))
-                   (loop-statement ,(rx (or "do_statement"
-                                            "for_statement"
-                                            "repeat_statement"
-                                            "while_statement")))
+                   (loop-statement (or "do_statement"
+                                       "for_statement"
+                                       "repeat_statement"
+                                       "while_statement"))
                    (sentence (or function
                                  loop-statement
-                                 ,(rx (or "assignment_statement"
-                                          "comment"
-                                          "field"
-                                          "function_call"
-                                          "if_statement"
-                                          "return_statement"
-                                          "variable_declaration"))))
+                                 comment
+                                 "assignment_statement"
+                                 "field"
+                                 "function_call"
+                                 "if_statement"
+                                 "return_statement"
+                                 "variable_declaration"))
                    (sexp (or function
                              keyword
                              loop-statement
-                             ,(rx (or "arguments"
-                                      "parameters"
-                                      "parenthesized_expression"
-                                      "string"
-                                      "table_constructor"))))
-                   (text "comment"))))
+                             "arguments"
+                             "parameters"
+                             "parenthesized_expression"
+                             "string"
+                             "table_constructor"))
+                   (list (or function
+                             loop-statement
+                             "arguments"
+                             "parameters"
+                             "table_constructor"
+                             "parenthesized_expression"
+                             ,(rx bos "if_statement" eos)))
+                   (text (or comment "string"))
+                   (comment ,(rx bos "comment" eos)))))
 
     ;; Imenu/Outline/Which-function.
     (setq-local treesit-simple-imenu-settings
diff --git a/test/lisp/progmodes/lua-ts-mode-resources/hide-show.lua b/test/lisp/progmodes/lua-ts-mode-resources/hide-show.lua
new file mode 100644
index 00000000000..a4831eba273
--- /dev/null
+++ b/test/lisp/progmodes/lua-ts-mode-resources/hide-show.lua
@@ -0,0 +1,43 @@
+--[[
+This is a
+comment block.
+]]
+local function fun ()
+    print("fun")
+end
+local f = (function ()
+    print(1)
+end)
+for i = 1, 10 do
+  print(i)
+end
+repeat
+    print("repeat")
+until false
+while true do
+    print("while")
+end
+do
+    print(1)
+end
+local t = {
+    a=1,
+    b=2,
+}
+if true then
+    print(1)
+elseif false then
+    print(0)
+else
+    print(0)
+end
+function f1 (has,
+             lots,
+             of,
+             parameters)
+    print("ok")
+end
+print(1,
+      2,
+      3,
+      4)
diff --git a/test/lisp/progmodes/lua-ts-mode-tests.el b/test/lisp/progmodes/lua-ts-mode-tests.el
index 44c31648586..b14e9518451 100644
--- a/test/lisp/progmodes/lua-ts-mode-tests.el
+++ b/test/lisp/progmodes/lua-ts-mode-tests.el
@@ -22,6 +22,7 @@
 (require 'ert)
 (require 'ert-font-lock)
 (require 'ert-x)
+(require 'hideshow)
 (require 'treesit)
 (require 'which-func)
 
@@ -48,6 +49,18 @@ lua-ts-test-which-function
     (should (equal "f" (which-function)))
     (which-function-mode -1)))
 
+(ert-deftest lua-ts-test-hideshow ()
+  (skip-unless (treesit-ready-p 'lua t))
+  (with-temp-buffer
+    (insert-file-contents (ert-resource-file "hide-show.lua"))
+    (lua-ts-mode)
+    (hs-minor-mode)
+    (hs-hide-all)
+    (should (= 11 (length (overlays-in (point-min) (point-max)))))
+    (hs-show-all)
+    (should (= 0 (length (overlays-in (point-min) (point-max)))))
+    (hs-minor-mode -1)))
+
 (provide 'lua-ts-mode-tests)
 
 ;;; lua-ts-mode-tests.el ends here
-- 
2.48.1


--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable



john muhl <jm@HIDDEN> writes:

> Juri Linkov <juri@HIDDEN> writes:
>
>>>> This changes the hs-minor-mode suppport to use tree-sitter list
>>>> things instead of regexps.
>>>
>>> * lisp/progmodes/lua-ts-mode.el (lua-ts-mode): Add list type to
>>> 'treesit-thing-settings'.
>>
>> Coincidentally this is what I'm currently doing for all ts-modes
>> according to the principles agreed in bug#73404.
>>
>> And it's nice to see that your changes are aligned with them.
>
> That=E2=80=99s good to hear.
>
>> There is no need to follow these principles since only you
>> as the author of the ts-mode decide what is suitable for this ts-mode.
>>
>> But it would just make it easier for programmers in different languages
>> to switch between ts-modes that will meet their expectations.
>>
>> I noticed only a few things that look like omission:
>>
>> 1. "arguments" and "parameters" are parenthesized expressions,
>>    but are missing in the 'list' setting;
>>
>> 2. "if_statement" without the anchors "\\`...\\'" (bos/eos in rx)
>>    matches "elseif_statement" too.  But unlike "if_statement",
>>    "elseif_statement" doesn't end with the "end" keyword
>>    (whereas "else_statement" doesn't end with "end" too
>>     but correctly excluded from matching);
>>
>> 3. Also would be nice to support '(forward-comment 1)'
>>    with something like (comment ,(rx bos "comment" eos))
>
> Sounds good. I was aiming for parity with lua-mode but no reason
> to stop there. I=E2=80=99ll get an updated patch over soon.
>
> Thanks for the help.


--=-=-=--

Message sent to bug-gnu-emacs@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: bug#76693: [PATCH] Use TS to support 'hs-minor-mode' in 'lua-ts-mode'
Resent-From: Juri Linkov <juri@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sat, 08 Mar 2025 18:54:02 +0000
Resent-Message-ID: <handler.76693.B76693.17414600184924 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76693
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: patch
To: john muhl <jm@HIDDEN>
Cc: 76693 <at> debbugs.gnu.org
Received: via spool by 76693-submit <at> debbugs.gnu.org id=B76693.17414600184924
          (code B ref 76693); Sat, 08 Mar 2025 18:54:02 +0000
Received: (at 76693) by debbugs.gnu.org; 8 Mar 2025 18:53:38 +0000
Received: from localhost ([127.0.0.1]:56834 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tqzIo-0001HL-Gd
	for submit <at> debbugs.gnu.org; Sat, 08 Mar 2025 13:53:38 -0500
Received: from relay7-d.mail.gandi.net ([217.70.183.200]:55005)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <juri@HIDDEN>)
 id 1tqzIm-0001H4-J1; Sat, 08 Mar 2025 13:53:37 -0500
Received: by mail.gandi.net (Postfix) with ESMTPSA id 8C42744364;
 Sat,  8 Mar 2025 18:53:26 +0000 (UTC)
From: Juri Linkov <juri@HIDDEN>
In-Reply-To: <877c50x683.fsf@HIDDEN>
Organization: LINKOV.NET
References: <87zfi3qfja.fsf@HIDDEN> <87v7srqf6g.fsf@HIDDEN>
 <8734fu2sjd.fsf@HIDDEN> <87senty6id.fsf@HIDDEN>
 <877c50x683.fsf@HIDDEN>
Date: Sat, 08 Mar 2025 20:52:38 +0200
Message-ID: <87y0xfqrrd.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/31.0.50 (x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-GND-State: clean
X-GND-Score: -100
X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduudegfedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvfevufgjohhffffkfgggtgfgsehtkeertddtreejnecuhfhrohhmpefluhhrihcunfhinhhkohhvuceojhhurhhisehlihhnkhhovhdrnhgvtheqnecuggftrfgrthhtvghrnhepieffteejgeehffejuedtiefhudekgeejteekiefgveeuheetvdefgeekkeevkedunecukfhppeeluddruddvledruddthedruddujeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeeluddruddvledruddthedruddujedphhgvlhhopehmrghilhdrghgrnhguihdrnhgvthdpmhgrihhlfhhrohhmpehjuhhriheslhhinhhkohhvrdhnvghtpdhnsggprhgtphhtthhopeefpdhrtghpthhtoheptghonhhtrhholhesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopeejieeileefseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepjhhmsehpuhgsrdhpihhnkh
X-GND-Sasl: juri@HIDDEN
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

close 76693 31.0.50
thanks

> Updated patch with Juri’s feedback.

Thanks, now pushed to master and closed.

Message received at control <at> debbugs.gnu.org:

Received: (at control) by debbugs.gnu.org; 8 Mar 2025 18:53:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 08 13:53:57 2025
Received: from localhost ([127.0.0.1]:56836 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tqzJ6-0001Hv-Vc
	for submit <at> debbugs.gnu.org; Sat, 08 Mar 2025 13:53:57 -0500
Received: from relay7-d.mail.gandi.net ([217.70.183.200]:55005)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <juri@HIDDEN>)
 id 1tqzIm-0001H4-J1; Sat, 08 Mar 2025 13:53:37 -0500
Received: by mail.gandi.net (Postfix) with ESMTPSA id 8C42744364;
 Sat,  8 Mar 2025 18:53:26 +0000 (UTC)
From: Juri Linkov <juri@HIDDEN>
To: john muhl <jm@HIDDEN>
Subject: Re: bug#76693: [PATCH] Use TS to support 'hs-minor-mode' in
 'lua-ts-mode'
In-Reply-To: <877c50x683.fsf@HIDDEN>
Organization: LINKOV.NET
References: <87zfi3qfja.fsf@HIDDEN> <87v7srqf6g.fsf@HIDDEN>
 <8734fu2sjd.fsf@HIDDEN> <87senty6id.fsf@HIDDEN>
 <877c50x683.fsf@HIDDEN>
Date: Sat, 08 Mar 2025 20:52:38 +0200
Message-ID: <87y0xfqrrd.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/31.0.50 (x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-GND-State: clean
X-GND-Score: -100
X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduudegfedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvfevufgjohhffffkfgggtgfgsehtkeertddtreejnecuhfhrohhmpefluhhrihcunfhinhhkohhvuceojhhurhhisehlihhnkhhovhdrnhgvtheqnecuggftrfgrthhtvghrnhepieffteejgeehffejuedtiefhudekgeejteekiefgveeuheetvdefgeekkeevkedunecukfhppeeluddruddvledruddthedruddujeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeeluddruddvledruddthedruddujedphhgvlhhopehmrghilhdrghgrnhguihdrnhgvthdpmhgrihhlfhhrohhmpehjuhhriheslhhinhhkohhvrdhnvghtpdhnsggprhgtphhtthhopeefpdhrtghpthhtoheptghonhhtrhholhesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopeejieeileefseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepjhhmsehpuhgsrdhpihhnkh
X-GND-Sasl: juri@HIDDEN
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: control
Cc: 76693 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

close 76693 31.0.50
thanks

> Updated patch with Juri’s feedback.

Thanks, now pushed to master and closed.

Last modified: Sat, 8 Mar 2025 19:00:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.