From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 02 16:38:56 2025
Received: (at submit) by debbugs.gnu.org; 2 Mar 2025 21:38:56 +0000
Received: from localhost ([127.0.0.1]:37684 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1tor1U-0002H7-4C
	for submit@debbugs.gnu.org; Sun, 02 Mar 2025 16:38:56 -0500
Received: from lists.gnu.org ([2001:470:142::17]:35482)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <jm@pub.pink>) id 1tor1S-0002GN-1n
 for submit@debbugs.gnu.org; Sun, 02 Mar 2025 16:38:54 -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@pub.pink>) id 1tor1M-0008P0-EC
 for bug-gnu-emacs@gnu.org; Sun, 02 Mar 2025 16:38:48 -0500
Received: from fout-a2-smtp.messagingengine.com ([103.168.172.145])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <jm@pub.pink>) id 1tor1K-0007Mb-N9
 for bug-gnu-emacs@gnu.org; Sun, 02 Mar 2025 16:38:48 -0500
Received: from phl-compute-09.internal (phl-compute-09.phl.internal
 [10.202.2.49])
 by mailfout.phl.internal (Postfix) with ESMTP id 8EE281383063
 for <bug-gnu-emacs@gnu.org>; Sun,  2 Mar 2025 16:38:43 -0500 (EST)
Received: from phl-mailfrontend-01 ([10.202.2.162])
 by phl-compute-09.internal (MEProxy); Sun, 02 Mar 2025 16:38:43 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pub.pink; h=cc
 :content-type:content-type:date:date:from:from:in-reply-to
 :message-id:mime-version:reply-to:subject:subject:to:to; s=fm1;
 t=1740951523; x=1741037923; bh=ozY8DYTFfOPmy97j6YOLtyt/Tt65SYVv
 g5Be/Mb8j8E=; b=ZGcEjWXq9KyILCi/TNXwqJ8XhRNVAdUoY7eNYU1qIVDxRCXd
 Yhw/39jil1vBwgqzXc4ZT3SN+R2xTURAg41Ji8nskcZS2EhnCoal/YuaCLNHCk54
 /z+FNugjFIjPMZ2m61YBrhV0NRkJ2cwRm9AD0lAvU07W+tkV0+oseX6iiDO4SeBq
 zuiwr3DF1GC9guauUGTP7Prd26Xs9h+/DHGInQfPGiPQqP+hGs/VHjUUg5r7/xR7
 TrdAR02g4lqzKLkmNsU01ymr0y6Pgh4q72HqFkfR6XuZAeD6uCxzOi/GGW5r+txs
 o3BGnmW7GzcJqiT+MRcaRFJzMiuLkBxLcMY1zw==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=cc:content-type:content-type:date:date
 :feedback-id:feedback-id:from:from:in-reply-to:message-id
 :mime-version:reply-to:subject:subject:to:to:x-me-proxy
 :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1740951523; x=
 1741037923; bh=ozY8DYTFfOPmy97j6YOLtyt/Tt65SYVvg5Be/Mb8j8E=; b=j
 vOd2EMP3Jtw6GizG72oErG0xt4JzmjsOPgZ9uE68j7J4IcNKpzsdceKvm/Lt2JFO
 fk+UDJmhJMcHPPhLcs2ASjA3sSb2I+E4WsBVv3dmoq/InYgsO29RZ4dVGS2PAO7I
 PLUo4rYilEOAdtFke9D5NR/5UjKs6z1vLTZk4SqZq9ALk3unVezgEkg/7PAxR+Kp
 NXaqb0FLWPN9EbJoPaWJMXWKYcoFzLLOdMlcC0HtdlZTZLrcWnNupHiFdYbf4jAN
 aUWRt4MMkc64YXsKCoErbvl/9eMqIaGLb5oMt8u/keMCRHv8ITR9uQ4zUNcUAlWG
 g10aAEvc4HzU7SegscJyA==
X-ME-Sender: <xms:48_EZwkJWES2rVurlrh2gOmzSH72sRcHPdcpDweCUC8kG-y7YtJxVQ>
 <xme:48_EZ_0K3Jt93TZVIk4k7YDSiyrfTh-Nt0aN3OktKPTkc9kKWhB9BWMzFCQYTX-z4
 9GB0NC0zqaous9G1TU>
X-ME-Received: <xmr:48_EZ-pTLI3sSqgMwMYRdnNjTeBBdm97hYHLSSUQzaMYlQyfknl92A>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeljeefvdcutefuodetggdotefrod
 ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp
 uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvuf
 ffkfggtgesthdtredttddttdenucfhrhhomhepjhhmsehpuhgsrdhpihhnkhenucggtffr
 rghtthgvrhhnpeduheetueehkeevgfdttdelffekkeduvefhvdekgeejueeuieegkefhfe
 ehiedvteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhm
 pehjmhesphhusgdrphhinhhkpdhnsggprhgtphhtthhopedupdhmohguvgepshhmthhpoh
 huthdprhgtphhtthhopegsuhhgqdhgnhhuqdgvmhgrtghssehgnhhurdhorhhg
