From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Troy Brown Newsgroups: gmane.emacs.bugs Subject: bug#71642: 30.0.50; eglot-execute doesn't support ExecuteCommandParams Date: Fri, 21 Jun 2024 08:14:02 -0400 Message-ID: References: <87v8243a22.fsf@jeremybryant.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000a51f6b061b655e1e" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="12458"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Jeremy Bryant , 71642@debbugs.gnu.org To: =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jun 21 19:45:33 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 1sKiKJ-0002xP-KA for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 21 Jun 2024 19:45:31 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sKiJu-0007eR-So; Fri, 21 Jun 2024 13:45:07 -0400 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 1sKiJs-0007bb-3Z for bug-gnu-emacs@gnu.org; Fri, 21 Jun 2024 13:45:04 -0400 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 1sKiJr-0001ZD-Ff for bug-gnu-emacs@gnu.org; Fri, 21 Jun 2024 13:45:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sKiJq-0002cK-F1 for bug-gnu-emacs@gnu.org; Fri, 21 Jun 2024 13:45:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Troy Brown Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 21 Jun 2024 17:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71642 X-GNU-PR-Package: emacs Original-Received: via spool by 71642-submit@debbugs.gnu.org id=B71642.171899189910034 (code B ref 71642); Fri, 21 Jun 2024 17:45:02 +0000 Original-Received: (at 71642) by debbugs.gnu.org; 21 Jun 2024 17:44:59 +0000 Original-Received: from localhost ([127.0.0.1]:43222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKiJn-0002bm-9v for submit@debbugs.gnu.org; Fri, 21 Jun 2024 13:44:59 -0400 Original-Received: from mail-wr1-f53.google.com ([209.85.221.53]:46099) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKiJj-0002bS-Ik for 71642@debbugs.gnu.org; Fri, 21 Jun 2024 13:44:57 -0400 Original-Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-363826fbcdeso1695900f8f.0 for <71642@debbugs.gnu.org>; Fri, 21 Jun 2024 10:44:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718991890; x=1719596690; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=L5N4gIhG6AwLNdSfRiqxdaAQTcottx2hAZzbuvUkPe8=; b=JmYhdXZNmMl1g4EdLSnXOEw3i+noPdcG+nSzZW/c2WfKWEbcjI/zTXqVoTNs2osOP2 akGfJ47bcO2ePZoPomhrl0v9iwRefY2nQZaN2M74IvC6Y1nBBizL6ONoMWGYqZhbeYyh oSyYXwH1Ntv6dVs2E/kQKOI8ZOhbtoA5RgJQS+tZId6Fe8hPerZaMQXAnXqhgpEE3L8z 6igI7T1oEEg9ToN6gF4+eyrLm15xwnXnC0XjJW+M3Uy62EV9nnj9xgyCz8+udzXeJ0ER V0hpry+IdMM8AOgnlcoP+KhVCeGSNSYLOvcbFGMkWY+xyrN2bVYDtvL8iNnRv1CmYtfR A5dw== X-Forwarded-Encrypted: i=1; AJvYcCUkuogX3lYi/yLUgkrs+eKohjs9cAsQ1OoW51b+g6zeUJInIthJNvqVoj6d5TLXccgshhLsazx+CG24rLaMBA8i8fuOBOc= X-Gm-Message-State: AOJu0YyHI9jyz8naGxaqW1c0eYiR9hJ39A60qp6D+GCOD3tV57P3ngMv wMeSiklxTouHi+scKD5CWLIkYjLDb8zNqOhmnPM1+Fz12V6P52tgbdSFdin3 X-Google-Smtp-Source: AGHT+IHhiDatxPMPtinORCGtT6wqw8T2s8XTuhzuhpLWTwq6syxeITxzYjmAAvdO60QRNEtQsfiyZg== X-Received: by 2002:a50:c2c9:0:b0:57c:749f:f5ef with SMTP id 4fb4d7f45d1cf-57d07ed4f92mr5197873a12.34.1718972054662; Fri, 21 Jun 2024 05:14:14 -0700 (PDT) Original-Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com. [209.85.218.52]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-57d30534ffasm855389a12.60.2024.06.21.05.14.13 for <71642@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Jun 2024 05:14:14 -0700 (PDT) Original-Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a6f7b785a01so211573866b.1 for <71642@debbugs.gnu.org>; Fri, 21 Jun 2024 05:14:13 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCUGJ7CTSM+QghgOKEx9p2tm6jtAmVT7xOEUs30uYyWU4D9nUShEKuo9nRgcFtFu+fWyKnUpHFh1pD4jJaobM21EU/hFEUM= X-Received: by 2002:a17:906:7003:b0:a6f:510b:5c88 with SMTP id a640c23a62f3a-a6fab7cd4c2mr415999566b.75.1718972053777; Fri, 21 Jun 2024 05:14:13 -0700 (PDT) In-Reply-To: X-Gmail-Original-Message-ID: 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:287624 Archived-At: --000000000000a51f6b061b655e1e Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Jun 20, 2024 at 5:46=E2=80=AFAM Jo=C3=A3o T=C3=A1vora wrote: > > On closer analysis the only confusing thing is that the spec > encourages clients to call textDocument/executeCommand with > illegal ExecuteCommandParams objects that contain an extraneous > 'title' > > Most servers apparently don't care, but Eglot is doing this and > it's a subtle bug. > > I think the right thing to do is to have Command _and_ > ExecuteCommandParams in the matcher. > Thanks for the explanation. > I've done a tweak to your patch. See after my sig. It's untested, so > please have a look. If you can, test, add more comments, change the order > if indeed it's needed. You can also change the implementation if you thi= nk > the recursiveness makes it more confusing. > I've updated the patch based on your suggestions. I've tested all invocations of executeCommand through Command, ExecuteCommandParams and CodeAction and they all appear to be working as expected now. I think the recursion is fine, it's simple and elegant. With regards to the order, you are correct, since the command in CodeAction isn't a string, it's not a problem. I was previously erroneously only testing with a string. --000000000000a51f6b061b655e1e Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Eglot-Fix-command-execution-bug-71642.patch" Content-Disposition: attachment; filename="0001-Eglot-Fix-command-execution-bug-71642.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lxonenr70 RnJvbSA5NjNlNWM5NzVmODlkOWM2MTExOTAyNjk0YWM1MWZhY2FmN2ZjMmI4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUcm95IEJyb3duIDxicm93bnRzQHRyb3licm93bi5kZXY+CkRh dGU6IFdlZCwgMTkgSnVuIDIwMjQgMjA6MTQ6MDcgLTA0MDAKU3ViamVjdDogW1BBVENIXSBFZ2xv dDogRml4IGNvbW1hbmQgZXhlY3V0aW9uIChidWcjNzE2NDIpCgoqIGxpc3AvcHJvZ21vZGVzL2Vn bG90LmVsIChlZ2xvdC0tbHNwLWludGVyZmFjZS1hbGlzdCk6IEFkZApFeGVjdXRlQ29tbWFuZFBh cmFtcyBpbnRlcmZhY2UuCihlZ2xvdC0tZXhlY3V0ZSk6IEZpeCBoYW5kbGluZyBvZiBDb21tYW5k IGFuZCBDb2RlQWN0aW9uIGFuZCBhZGQKRXhlY3V0ZUNvbW1hbmRQYXJhbXMuCgpDb3B5cmlnaHQt cGFwZXJ3b3JrLWV4ZW1wdDogeWVzCi0tLQogbGlzcC9wcm9nbW9kZXMvZWdsb3QuZWwgfCAxNSAr KysrKysrKysrKystLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCAzIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL2VnbG90LmVsIGIvbGlzcC9wcm9n bW9kZXMvZWdsb3QuZWwKaW5kZXggMDNkYTVjN2IyMmEuLmRmNGNiZTUwZGMwIDEwMDY0NAotLS0g YS9saXNwL3Byb2dtb2Rlcy9lZ2xvdC5lbAorKysgYi9saXNwL3Byb2dtb2Rlcy9lZ2xvdC5lbApA QCAtNjI0LDYgKzYyNCw3IEBAIGVnbG90LS11cmktcGF0aC1hbGxvd2VkLWNoYXJzCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIDpjb21tYW5kIDpkYXRhIDp0YWdzKSkKICAgICAgIChEaWFn bm9zdGljICg6cmFuZ2UgOm1lc3NhZ2UpICg6c2V2ZXJpdHkgOmNvZGUgOnNvdXJjZSA6cmVsYXRl ZEluZm9ybWF0aW9uIDpjb2RlRGVzY3JpcHRpb24gOnRhZ3MpKQogICAgICAgKERvY3VtZW50SGln aGxpZ2h0ICg6cmFuZ2UpICg6a2luZCkpCisgICAgICAoRXhlY3V0ZUNvbW1hbmRQYXJhbXMgKCg6 Y29tbWFuZCAuIHN0cmluZykpICg6YXJndW1lbnRzKSkKICAgICAgIChGaWxlU3lzdGVtV2F0Y2hl ciAoOmdsb2JQYXR0ZXJuKSAoOmtpbmQpKQogICAgICAgKEhvdmVyICg6Y29udGVudHMpICg6cmFu Z2UpKQogICAgICAgKEluaXRpYWxpemVSZXN1bHQgKDpjYXBhYmlsaXRpZXMpICg6c2VydmVySW5m bykpCkBAIC04ODQsMTcgKzg4NSwyNSBAQCBlZ2xvdC1leGVjdXRlLWNvbW1hbmQKIAogKGNsLWRl ZmdlbmVyaWMgZWdsb3QtZXhlY3V0ZSAoc2VydmVyIGFjdGlvbikKICAgIkFzayBTRVJWRVIgdG8g ZXhlY3V0ZSBBQ1RJT04uCi1BQ1RJT04gaXMgYW4gTFNQIG9iamVjdCBvZiBlaXRoZXIgYENvZGVB Y3Rpb24nIG9yIGBDb21tYW5kJyB0eXBlLiIKK0FDVElPTiBpcyBhbiBMU1AgYENvZGVBY3Rpb24n LCBgQ29tbWFuZCcgb3IgYEV4ZWN1dGVDb21tYW5kUGFyYW1zJworb2JqZWN0LiIKICAgKDptZXRo b2QKICAgIChzZXJ2ZXIgYWN0aW9uKSAiRGVmYXVsdCBpbXBsZW1lbnRhdGlvbi4iCiAgICAoZWds b3QtLWRjYXNlIGFjdGlvbgotICAgICAoKChDb21tYW5kKSkgKGVnbG90LS1yZXF1ZXN0IHNlcnZl ciA6d29ya3NwYWNlL2V4ZWN1dGVDb21tYW5kIGFjdGlvbikpCisgICAgICgoKENvbW1hbmQpKQor ICAgICAgOzsgQ29udmVydCB0byBFeGVjdXRlQ29tbWFuZFBhcmFtcyBhbmQgcmVjdXJzZSAoYnVn IzcxNjQyKQorICAgICAgKGNsLXJlbWYgYWN0aW9uIDp0aXRsZSkKKyAgICAgIChlZ2xvdC1leGVj dXRlIHNlcnZlciBhY3Rpb24pKQorICAgICAoKChFeGVjdXRlQ29tbWFuZFBhcmFtcykpCisgICAg ICAoZWdsb3QtLXJlcXVlc3Qgc2VydmVyIDp3b3Jrc3BhY2UvZXhlY3V0ZUNvbW1hbmQgYWN0aW9u KSkKICAgICAgKCgoQ29kZUFjdGlvbikgZWRpdCBjb21tYW5kIGRhdGEpCiAgICAgICAoaWYgKGFu ZCAobnVsbCBlZGl0KSAobnVsbCBjb21tYW5kKSBkYXRhCiAgICAgICAgICAgICAgICAoZWdsb3Qt c2VydmVyLWNhcGFibGUgOmNvZGVBY3Rpb25Qcm92aWRlciA6cmVzb2x2ZVByb3ZpZGVyKSkKICAg ICAgICAgICAoZWdsb3QtZXhlY3V0ZSBzZXJ2ZXIgKGVnbG90LS1yZXF1ZXN0IHNlcnZlciA6Y29k ZUFjdGlvbi9yZXNvbHZlIGFjdGlvbikpCiAgICAgICAgICh3aGVuIGVkaXQgKGVnbG90LS1hcHBs eS13b3Jrc3BhY2UtZWRpdCBlZGl0IHRoaXMtY29tbWFuZCkpCi0gICAgICAgICh3aGVuIGNvbW1h bmQgKGVnbG90LS1yZXF1ZXN0IHNlcnZlciA6d29ya3NwYWNlL2V4ZWN1dGVDb21tYW5kIGNvbW1h bmQpKSkpKSkpCisgICAgICAgICh3aGVuIGNvbW1hbmQKKyAgICAgICAgICA7OyBSZWN1cnNpdmUg Y2FsbCB3aXRoIHdoYXQgbXVzdCBiZSBhIENvbW1hbmQgb2JqZWN0IChidWcjNzE2NDIpCisgICAg ICAgICAgKGVnbG90LWV4ZWN1dGUgc2VydmVyIGNvbW1hbmQpKSkpKSkpCiAKIChjbC1kZWZnZW5l cmljIGVnbG90LWluaXRpYWxpemF0aW9uLW9wdGlvbnMgKHNlcnZlcikKICAgIkpTT04gb2JqZWN0 IHRvIHNlbmQgdW5kZXIgYGluaXRpYWxpemF0aW9uT3B0aW9ucycuIgotLSAKMi4zNy4xCgo= --000000000000a51f6b061b655e1e--