From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Evgeni Kolev Newsgroups: gmane.emacs.bugs Subject: bug#62371: [PATCH] Fix go-ts-mode incorrect docstring inserted for methods Date: Wed, 22 Mar 2023 10:05:56 +0200 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000c4826c05f778a2f0" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="15959"; mail-complaints-to="usenet@ciao.gmane.io" To: 62371@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Mar 22 09:07:22 2023 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 1petVC-000415-BF for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 22 Mar 2023 09:07:22 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1petUz-0001xs-FP; Wed, 22 Mar 2023 04:07:09 -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 1petUy-0001xi-5a for bug-gnu-emacs@gnu.org; Wed, 22 Mar 2023 04:07:08 -0400 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 1petUs-0001Y3-2s for bug-gnu-emacs@gnu.org; Wed, 22 Mar 2023 04:07:07 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1petUr-0004iu-RQ for bug-gnu-emacs@gnu.org; Wed, 22 Mar 2023 04:07:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Evgeni Kolev Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 22 Mar 2023 08:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62371 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.167947238818114 (code B ref -1); Wed, 22 Mar 2023 08:07:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 22 Mar 2023 08:06:28 +0000 Original-Received: from localhost ([127.0.0.1]:33395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1petUK-0004i6-6q for submit@debbugs.gnu.org; Wed, 22 Mar 2023 04:06:28 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:33162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1petUJ-0004hz-4l for submit@debbugs.gnu.org; Wed, 22 Mar 2023 04:06:27 -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 1petUI-0001hr-Sg for bug-gnu-emacs@gnu.org; Wed, 22 Mar 2023 04:06:26 -0400 Original-Received: from mail-qv1-xf2c.google.com ([2607:f8b0:4864:20::f2c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1petUH-0001Pg-Br for bug-gnu-emacs@gnu.org; Wed, 22 Mar 2023 04:06:26 -0400 Original-Received: by mail-qv1-xf2c.google.com with SMTP id m16so4307924qvi.12 for ; Wed, 22 Mar 2023 01:06:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679472382; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=y398oMGCW8sUIWthLPt7QbY+PIXBtiqTCSkM+5EZVek=; b=VRjcLXuAm4SXVRpQhG+NxjCy+pi688TwEiyAiQIywVf7un0DG89lzboUuXWwcwnBjj Nnqd7U2Rs9OuxHlv8xgkoNB46axe7VKp5eb76uPIzIjJG1H3tlb15AHmy6OGjgeHN8WI itAMNWP+xyBFP7d/sOCou0Ni2rq7oVFKIShVy3WV9UX0BopwRUvSHzRcW0M8J9Pev7mb 7MNOcCc+0hplKLWoM1oyRMzUGxGg6ziECnvIxNUeKQam/qWXGyj/4phMa501zzHAckZU BRnobIdof+4ztiW2cCHbn5bJGXq7BTy2HPc60R2rYxLtX2BzitBRZByaCiGfAof/je7r HeoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679472382; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=y398oMGCW8sUIWthLPt7QbY+PIXBtiqTCSkM+5EZVek=; b=w/QoiX15fYcaLRWTAHf1+bShPF7LFk2JnBOYZTxvKBdfCxDnQDgRHm0yHrdrVJmLRR OVymRXocwCOq43D+Cuj81TZ8DuaHnflI5rmAo9nP8uN475syigzVpgN9GWY9GyeiB8dM /lJKHQzXN5wkRJc8Bp+jtzDAtAUDqQTHXyU/0xrlfx0exbJ422ozYnOJQev9ZCs//m0r ZDWtbOfHyXdGaBAnvGQIykvOskSdRiytFyI/zG4WDSXi9LgEDxumP02ToT6CZ+6S04lR t2+kwExGSJa+nwQs6Ffz6/Uh5iuAUbI0OOEAOEQCBGW3hdwl/XdVSUavGF8j3ThXUqSX 0iCQ== X-Gm-Message-State: AO0yUKVkZ9SfyKfNk6n5YHarXW/QN9ueADZgQW1rXlH6enM/7tOFdGj/ VKLDDB1RPKT6s4JkOnPraKf4WfmKVgbkeUDWA6zSfqjg8Kv0Fzd7 X-Google-Smtp-Source: AK7set8jO9ucXesuKy3OTz/vCMA/KlCp2FNo7vI3n296KTbVM2fHmKVM6Zso6dpZAfV1CJWMaRRXHV8mNR2CGzoag9s= X-Received: by 2002:ad4:4f25:0:b0:56f:fe44:f257 with SMTP id fc5-20020ad44f25000000b0056ffe44f257mr562556qvb.1.1679472382453; Wed, 22 Mar 2023 01:06:22 -0700 (PDT) Received-SPF: pass client-ip=2607:f8b0:4864:20::f2c; envelope-from=evgenysw@gmail.com; helo=mail-qv1-xf2c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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:258390 Archived-At: --000000000000c4826c05f778a2f0 Content-Type: text/plain; charset="UTF-8" The docstring inserted with go-ts-mode's C-c C-d was incorrectly prefixed with the receiver "(myStruct).": // (myStruct).act func (m *myStruct) act () {...} The above docstring is not correct because the receiver "myStruct" should not be in the docstring. The issue is caused by imenu and go-ts-mode--defun-name using the same code to determine the defun name. Instead, they should produce different results - imenu should show the "myStruct" prefix, but the docstring should not. This commit fixes the incorrect behavior by introducing an optional SKIP-PREFIX parameter to (go-ts-mode--defun-name). Pressing C-c C-d now inserts just the method name: // act func (m *myStruct) act () {...} * lisp/progmodes/go-ts-mode.el (go-ts-mode--defun-name): New optional parameter SKIP-PREFIX. (go-ts-mode-docstring): Call (go-ts-mode--defun-name t) instead of (treesit-defun-name). --000000000000c4826c05f778a2f0 Content-Type: application/octet-stream; name="0001-Fix-go-ts-mode-incorrect-docstring-inserted-for-meth.patch" Content-Disposition: attachment; filename="0001-Fix-go-ts-mode-incorrect-docstring-inserted-for-meth.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lfjeg3u30 RnJvbSA0M2VjMDg0MTI4NjgwOTk3MzViMjI5ZTRhZWZmNWViMjc2YzRmMDgyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFdmdlbmkgS29sZXYgPGV2Z2VueXN3QGdtYWlsLmNvbT4KRGF0 ZTogV2VkLCA4IEZlYiAyMDIzIDE3OjE2OjAyICswMjAwClN1YmplY3Q6IFtQQVRDSF0gRml4IGdv LXRzLW1vZGUgaW5jb3JyZWN0IGRvY3N0cmluZyBpbnNlcnRlZCBmb3IgbWV0aG9kcwoKVGhlIGRv Y3N0cmluZyBpbnNlcnRlZCB3aXRoIGdvLXRzLW1vZGUncyBDLWMgQy1kIHdhcyBpbmNvcnJlY3Rs eQpwcmVmaXhlZCB3aXRoIHRoZSByZWNlaXZlciAiKG15U3RydWN0KS4iOgoKICAgIC8vIChteVN0 cnVjdCkuYWN0CiAgICBmdW5jIChtICpteVN0cnVjdCkgYWN0ICgpIHsuLi59CgpUaGUgYWJvdmUg ZG9jc3RyaW5nIGlzIG5vdCBjb3JyZWN0IGJlY2F1c2UgdGhlIHJlY2VpdmVyICJteVN0cnVjdCIK c2hvdWxkIG5vdCBiZSBpbiB0aGUgZG9jc3RyaW5nLgoKVGhlIGlzc3VlIGlzIGNhdXNlZCBieSBp bWVudSBhbmQgZ28tdHMtbW9kZS0tZGVmdW4tbmFtZSB1c2luZyB0aGUgc2FtZQpjb2RlIHRvIGRl dGVybWluZSB0aGUgZGVmdW4gbmFtZS4gSW5zdGVhZCwgdGhleSBzaG91bGQgcHJvZHVjZQpkaWZm ZXJlbnQgcmVzdWx0cyAtIGltZW51IHNob3VsZCBzaG93IHRoZSAibXlTdHJ1Y3QiIHByZWZpeCwg YnV0IHRoZQpkb2NzdHJpbmcgc2hvdWxkIG5vdC4KClRoaXMgY29tbWl0IGZpeGVzIHRoZSBpbmNv cnJlY3QgYmVoYXZpb3IgYnkgaW50cm9kdWNpbmcgYW4gb3B0aW9uYWwKU0tJUC1QUkVGSVggcGFy YW1ldGVyIHRvIChnby10cy1tb2RlLS1kZWZ1bi1uYW1lKS4gUHJlc3NpbmcgQy1jIEMtZApub3cg aW5zZXJ0cyBqdXN0IHRoZSBtZXRob2QgbmFtZToKCiAgICAvLyBhY3QKICAgIGZ1bmMgKG0gKm15 U3RydWN0KSBhY3QgKCkgey4uLn0KCiogbGlzcC9wcm9nbW9kZXMvZ28tdHMtbW9kZS5lbCAoZ28t dHMtbW9kZS0tZGVmdW4tbmFtZSk6IE5ldyBvcHRpb25hbApwYXJhbWV0ZXIgU0tJUC1QUkVGSVgu IChnby10cy1tb2RlLWRvY3N0cmluZyk6CkNhbGwgKGdvLXRzLW1vZGUtLWRlZnVuLW5hbWUgdCkg aW5zdGVhZCBvZiAodHJlZXNpdC1kZWZ1bi1uYW1lKS4KLS0tCiBsaXNwL3Byb2dtb2Rlcy9nby10 cy1tb2RlLmVsIHwgMTYgKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDggaW5zZXJ0 aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL3Byb2dtb2Rlcy9nby10 cy1tb2RlLmVsIGIvbGlzcC9wcm9nbW9kZXMvZ28tdHMtbW9kZS5lbAppbmRleCBlNmU4YWJkNjQ0 NS4uZmRhNmEzNmU0MmQgMTAwNjQ0Ci0tLSBhL2xpc3AvcHJvZ21vZGVzL2dvLXRzLW1vZGUuZWwK KysrIGIvbGlzcC9wcm9nbW9kZXMvZ28tdHMtbW9kZS5lbApAQCAtMjU1LDkgKzI1NSwxMCBAQCBn by10cy1tb2RlCiAoaWYgKHRyZWVzaXQtcmVhZHktcCAnZ28pCiAgICAgKGFkZC10by1saXN0ICdh dXRvLW1vZGUtYWxpc3QgJygiXFwuZ29cXCciIC4gZ28tdHMtbW9kZSkpKQogCi0oZGVmdW4gZ28t dHMtbW9kZS0tZGVmdW4tbmFtZSAobm9kZSkKKyhkZWZ1biBnby10cy1tb2RlLS1kZWZ1bi1uYW1l IChub2RlICZvcHRpb25hbCBza2lwLXByZWZpeCkKICAgIlJldHVybiB0aGUgZGVmdW4gbmFtZSBv ZiBOT0RFLgotUmV0dXJuIG5pbCBpZiB0aGVyZSBpcyBubyBuYW1lIG9yIGlmIE5PREUgaXMgbm90 IGEgZGVmdW4gbm9kZS4iCitSZXR1cm4gbmlsIGlmIHRoZXJlIGlzIG5vIG5hbWUgb3IgaWYgTk9E RSBpcyBub3QgYSBkZWZ1biBub2RlLgorTWV0aG9kcyBhcmUgcHJlZml4ZWQgd2l0aCB0aGUgcmVj ZWl2ZXIgbmFtZSwgdW5sZXNzIFNLSVAtUFJFRklYIGlzIHQuIgogICAocGNhc2UgKHRyZWVzaXQt bm9kZS10eXBlIG5vZGUpCiAgICAgKCJmdW5jdGlvbl9kZWNsYXJhdGlvbiIKICAgICAgKHRyZWVz aXQtbm9kZS10ZXh0CkBAIC0yNjYsMTEgKzI2NywxMCBAQCBnby10cy1tb2RlLS1kZWZ1bi1uYW1l CiAgICAgICB0KSkKICAgICAoIm1ldGhvZF9kZWNsYXJhdGlvbiIKICAgICAgKGxldCogKChyZWNl aXZlci1ub2RlICh0cmVlc2l0LW5vZGUtY2hpbGQtYnktZmllbGQtbmFtZSBub2RlICJyZWNlaXZl ciIpKQotICAgICAgICAgICAgKHR5cGUtbm9kZSAodHJlZXNpdC1zZWFyY2gtc3VidHJlZSByZWNl aXZlci1ub2RlICJ0eXBlX2lkZW50aWZpZXIiKSkKLSAgICAgICAgICAgIChuYW1lLW5vZGUgKHRy ZWVzaXQtbm9kZS1jaGlsZC1ieS1maWVsZC1uYW1lIG5vZGUgIm5hbWUiKSkpCi0gICAgICAgKGNv bmNhdAotICAgICAgICAiKCIgKHRyZWVzaXQtbm9kZS10ZXh0IHR5cGUtbm9kZSkgIikuIgotICAg ICAgICAodHJlZXNpdC1ub2RlLXRleHQgbmFtZS1ub2RlKSkpKQorICAgICAgICAgICAgKHJlY2Vp dmVyICh0cmVlc2l0LW5vZGUtdGV4dCAodHJlZXNpdC1zZWFyY2gtc3VidHJlZSByZWNlaXZlci1u b2RlICJ0eXBlX2lkZW50aWZpZXIiKSkpCisgICAgICAgICAgICAobWV0aG9kICh0cmVlc2l0LW5v ZGUtdGV4dCAodHJlZXNpdC1ub2RlLWNoaWxkLWJ5LWZpZWxkLW5hbWUgbm9kZSAibmFtZSIpKSkp CisgICAgICAgKGlmIHNraXAtcHJlZml4IG1ldGhvZAorICAgICAgICAgKGNvbmNhdCAiKCIgcmVj ZWl2ZXIgIikuIiBtZXRob2QpKSkpCiAgICAgKCJ0eXBlX2RlY2xhcmF0aW9uIgogICAgICAodHJl ZXNpdC1ub2RlLXRleHQKICAgICAgICh0cmVlc2l0LW5vZGUtY2hpbGQtYnktZmllbGQtbmFtZQpA QCAtMzE0LDcgKzMxNCw3IEBAIGdvLXRzLW1vZGUtZG9jc3RyaW5nCiAgICAgICAgIDs7IGdvIHRv IHRvcCBjb21tZW50IGxpbmUKICAgICAgICAgKHdoaWxlIChnby10cy1tb2RlLS1jb21tZW50LW9u LXByZXZpb3VzLWxpbmUtcCkKICAgICAgICAgICAoZm9yd2FyZC1saW5lIC0xKSkKLSAgICAgIChp bnNlcnQgIi8vICIgKHRyZWVzaXQtZGVmdW4tbmFtZSBkZWZ1bi1ub2RlKSkKKyAgICAgIChpbnNl cnQgIi8vICIgKGdvLXRzLW1vZGUtLWRlZnVuLW5hbWUgZGVmdW4tbm9kZSB0KSkKICAgICAgIChu ZXdsaW5lKQogICAgICAgKGJhY2t3YXJkLWNoYXIpKSkpCiAKLS0gCjIuMzkuMQoK --000000000000c4826c05f778a2f0--