From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: outline-mode treesitter support? Date: Wed, 24 Jan 2024 19:23:31 +0200 Organization: LINKOV.NET Message-ID: <86zfwuzlv0.fsf@mail.linkov.net> References: <1D18C79B-A9D5-4ECD-A95C-33159A28E2CD@gmail.com> <86r0jit8rn.fsf@mail.linkov.net> <8C0E4C36-4323-4E1B-A7A5-25A76CE5716C@gmail.com> <86sf3xjtfe.fsf@mail.linkov.net> <864jgc94yp.fsf@mail.linkov.net> <41ED492A-0520-49CE-BA9F-35085BEFEDEF@gmail.com> <86il41pwk7.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="16840"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: emacs-devel@gnu.org To: Huan Nguyen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Jan 24 18:28:34 2024 Return-path: Envelope-to: ged-emacs-devel@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 1rSh3B-0004Gh-Kg for ged-emacs-devel@m.gmane-mx.org; Wed, 24 Jan 2024 18:28:33 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSh2N-0007cK-6A; Wed, 24 Jan 2024 12:27:43 -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 1rSh2K-0007bV-Hl for emacs-devel@gnu.org; Wed, 24 Jan 2024 12:27:40 -0500 Original-Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rSh2I-00082W-Qg for emacs-devel@gnu.org; Wed, 24 Jan 2024 12:27:40 -0500 Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id 893D3E0009; Wed, 24 Jan 2024 17:27:35 +0000 (UTC) In-Reply-To: <86il41pwk7.fsf@mail.linkov.net> (Juri Linkov's message of "Wed, 10 Jan 2024 09:19:28 +0200") X-GND-Sasl: juri@linkov.net Received-SPF: pass client-ip=217.70.183.196; envelope-from=juri@linkov.net; helo=relay4-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:315328 Archived-At: >>> (defun outline-search-imenu (&optional bound move backward looking-at) >>> (unless imenu--index-alist >>> (imenu--make-index-alist)) >>> (let* ((imenu-index (cdar imenu--index-alist)) > > After trying to use this, I came to conclusion that imenu--index-alist > is unsuitable for outline-minor-mode because imenu has a different > hierarchy than the source files, so outline-level can be only 1. > But without different levels for outline-level it's quite useless. Many ts-modes are already defining treesit-simple-imenu-settings that can be reused or outlines. We just need to add levels to all entries found for imenu. So here is a complete working implementation. Then with e.g. `M-x c-ts-mode` and `M-x outline-minor-mode` it will put outlines on declarations and definitions. #+begin_src emacs-lisp (add-hook 'prog-mode-hook (lambda () (when (bound-and-true-p treesit-simple-imenu-settings) (setq-local treesit-outline-predicate (lambda (node) (seq-some (lambda (setting) (and (string-match-p (nth 1 setting) (treesit-node-type node)) (funcall (nth 2 setting) node))) treesit-simple-imenu-settings))) (setq-local treesit-outline-levels (treesit-outline-levels (treesit-induce-sparse-tree (treesit-buffer-root-node) treesit-outline-predicate) 0)) (setq-local outline-search-function #'treesit-search-outline outline-level (lambda () (or (alist-get (point) treesit-outline-levels nil nil (lambda (m k) (eq (marker-position m) k))) 1)))))) (defun treesit-outline-levels (node level) (let* ((ts-node (car node)) (children (cdr node)) (subtrees (mapcan (lambda (node) (treesit-outline-levels node (1+ level))) children)) (marker (when ts-node (set-marker (make-marker) (save-excursion (goto-char (treesit-node-start ts-node)) (search-forward (or (treesit-defun-name ts-node) "")) (pos-bol)))))) (cond ((null ts-node) subtrees) (subtrees (cons (cons marker level) subtrees)) (t (list (cons marker level)))))) (defun treesit-search-outline (&optional bound move backward looking-at) (let ((positions (mapcar #'car treesit-outline-levels))) (if looking-at (when (member (point-marker) positions) (set-match-data (list (pos-bol) (pos-eol))) t) (let ((found (if backward (seq-find (lambda (p) (< p (pos-bol))) (nreverse positions)) (seq-find (lambda (p) (> p (pos-eol))) positions)))) (if found (if (or (not bound) (if backward (>= found bound) (<= found bound))) (progn (goto-char found) (goto-char (pos-bol)) (set-match-data (list (point) (pos-eol))) t) (when move (goto-char bound)) nil) (when move (goto-char (or bound (if backward (point-min) (point-max))))) nil))))) #+end_src