X-ME-Proxy: <xmx:48_EZ8li33tt2RNZ7BfMPxBcUIyfxKFDB0FwYDDxtNWEJx6XNVWEJQ>
 <xmx:48_EZ-1pbQzFR0tsyx-rc0TN87LHM850PIK_PNilj1EbLMoNLqdz_g>
 <xmx:48_EZzukI0VD21xEpj8gOp1dpC7NeIUOp5iTgOEKOmOsJ_hfP36gJw>
 <xmx:48_EZ6WAu3hCIQ9R6KqRAT9zs175p2aqaZkeVwckHaM6OM7tIu8awg>
 <xmx:48_EZz-eiu_1lQzq2LlYRiSKGPpM-EwcqhFknwPOtJbtgo9bIeKjqIok>
Feedback-ID: i74194916:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
 <bug-gnu-emacs@gnu.org>; Sun, 2 Mar 2025 16:38:42 -0500 (EST)
From: jm@pub.pink
To: bug-gnu-emacs@gnu.org
Subject: [PATCH] Use TS to support 'hs-minor-mode' in 'lua-ts-mode'
Date: Sun, 02 Mar 2025 15:38:33 -0600
Message-ID: <87zfi3qfja.fsf@pub.pink>
MIME-Version: 1.0
Content-Type: text/plain
Received-SPF: pass client-ip=103.168.172.145; envelope-from=jm@pub.pink;
 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-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit@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@debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit@debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request@debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request@debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@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.




From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 02 16:46:30 2025
Received: (at 76693) by debbugs.gnu.org; 2 Mar 2025 21:46:30 +0000
Received: from localhost ([127.0.0.1]:37788 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1tor8n-00036y-LJ
	for submit@debbugs.gnu.org; Sun, 02 Mar 2025 16:46:30 -0500
Received: from fout-a2-smtp.messagingengine.com ([103.168.172.145]:41387)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <jm@pub.pink>) id 1tor8l-00036M-Gu
 for 76693@debbugs.gnu.org; Sun, 02 Mar 2025 16:46:28 -0500
Received: from phl-compute-04.internal (phl-compute-04.phl.internal
 [10.202.2.44])
 by mailfout.phl.internal (Postfix) with ESMTP id E6A74138005B
 for <76693@debbugs.gnu.org>; Sun,  2 Mar 2025 16:46:21 -0500 (EST)
Received: from phl-mailfrontend-01 ([10.202.2.162])
 by phl-compute-04.internal (MEProxy); Sun, 02 Mar 2025 16:46:21 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pub.pink; h=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=1740951981; x=1741038381; bh=wcd9uYF3XV
 KakONIPX1LpD1BBfuflPWefDYEtRXsMWU=; b=Q/SJa2ERl8iOT7BFbn81qBnI2t
 rzHTj0KxXcQ1R8eOxaBD3+owryebbfBTUTX9f24UNwvGWQK/wCIKhGf0LBrsArz9
 +Bg4vCNt8ntBw+AomB0flQrHbDHOqE4yd2dOTy1BoMaKOVnRuABFOJdJiqo7l4cf
 ZJwd6ObuS1AD6YPmEjxh2u/R7Qs7j4qKy68flw1OfbHQEYqPS1SLH0GeGndQp3+Q
 BpTRgMycCQGSm7liQtdUBxTeHHLJeBb5c6EyWYuViNMRjlP/5qU5OEVB1Zv2Qbfs
 nUFomv2tPhSXIhN0e9HZhfpT4zET4EYohZ5Hw4acfWtUC5m6GmqqEeeQuRnw==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=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=
 1740951981; x=1741038381; bh=wcd9uYF3XVKakONIPX1LpD1BBfuflPWefDY
 EtRXsMWU=; b=MErjfy5Ua9xhw4aNK6o6Z0tGg3/FnHEkHm6v32e2tI2FfDR6JGw
 J5hY8IVvl85GkpZvycuaVzDRl9IZGPgoygaoO4QNElX6KanglKGgMBa6uABams3L
 MGK+AGT4O8kpOzPob6/1AQY9RK9qAjUgGJOZE4OBzljPoX/V9v5hQSQxdHKrcvKH
 hI6tYTGzZFy+YFxwtVBJYUAxifEhxpcGJAZIWPPNS4H4CH102bGeOlbv4G3ksU/b
 PlwAa3azx1hZYwi9EQopQD9NY0PB7ycErkbevabJTtTUj4GjgGw+t+EaYYGo3oaH
 VoHcmMGMJvEph9x34JpWbkzr9F56eDHRO6A==
