From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#60285: xref-query-replace-in-results could show an arrow pointing to the current item being replaced Date: Sat, 24 Dec 2022 19:45:01 +0200 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------nETqsaLkZLQ4RI0zBokq7781" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13739"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 To: Daniel =?UTF-8?Q?Mart=C3=ADn?= , 60285@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Dec 24 18:46:26 2022 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 1p98bI-0003S2-QH for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 24 Dec 2022 18:46:24 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p98ay-0007sp-9s; Sat, 24 Dec 2022 12:46:04 -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 1p98aw-0007sh-N3 for bug-gnu-emacs@gnu.org; Sat, 24 Dec 2022 12:46:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p98aw-00015G-An for bug-gnu-emacs@gnu.org; Sat, 24 Dec 2022 12:46:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p98av-0002sY-UZ for bug-gnu-emacs@gnu.org; Sat, 24 Dec 2022 12:46:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 24 Dec 2022 17:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60285 X-GNU-PR-Package: emacs Original-Received: via spool by 60285-submit@debbugs.gnu.org id=B60285.167190391210988 (code B ref 60285); Sat, 24 Dec 2022 17:46:01 +0000 Original-Received: (at 60285) by debbugs.gnu.org; 24 Dec 2022 17:45:12 +0000 Original-Received: from localhost ([127.0.0.1]:47083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p98a7-0002rA-HQ for submit@debbugs.gnu.org; Sat, 24 Dec 2022 12:45:11 -0500 Original-Received: from mail-wm1-f51.google.com ([209.85.128.51]:53112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p98a6-0002qr-7A for 60285@debbugs.gnu.org; Sat, 24 Dec 2022 12:45:10 -0500 Original-Received: by mail-wm1-f51.google.com with SMTP id ay40so5490411wmb.2 for <60285@debbugs.gnu.org>; Sat, 24 Dec 2022 09:45:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:from:references:to:content-language:subject:user-agent :mime-version:date:message-id:sender:from:to:cc:subject:date :message-id:reply-to; bh=RFV8JmvP9iM6hWWoXmDUf1GK1U+rFDUnpQDhVlLPbxg=; b=eD6xsW9qi0pQPKrNVczfZGwubEttpB0CdZrUn+4/l4cOBsUhw2rjH4kVYu8YWncdPC Z8pmzu9zjyGLbHQJHEfYG2KXXTb4pUyazR+6J+Ii2wLlJMZoj6CONbOJw/2J3aVMcB8j OUjo5fIzY2cv7DIDTNIIqh/fihMEXyjaAH2NG5EqO+LQOKoPl/5fhDC/fDMh6QDktEDU wrPPikMyo8/FX3aYX9bpZqyu1cIqoVyFwY5gLouqUf37nB3WIz63Q0/461Y7mRoTwBrA InmDL61+Dn2CLWymm9Lu4IlFoHibKP1IOZrlr6/C3pmJMV5fRaB5Qf2XP268CcSXRgXt 3YAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:from:references:to:content-language:subject:user-agent :mime-version:date:message-id:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RFV8JmvP9iM6hWWoXmDUf1GK1U+rFDUnpQDhVlLPbxg=; b=jTIxYPoFN/zRrt9EogkLccRNb+9Uj1FQ1WqgN+pQKUa08cK+Kqpqqzm9nefyIJnto3 ixlcPp7RsVR/2UNI/fh+Waqi1Q4sLiSq2Y/KBOwnj8Bc6VGzJhiocbGfOWSakVsYFiwM QqQRMVmsdny3D01eA27CmB5n5EjJynJFZMe0bVcNJK1jA3YsstPvyhVdDkIo/FIa5KCX Rwd/MBnVXgo3S2+NgNkTvs6ks8xpqnTqv+wq67byj2E3AF75nTssxe0UgnZoiB9xPKv4 H7CjOAkkR2zCqjlCy80f8s7g75vUH+wIEDSy6/Ak8OZAz/ujSlSYhaNIaLaQG3lgKlFh Zo0Q== X-Gm-Message-State: AFqh2koLsF3ubZ68QLihGnKYzlc+7wlpZlUAbqwA018A2omVnS0VtA0u CnHJZuvQceHM4LOzIv6pHNw= X-Google-Smtp-Source: AMrXdXuZhD/ftiKVLMgnS1TUW+f1x3n7JpPKFb6ituUJp2Hm+nq+0EYUPMQNocVFdanaupvVS3urDA== X-Received: by 2002:a05:600c:3d8a:b0:3d3:4406:8a37 with SMTP id bi10-20020a05600c3d8a00b003d344068a37mr9763346wmb.41.1671903904146; Sat, 24 Dec 2022 09:45:04 -0800 (PST) Original-Received: from [192.168.0.2] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id c12-20020a05600c0a4c00b003cfa3a12660sm21171445wmq.1.2022.12.24.09.45.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 24 Dec 2022 09:45:03 -0800 (PST) Content-Language: en-US In-Reply-To: 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:251810 Archived-At: This is a multi-part message in MIME format. --------------nETqsaLkZLQ4RI0zBokq7781 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 23/12/2022 21:16, Daniel Martín via Bug reports for GNU Emacs, the Swiss army knife of text editors wrote: > Severity: wishlist > > When you use xref-query-replace-in-results to replace some references, > it'd be great if the xref buffer showed an overlay arrow (see > xref--set-arrow) pointing to the reference being edited. That'd give > better context about the reference that is being edited and the global > progress of the query replace operation. SGTM. Here's a patch which seems to work. It's a little tricky, though, and I'm at a loss with better variable names in some places. Wish we had some unit tests here. --------------nETqsaLkZLQ4RI0zBokq7781 Content-Type: text/x-patch; charset=UTF-8; name="xref-replace-with-arrow.diff" Content-Disposition: attachment; filename="xref-replace-with-arrow.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3hyZWYuZWwgYi9saXNwL3Byb2dtb2Rlcy94 cmVmLmVsCmluZGV4IDAyMTNhYjNjYzU4Li40OWFkMzUwMGQxNSAxMDA2NDQKLS0tIGEvbGlz cC9wcm9nbW9kZXMveHJlZi5lbAorKysgYi9saXNwL3Byb2dtb2Rlcy94cmVmLmVsCkBAIC03 NzEsMTkgKzc3MSwyMiBAQCB4cmVmLXF1ZXJ5LXJlcGxhY2UtaW4tcmVzdWx0cwogICAgICAg ICAgICAgICAgICAgICAgIChmb3JtYXQgIlF1ZXJ5LXJlcGxhY2UgKHJlZ2V4cCkgJXMgd2l0 aDogIiBmcikKICAgICAgICAgICAgICAgICAgICAgIlF1ZXJ5LXJlcGxhY2UgYWxsIG1hdGNo ZXMgd2l0aDogIikpKQogICAgICAobGlzdCBmciAocmVhZC1yZWdleHAgcHJvbXB0KSkpKQot ICAobGV0KiAoaXRlbSB4cmVmcyBpdGVyKQorICAobGV0KiAoKHBvc2l0aW9ucyAobWFrZS1o YXNoLXRhYmxlIDp0ZXN0ICdlcSkpCisgICAgICAgICBpdGVtIHhyZWZzIGl0ZXIpCiAgICAg KHNhdmUtZXhjdXJzaW9uCiAgICAgICAod2hpbGUgKHNldHEgaXRlbSAoeHJlZi0tc2VhcmNo LXByb3BlcnR5ICd4cmVmLWl0ZW0pKQogICAgICAgICAod2hlbiAoeHJlZi1tYXRjaC1sZW5n dGggaXRlbSkKKyAgICAgICAgICAocHV0aGFzaCBpdGVtIChwb2ludCkgcG9zaXRpb25zKQog ICAgICAgICAgIChwdXNoIGl0ZW0geHJlZnMpKSkpCiAgICAgKHVud2luZC1wcm90ZWN0CiAg ICAgICAgIChwcm9nbgogICAgICAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1pbikpCi0gICAg ICAgICAgKHNldHEgaXRlciAoeHJlZi0tYnVmLXBhaXJzLWl0ZXJhdG9yIChucmV2ZXJzZSB4 cmVmcykpKQotICAgICAgICAgICh4cmVmLS1xdWVyeS1yZXBsYWNlLTEgZnJvbSB0byBpdGVy KSkKKyAgICAgICAgICAoc2V0cSBpdGVyICh4cmVmLS1idWYtcGFpcnMtaXRlcmF0b3IgKG5y ZXZlcnNlIHhyZWZzKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBwb3NpdGlvbnMpKQorICAgICAgICAgICh4cmVmLS1xdWVyeS1yZXBsYWNlLTEg ZnJvbSB0byBpdGVyIChjdXJyZW50LWJ1ZmZlcikpKQogICAgICAgKGZ1bmNhbGwgaXRlciA6 Y2xlYW51cCkpKSkKIAotKGRlZnVuIHhyZWYtLWJ1Zi1wYWlycy1pdGVyYXRvciAoeHJlZnMp CisoZGVmdW4geHJlZi0tYnVmLXBhaXJzLWl0ZXJhdG9yICh4cmVmcyBwb3NpdGlvbnMpCiAg IChsZXQgKGNodW5rLWRvbmUgaXRlbSBuZXh0LXBhaXIgZmlsZS1idWYgcGFpcnMgYWxsLXBh aXJzKQogICAgIChsYW1iZGEgKGFjdGlvbikKICAgICAgIChwY2FzZSBhY3Rpb24KQEAgLTgw MSw5ICs4MDQsMTAgQEAgeHJlZi0tYnVmLXBhaXJzLWl0ZXJhdG9yCiAgICAgICAgICAgICAg ICAgICAgICAgKGJlZyAoeHJlZi1sb2NhdGlvbi1tYXJrZXIgbG9jKSkKICAgICAgICAgICAg ICAgICAgICAgICAoZW5kIChtb3ZlLW1hcmtlciAobWFrZS1tYXJrZXIpCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKCsgYmVnICh4cmVmLW1hdGNoLWxlbmd0 aCBpdGVtKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobWFy a2VyLWJ1ZmZlciBiZWcpKSkpCi0gICAgICAgICAgICAgICAgIChsZXQgKChwYWlyIChjb25z IGJlZyBlbmQpKSkKLSAgICAgICAgICAgICAgICAgICAocHVzaCBwYWlyIGFsbC1wYWlycykK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobWFya2VyLWJ1ZmZl ciBiZWcpKSkKKyAgICAgICAgICAgICAgICAgICAgICAoeHJlZi1idWYtcG9zIChnZXRoYXNo IGl0ZW0gcG9zaXRpb25zKSkpCisgICAgICAgICAgICAgICAgIChsZXQgKChwb3NpdGlvbnMg KGxpc3QgYmVnIGVuZCB4cmVmLWJ1Zi1wb3MpKSkKKyAgICAgICAgICAgICAgICAgICAocHVz aCBwb3NpdGlvbnMgYWxsLXBhaXJzKQogICAgICAgICAgICAgICAgICAgIDs7IFBlcmZvcm0g c2FuaXR5IGNoZWNrIGZpcnN0LgogICAgICAgICAgICAgICAgICAgICh4cmVmLS1nb3RvLWxv Y2F0aW9uIGxvYykKICAgICAgICAgICAgICAgICAgICAoaWYgKHhyZWYtLW91dGRhdGVkLXAg aXRlbSkKQEAgLTgxMSwxNyArODE1LDE3IEBAIHhyZWYtLWJ1Zi1wYWlycy1pdGVyYXRvcgog ICAgICAgICAgICAgICAgICAgICAgKGNvbmQKICAgICAgICAgICAgICAgICAgICAgICAoKG51 bGwgZmlsZS1idWYpCiAgICAgICAgICAgICAgICAgICAgICAgIChzZXRxIGZpbGUtYnVmICht YXJrZXItYnVmZmVyIGJlZykpCi0gICAgICAgICAgICAgICAgICAgICAgIChwdXNoIHBhaXIg cGFpcnMpKQorICAgICAgICAgICAgICAgICAgICAgICAocHVzaCBwb3NpdGlvbnMgcGFpcnMp KQogICAgICAgICAgICAgICAgICAgICAgICgoZXF1YWwgZmlsZS1idWYgKG1hcmtlci1idWZm ZXIgYmVnKSkKLSAgICAgICAgICAgICAgICAgICAgICAgKHB1c2ggcGFpciBwYWlycykpCisg ICAgICAgICAgICAgICAgICAgICAgIChwdXNoIHBvc2l0aW9ucyBwYWlycykpCiAgICAgICAg ICAgICAgICAgICAgICAgKHQKICAgICAgICAgICAgICAgICAgICAgICAgKHNldHEgY2h1bmst ZG9uZSB0Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5leHQtcGFpciBwYWlyKSkp KSkpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmV4dC1wYWlyIHBvc2l0aW9u cykpKSkpKSkpCiAgICAgICAgICAgIChjb25zIGZpbGUtYnVmIChucmV2ZXJzZSBwYWlycykp KSkKICAgICAgICAgKDpjbGVhbnVwCiAgICAgICAgICAoZG9saXN0IChwYWlyIGFsbC1wYWly cykKLSAgICAgICAgICAgKG1vdmUtbWFya2VyIChjYXIgcGFpcikgbmlsKQotICAgICAgICAg ICAobW92ZS1tYXJrZXIgKGNkciBwYWlyKSBuaWwpKSkpKSkpCisgICAgICAgICAgIChtb3Zl LW1hcmtlciAobnRoIDAgcGFpcikgbmlsKQorICAgICAgICAgICAobW92ZS1tYXJrZXIgKG50 aCAxIHBhaXIpIG5pbCkpKSkpKSkKIAogKGRlZnVuIHhyZWYtLW91dGRhdGVkLXAgKGl0ZW0p CiAgICJDaGVjayB0aGF0IHRoZSBtYXRjaCBsb2NhdGlvbiBhdCBjdXJyZW50IHBvc2l0aW9u IGlzIHVwLXRvLWRhdGUuCkBAIC04NTcsNyArODYxLDcgQEAgeHJlZi0tb3V0ZGF0ZWQtcAog ICAgICAgICAgICAgIChmdW5jYWxsIGNoZWNrKSkpKSkpKQogCiA7OyBGSVhNRTogV3JpdGUg YSBuaWNlciBVSS4KLShkZWZ1biB4cmVmLS1xdWVyeS1yZXBsYWNlLTEgKGZyb20gdG8gaXRl cikKKyhkZWZ1biB4cmVmLS1xdWVyeS1yZXBsYWNlLTEgKGZyb20gdG8gaXRlciB4cmVmLWJ1 ZikKICAgKGxldCogKChxdWVyeS1yZXBsYWNlLWxhenktaGlnaGxpZ2h0IG5pbCkKICAgICAg ICAgIChjb250aW51ZSB0KQogICAgICAgICAgZGlkLWl0LW9uY2UgYnVmLXBhaXJzIHBhaXJz CkBAIC04NzIsMTEgKzg3NiwxNSBAQCB4cmVmLS1xdWVyeS1yZXBsYWNlLTEKICAgICAgICAg ICAgICAgICAgKDw9IGVuZCBjdXJyZW50LWVuZCkpKSkKICAgICAgICAgIChyZXBsYWNlLXJl LXNlYXJjaC1mdW5jdGlvbgogICAgICAgICAgIChsYW1iZGEgKGZyb20gJm9wdGlvbmFsIF9i b3VuZCBub2Vycm9yKQotICAgICAgICAgICAgKGxldCAoZm91bmQgcGFpcikKKyAgICAgICAg ICAgIChsZXQgKGZvdW5kIHBvc2l0aW9ucykKICAgICAgICAgICAgICAgKHdoaWxlIChhbmQg KG5vdCBmb3VuZCkgcGFpcnMpCi0gICAgICAgICAgICAgICAgKHNldHEgcGFpciAocG9wIHBh aXJzKQotICAgICAgICAgICAgICAgICAgICAgIGN1cnJlbnQtYmVnIChjYXIgcGFpcikKLSAg ICAgICAgICAgICAgICAgICAgICBjdXJyZW50LWVuZCAoY2RyIHBhaXIpKQorICAgICAgICAg ICAgICAgIChzZXRxIHBvc2l0aW9ucyAocG9wIHBhaXJzKQorICAgICAgICAgICAgICAgICAg ICAgIGN1cnJlbnQtYmVnIChudGggMCBwb3NpdGlvbnMpCisgICAgICAgICAgICAgICAgICAg ICAgY3VycmVudC1lbmQgKG50aCAxIHBvc2l0aW9ucykpCisgICAgICAgICAgICAgICAgKHdo ZW4gKGJ1ZmZlci1saXZlLXAgeHJlZi1idWYpCisgICAgICAgICAgICAgICAgICAod2l0aC1j dXJyZW50LWJ1ZmZlciB4cmVmLWJ1ZgorICAgICAgICAgICAgICAgICAgICAoZ290by1jaGFy IChudGggMiBwb3NpdGlvbnMpKQorICAgICAgICAgICAgICAgICAgICAoeHJlZi0tc2V0LWFy cm93KSkpCiAgICAgICAgICAgICAgICAgKGdvdG8tY2hhciBjdXJyZW50LWJlZykKICAgICAg ICAgICAgICAgICAod2hlbiAocmUtc2VhcmNoLWZvcndhcmQgZnJvbSBjdXJyZW50LWVuZCBu b2Vycm9yKQogICAgICAgICAgICAgICAgICAgKHNldHEgZm91bmQgdCkpKQo= --------------nETqsaLkZLQ4RI0zBokq7781--