From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: john muhl via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#68824: treesitter support for outline-minor-mode Date: Tue, 30 Jan 2024 12:46:50 -0600 Message-ID: <87r0hy64b5.fsf@pub.pink> References: <86le8667u7.fsf@mail.linkov.net> Reply-To: john muhl Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6960"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Yuan Fu , 68824@debbugs.gnu.org To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jan 30 19:54:12 2024 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 1rUtFM-0001XO-1w for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 30 Jan 2024 19:54:12 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rUtF5-000618-Gi; Tue, 30 Jan 2024 13:53:55 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rUtF3-00060x-B1 for bug-gnu-emacs@gnu.org; Tue, 30 Jan 2024 13:53:53 -0500 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 1rUtF3-0006QL-2U for bug-gnu-emacs@gnu.org; Tue, 30 Jan 2024 13:53:53 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rUtFB-00028D-UQ for bug-gnu-emacs@gnu.org; Tue, 30 Jan 2024 13:54:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: john muhl Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 30 Jan 2024 18:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68824 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 68824-submit@debbugs.gnu.org id=B68824.17066408408185 (code B ref 68824); Tue, 30 Jan 2024 18:54:01 +0000 Original-Received: (at 68824) by debbugs.gnu.org; 30 Jan 2024 18:54:00 +0000 Original-Received: from localhost ([127.0.0.1]:36736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUtF9-00027x-M6 for submit@debbugs.gnu.org; Tue, 30 Jan 2024 13:53:59 -0500 Original-Received: from out-180.mta0.migadu.com ([91.218.175.180]:13411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUtF6-00027h-HO for 68824@debbugs.gnu.org; Tue, 30 Jan 2024 13:53:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pub.pink; s=key1; t=1706640820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=4XOJlcu1ESwM3Bk0Bb/vNTh/ZU6azdBiCvO2+PzWmhA=; b=UOLsyHK2UK2HRPMXuFWRREBhN1JHzwY5xZRb9bIoKO0K5nCQAF6pM3whMD2f+0s4FoD2BN wGZ7rIBmMMGtmB9TLWacU4vFB1w1THT+RfSNV9T6uE4szH6kDENNiPGAZKS/+fzNb0Pw4/ v8zmIayj7XJ6zqnBcrUnvbLcXVq5RSk= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. In-reply-to: <86le8667u7.fsf@mail.linkov.net> X-Migadu-Flow: FLOW_OUT 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:279197 Archived-At: --=-=-= Content-Type: text/plain Juri Linkov writes: > Tags: patch > > As discussed on https://lists.gnu.org/archive/html/emacs-devel/2024-01/msg00916.html > here is the patch that adds the support for outline-minor-mode to treesit.el. > It has been tested on c-ts-mode, dockerfile-ts-mode, elixir-ts-mode, heex-ts-mode, > java-ts-mode, js-ts-mode, typescript-ts-mode, css-ts-mode, html-ts-mode, toml-ts-mode. Thanks for working on this. It works well with lua-ts-mode too. If you want you can add the diff to your patch. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Use-built-in-outline-support-in-lua-ts-mode.patch diff --git a/lisp/progmodes/lua-ts-mode.el b/lisp/progmodes/lua-ts-mode.el index 05a3ff6d7c6..dc2a8fcec1e 100644 --- a/lisp/progmodes/lua-ts-mode.el +++ b/lisp/progmodes/lua-ts-mode.el @@ -774,7 +774,7 @@ lua-ts-mode "vararg_expression")))) (text "comment")))) - ;; Imenu. + ;; Imenu/Outline. (setq-local treesit-simple-imenu-settings `(("Requires" "\\`function_call\\'" @@ -789,15 +789,5 @@ lua-ts-mode ;; Which-function. (setq-local which-func-functions (treesit-defun-at-point)) - ;; Outline. - (setq-local outline-regexp - (rx (seq (0+ space) - (or (seq "--[[" (0+ space) eol) - (seq symbol-start - (or "do" "for" "if" "repeat" "while" - (seq (? (seq "local" (1+ space))) - "function")) - symbol-end))))) - ;; Align. (setq-local align-indent-before-aligning t) --=-=-=--