X-ME-Sender: <xms:rdHEZ5RI3mccKGV6YtBdBUvghP2dHHS9ewc7PaRnwqglK6cIjxC9Ew>
 <xme:rdHEZyz7P3dNHXuia81UqST1p_MO8102Xbi9QlSQjhTw0mA6tmbQlNsVR0SqrzC69
 CKkgFAvs-mItzBVUJk>
X-ME-Received: <xmr:rdHEZ-3R1-0vZG9QKNVQa1DL4SZeof5uX1s98G1oEBwi1UbA-qDOPg>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeljeefvdcutefuodetggdotefrod
 ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp
 uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhepfhgfhf
 fvufffjgfkgggtsehmtderredtredtnecuhfhrohhmpehjohhhnhcumhhuhhhluceojhhm
 sehpuhgsrdhpihhnkheqnecuggftrfgrthhtvghrnhepuddvleffveffjeehjeeulefhgf
 fggedtvdduvddvhfdvffetfedugfeuvdehueeinecuvehluhhsthgvrhfuihiivgeptden
 ucfrrghrrghmpehmrghilhhfrhhomhepjhhmsehpuhgsrdhpihhnkhdpnhgspghrtghpth
 htohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepjeeiieelfeesuggvsggs
 uhhgshdrghhnuhdrohhrgh
X-ME-Proxy: <xmx:rdHEZxC83nyJnt_Ii-7vff6PhqCGAeUMEceeuTFI9At8Q5hktfZTTg>
 <xmx:rdHEZyg30MLN0QdGyxWiPNxhyc8o-eI2d6LbBxoQYiIbHQJNnPF8yQ>
 <xmx:rdHEZ1oI_A3ItIET3sTO92Jy5WKpCUFNujISHMyKeg5GauNnlIcm3Q>
 <xmx:rdHEZ9j7ZZU6MY9xCofrqSB0uwiedBdqRfnItukI-pWaqugKIffZ0A>
 <xmx:rdHEZ2Y5K6m4k3eq1Nzg5u1MHFMmDZsuqFoAOlLyffPFVXEyI0WeAk-v>
Feedback-ID: i74194916:Fastmail
Received: by mail.messagingengine.com (Postfix) with ESMTPA for
 <76693@debbugs.gnu.org>; Sun, 2 Mar 2025 16:46:21 -0500 (EST)
References: <87zfi3qfja.fsf@pub.pink>
User-agent: mu4e 1.10.8; emacs 31.0.50
From: john muhl <jm@pub.pink>
To: 76693@debbugs.gnu.org
Subject: Re: bug#76693: [PATCH] Use TS to support 'hs-minor-mode' in
 'lua-ts-mode'
Date: Sun, 02 Mar 2025 15:45:45 -0600
In-reply-to: <87zfi3qfja.fsf@pub.pink>
Message-ID: <87v7srqf6g.fsf@pub.pink>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 76693
X-BeenThere: debbugs-submit@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@debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit@debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request@debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request@debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

--=-=-=
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@pub.pink>
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@pub.pink writes:

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


--=-=-=--




From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 03 12:53:09 2025
Received: (at 76693) by debbugs.gnu.org; 3 Mar 2025 17:53:10 +0000
Received: from localhost ([127.0.0.1]:51338 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1tp9yX-0007Ye-22
	for submit@debbugs.gnu.org; Mon, 03 Mar 2025 12:53:09 -0500
Received: from relay7-d.mail.gandi.net ([217.70.183.200]:60465)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <juri@linkov.net>) id 1tp9yQ-0007XK-Jc
 for 76693@debbugs.gnu.org; Mon, 03 Mar 2025 12:53:03 -0500
Received: by mail.gandi.net (Postfix) with ESMTPSA id 8EA4D44272;
 Mon,  3 Mar 2025 17:52:53 +0000 (UTC)
From: Juri Linkov <juri@linkov.net>
To: john muhl <jm@pub.pink>
Subject: Re: bug#76693: [PATCH] Use TS to support 'hs-minor-mode' in
 'lua-ts-mode'
