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.bugs Subject: bug#49731: 28.0.50; Filter xref results by filename Date: Tue, 13 Feb 2024 18:52:29 +0200 Organization: LINKOV.NET Message-ID: <86v86s4dsi.fsf@mail.linkov.net> References: <87lf5urv4c.fsf@mail.linkov.net> <86fspn1pjl.fsf@mail.linkov.net> <86ilj83fik.fsf@mail.linkov.net> <86ilj6rrnq.fsf@mail.linkov.net> <16f2a5d7-fb89-5e8c-71b7-c9f9ddc5d4e3@yandex.ru> 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="18245"; 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: 49731@debbugs.gnu.org, Daniel =?UTF-8?Q?Mart=C3=ADn?= To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Feb 13 18:05:09 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 1rZwDV-0004am-Q4 for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 13 Feb 2024 18:05:09 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZwDB-00025y-Ii; Tue, 13 Feb 2024 12:04:49 -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 1rZwD7-000235-4m for bug-gnu-emacs@gnu.org; Tue, 13 Feb 2024 12:04:45 -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 1rZwD6-0002vJ-Rj for bug-gnu-emacs@gnu.org; Tue, 13 Feb 2024 12:04:44 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZwDN-0005Gj-NA for bug-gnu-emacs@gnu.org; Tue, 13 Feb 2024 12:05:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 13 Feb 2024 17:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49731 X-GNU-PR-Package: emacs Original-Received: via spool by 49731-submit@debbugs.gnu.org id=B49731.170784386720161 (code B ref 49731); Tue, 13 Feb 2024 17:05:01 +0000 Original-Received: (at 49731) by debbugs.gnu.org; 13 Feb 2024 17:04:27 +0000 Original-Received: from localhost ([127.0.0.1]:46400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZwCo-0005F7-Rl for submit@debbugs.gnu.org; Tue, 13 Feb 2024 12:04:27 -0500 Original-Received: from relay3-d.mail.gandi.net ([217.70.183.195]:35313) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZwCn-0005Es-1G for 49731@debbugs.gnu.org; Tue, 13 Feb 2024 12:04:26 -0500 Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id 4879160008; Tue, 13 Feb 2024 17:03:59 +0000 (UTC) In-Reply-To: <16f2a5d7-fb89-5e8c-71b7-c9f9ddc5d4e3@yandex.ru> (Dmitry Gutov's message of "Wed, 23 Nov 2022 16:19:47 +0200") X-GND-Sasl: juri@linkov.net 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:279968 Archived-At: --=-=-= Content-Type: text/plain >> Now pushed to master in the commit 3573ebfa6d (it seems this is >> backward-compatible since it only sets buffer-local variables). > > Nice. > > Do you plan on adding an outline-[minor-]mode command to hide/show by > regexp? So now here are these two commands: / s outline-show-by-heading-regexp / h outline-hide-by-heading-regexp Also there is an additional helper function that is needed to keep hidden outlines and restore them after reverting the xref buffer with 'g' (xref-revert-buffer). This is an example of advice that does this. Later when xref will use revert-buffer-function, this advice could be replaced by a simple hook call: #+begin_src emacs-lisp (define-advice xref-revert-buffer (:around (ofun &rest args) keep-outlines) "Keep hidden outlines after xref revert." (let ((regexp (outline-hidden-headings-regexp)) (value (apply ofun args))) (outline-hide-by-heading-regexp regexp) value)) #+end_src --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=outline-by-regexp.patch diff --git a/lisp/outline.el b/lisp/outline.el index 5ac0f0707f1..d933bd4a444 100644 --- a/lisp/outline.el +++ b/lisp/outline.el @@ -92,6 +92,8 @@ outline-mode-prefix-map (define-key map "\C-o" 'outline-hide-other) (define-key map "\C-^" 'outline-move-subtree-up) (define-key map "\C-v" 'outline-move-subtree-down) + (keymap-set map "/ s" #'outline-show-by-heading-regexp) + (keymap-set map "/ h" #'outline-hide-by-heading-regexp) (define-key map [(control ?<)] 'outline-promote) (define-key map [(control ?>)] 'outline-demote) (define-key map "\C-m" 'outline-insert-heading) @@ -1661,6 +1663,42 @@ outline--show-headings-up-to-level beg end))) (run-hooks 'outline-view-change-hook))) +(defun outline-show-by-heading-regexp (regexp) + (interactive (list (read-regexp "Regexp to show outlines"))) + (let (outline-view-change-hook) + (outline-map-region + (lambda () + (when (string-match-p regexp (buffer-substring (pos-bol) (pos-eol))) + (outline-show-branches) ;; To reveal all parent headings + (outline-show-entry))) + (point-min) (point-max))) + (run-hooks 'outline-view-change-hook)) + +(defun outline-hide-by-heading-regexp (regexp) + (interactive (list (read-regexp "Regexp to hide outlines"))) + (let (outline-view-change-hook) + (outline-map-region + (lambda () + (when (string-match-p regexp (buffer-substring (pos-bol) (pos-eol))) + (outline-hide-subtree))) + (point-min) (point-max))) + (run-hooks 'outline-view-change-hook)) + +(defun outline-hidden-headings-regexp () + (let ((headings)) + (outline-map-region + (lambda () + (when (save-excursion + (outline-end-of-heading) + (seq-some (lambda (o) (eq (overlay-get o 'invisible) + 'outline)) + (overlays-at (point)))) + (push (buffer-substring (pos-bol) (pos-eol)) headings))) + (point-min) (point-max)) + (mapconcat (lambda (heading) + (regexp-quote heading)) + (nreverse headings) "\\|"))) + ;;; Visibility cycling --=-=-=--