In-Reply-To: <87v7srqf6g.fsf@pub.pink>
Organization: LINKOV.NET
References: <87zfi3qfja.fsf@pub.pink> <87v7srqf6g.fsf@pub.pink>
Date: Mon, 03 Mar 2025 19:33:50 +0200
Message-ID: <8734fu2sjd.fsf@mail.linkov.net>
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
X-GND-State: clean
X-GND-Score: -100
X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdelleejjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfitefpfffkpdcuggftfghnshhusghstghrihgsvgenuceurghilhhouhhtmecufedtudenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvvefujghofhffkfgfgggtsehttdertddtredtnecuhfhrohhmpefluhhrihcunfhinhhkohhvuceojhhurhhisehlihhnkhhovhdrnhgvtheqnecuggftrfgrthhtvghrnhepffegteefveelhfeljeefueehieduiedtfffhuddtkeeffffghfevheetgeeukeehnecukfhppeeluddruddvledruddthedruddujeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeeluddruddvledruddthedruddujedphhgvlhhopehmrghilhdrghgrnhguihdrnhgvthdpmhgrihhlfhhrohhmpehjuhhriheslhhinhhkohhvrdhnvghtpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeeiieelfeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehjmhesphhusgdrphhinhhk
X-GND-Sasl: juri@linkov.net
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 76693
Cc: 76693@debbugs.gnu.org
X-BeenThere: debbugs-submit@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@debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit@debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request@debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request@debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

>> 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))




From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 03 19:38:47 2025
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@debbugs.gnu.org>)
	id 1tpGJ4-0000Lg-P3
	for submit@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@pub.pink>) id 1tpGJ1-0000LK-Tm
 for 76693@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@pub.pink> <87v7srqf6g.fsf@pub.pink>
 <8734fu2sjd.fsf@mail.linkov.net>
User-agent: mu4e 1.10.8; emacs 31.0.50
From: john muhl <jm@pub.pink>
To: Juri Linkov <juri@linkov.net>
Subject: Re: bug#76693: [PATCH] Use TS to support 'hs-minor-mode' in
 'lua-ts-mode'
Date: Mon, 03 Mar 2025 18:33:03 -0600
In-reply-to: <8734fu2sjd.fsf@mail.linkov.net>
Message-ID: <87senty6id.fsf@pub.pink>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 76693
Cc: 76693@debbugs.gnu.org, bug-gnu-emacs@gnu.org
X-BeenThere: debbugs-submit@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@debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit@debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request@debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request@debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -1.0 (-)


Juri Linkov <juri@linkov.net> 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.




From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 07 09:31:41 2025
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@debbugs.gnu.org>)
	id 1tqYjk-0004wR-NM
	for submit@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@pub.pink>) id 1tqYjg-0004w9-Uq
 for 76693@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@pub.pink> <87v7srqf6g.fsf@pub.pink>
 <8734fu2sjd.fsf@mail.linkov.net> <87senty6id.fsf@pub.pink>
User-agent: mu4e 1.10.8; emacs 31.0.50
From: john muhl <jm@pub.pink>
To: 76693@debbugs.gnu.org
Subject: Re: bug#76693: [PATCH] Use TS to support 'hs-minor-mode' in
 'lua-ts-mode'
Date: Fri, 07 Mar 2025 08:29:55 -0600
In-reply-to: <87senty6id.fsf@pub.pink>
Message-ID: <877c50x683.fsf@pub.pink>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 76693
Cc: Juri Linkov <juri@linkov.net>
X-BeenThere: debbugs-submit@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@debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit@debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request@debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request@debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@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@pub.pink>
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@pub.pink> writes:

> Juri Linkov <juri@linkov.net> 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.


--=-=-=--




From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 08 13:53:38 2025
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@debbugs.gnu.org>)
	id 1tqzIo-0001HL-Gd
	for submit@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@linkov.net>)
 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@linkov.net>
To: john muhl <jm@pub.pink>
Subject: Re: bug#76693: [PATCH] Use TS to support 'hs-minor-mode' in
 'lua-ts-mode'
In-Reply-To: <877c50x683.fsf@pub.pink>
Organization: LINKOV.NET
References: <87zfi3qfja.fsf@pub.pink> <87v7srqf6g.fsf@pub.pink>
 <8734fu2sjd.fsf@mail.linkov.net> <87senty6id.fsf@pub.pink>
 <877c50x683.fsf@pub.pink>
Date: Sat, 08 Mar 2025 20:52:38 +0200
Message-ID: <87y0xfqrrd.fsf@mail.linkov.net>
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@linkov.net
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 76693
Cc: 76693@debbugs.gnu.org
X-BeenThere: debbugs-submit@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@debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit@debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request@debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request@debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@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.




From unknown Tue Jun 17 01:43:32 2025
Received: (at fakecontrol) by fakecontrolmessage;
To: internal_control@debbugs.gnu.org
From: Debbugs Internal Request <help-debbugs@gnu.org>
Subject: Internal Control
Message-Id: bug archived.
Date: Sun, 06 Apr 2025 11:24:28 +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