From unknown Tue Jun 24 17:27:07 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60355: 29.0.60; Tree sitter incorrectly handles of PRED for treesit-defun-type-regexp Resent-From: Wilhelm H Kirschbaum Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 27 Dec 2022 12:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60355 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 60355@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16721439423767 (code B ref -1); Tue, 27 Dec 2022 12:26:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Dec 2022 12:25:42 +0000 Received: from localhost ([127.0.0.1]:54866 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pA91a-0000yh-HC for submit@debbugs.gnu.org; Tue, 27 Dec 2022 07:25:42 -0500 Received: from lists.gnu.org ([209.51.188.17]:41144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pA91Y-0000yY-BX for submit@debbugs.gnu.org; Tue, 27 Dec 2022 07:25:40 -0500 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 1pA91V-0007G6-NA for bug-gnu-emacs@gnu.org; Tue, 27 Dec 2022 07:25:38 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pA91U-0005oY-1E for bug-gnu-emacs@gnu.org; Tue, 27 Dec 2022 07:25:37 -0500 Received: by mail-wm1-x32c.google.com with SMTP id o15so9208727wmr.4 for ; Tue, 27 Dec 2022 04:25:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:organization:date:subject:to:from :user-agent:from:to:cc:subject:date:message-id:reply-to; bh=JomhKnD+UqtboOAFfhZM71Z79uoo7yOBX09Tbp8X2FE=; b=K8M9X0EKtHlxEsZoJQN1BFFuV2mElGCIOgqJckF4ODeFLkwRfOSeJxcHkNUWpwkUEa iT+015G6DQYxiYUhriJwB0Uw9NWnGJdd2//WCOhsvw7Hv2y9VSsAFQOrF1WdEvm/4d61 8Zp1DvaWBCiRKRHULT9fgG52umhJYfkpqXosQCo9CROKOZy6Xbtp9+rSt+A3vD+rN7Nx chFeJbggvsE1VYz6cvTxOuDzp/uLDFbknTH/lbIs6YxE6ITnJheX7gxOuo7vJjkbM1Dl UTKD3q+N0QpkaOqGAhUBpr6Cqm90+mViHOCEa/zmCGEUzVhJTOfkbKEKSCMBrMC2rgQd F5aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:organization:date:subject:to:from :user-agent:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JomhKnD+UqtboOAFfhZM71Z79uoo7yOBX09Tbp8X2FE=; b=jQ7SyAHqH2Q7v/TxnHPZACrItbE8xzhboG/nCP9BdzW+PrnbQVpRSRfSTf/y0DoQPX Mw3pu8sXs4pNP4PkJ3ma88yI4hYLbqfK9BHDluwfN0WnQqPID+97UqQS9U5Fe4US3VEm f4DbbDZFpf9f2m6Fywx1nO6de8LKNe4JRgK6gWVEfFjyosmJPbcKo0n4616Q3OUTD6G5 qUVWgtMhUJWDu9c66mNs1tJcdbirtxMXiIM/zhtHhseZGAFqfPjftPvUeHVq+E66+U3B F6MDFBjUuuylwP0o9CS22uTpnaORryHcaPCkLQ/AFzmmnbzfI6Nsxm/CYJtK6BLrlVg8 K94A== X-Gm-Message-State: AFqh2kovMwTSgB5mnlv40VMB0eSD+pYH8v9ZTZYBEAwijoq2vMG5LKJe Nt2gGnRSAqGcN5w/UmbVgKg3G1JzDkM= X-Google-Smtp-Source: AMrXdXvDmFRjwlHKA7qEm5TNiyMTl7LXQn60vdG9P79JwyZ7qyHhx8JkLIokOwjeErqfBKu/2qlrQA== X-Received: by 2002:a05:600c:42d4:b0:3d0:6d39:c62e with SMTP id j20-20020a05600c42d400b003d06d39c62emr15278359wme.12.1672143932969; Tue, 27 Dec 2022 04:25:32 -0800 (PST) Received: from melissa.local ([2c0f:ef18:1431:0:b09:9616:db04:c248]) by smtp.gmail.com with ESMTPSA id m28-20020a05600c3b1c00b003d1e3b1624dsm23641223wms.2.2022.12.27.04.25.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Dec 2022 04:25:32 -0800 (PST) User-agent: mu4e 1.9.3; emacs 29.0.60 From: Wilhelm H Kirschbaum Date: Tue, 27 Dec 2022 14:09:29 +0200 Organization: Personal Message-ID: <87cz85yqx2.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; format=flowed Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=wkirschbaum@gmail.com; helo=mail-wm1-x32c.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-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) When `treesit-defun-type-regexp` is set with a cons cell (regexp . some-pred) the following case does not get handled as expected when calling (end-of-defun): ```elixir defmodule Example do def foo() do ; regexp match, pred match end ;; @impl true ; regexp match, pred does not match def bar() do ; regexp match, pred match end ;; def baz() do end end ;; ``` The function `treesit--things-around` only looks at the PRED after it searches forward and would then not be aware of the non matching node. The following change works for my case where search-forward takes in the PRED, not just the regexp: diff --git a/lisp/treesit.el b/lisp/treesit.el index 2130cd0061..7997509f50 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -1776,7 +1776,13 @@ treesit--things-around node "" nil nil t)) node)) (result (list nil nil nil)) - (pred (or pred (lambda (_) t)))) + (pred (if (null pred) + (lambda (node) + (string-match-p regexp (treesit-node-type node))) + (lambda (node) + (and (string-match-p regexp (treesit-node-type node)) + (funcall pred node)))))) + ;; 1. Find previous and next sibling defuns. (cl-loop for idx from 0 to 1 @@ -1798,12 +1804,10 @@ treesit--things-around do (cl-loop for cursor = (when node (save-excursion (treesit-search-forward - node regexp backward backward))) + node pred backward backward))) then (treesit-node-parent cursor) while cursor - if (and (string-match-p - regexp (treesit-node-type cursor)) - (funcall pred cursor) + if (and (funcall pred cursor) (funcall pos-pred cursor)) do (setf (nth idx result) cursor))) ;; 2. Find the parent defun. Hope this makes sense, Wilhelm ps. Sorry about the email swapping, think it should be fixed now. From unknown Tue Jun 24 17:27:07 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60355: 29.0.60; Tree sitter incorrectly handles of PRED for treesit-defun-type-regexp References: <87cz85yqx2.fsf@gmail.com> In-Reply-To: <87cz85yqx2.fsf@gmail.com> Resent-From: Yuan Fu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 28 Dec 2022 01:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60355 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Wilhelm Cc: 60355@debbugs.gnu.org Received: via spool by 60355-submit@debbugs.gnu.org id=B60355.167219206724622 (code B ref 60355); Wed, 28 Dec 2022 01:48:01 +0000 Received: (at 60355) by debbugs.gnu.org; 28 Dec 2022 01:47:47 +0000 Received: from localhost ([127.0.0.1]:56831 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pALXm-0006P1-SB for submit@debbugs.gnu.org; Tue, 27 Dec 2022 20:47:47 -0500 Received: from mail-wm1-f44.google.com ([209.85.128.44]:41658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pALXl-0006OL-RO for 60355@debbugs.gnu.org; Tue, 27 Dec 2022 20:47:46 -0500 Received: by mail-wm1-f44.google.com with SMTP id ay2-20020a05600c1e0200b003d22e3e796dso10482911wmb.0 for <60355@debbugs.gnu.org>; Tue, 27 Dec 2022 17:47:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:from:to:cc:subject:date:message-id :reply-to; bh=hueohmRJ9LA4vdFIE8h+zk4Qy0ByO5Pie17cvxKgkyU=; b=A/eWCFk5RExjCv1AURwT1sPeI8qaeWAgSeE6LOLWz/62/v2aP2qSuZ0qPMGnnw+Zp7 VR4mh7wqJax9BcKfBxhlUCYQjBzuNPQTuzd/si5h9/6DwsppQMv4N/c/K3aCbzmy0oG7 SttZw6vGhMz9P7Yv04etxOfFnBH6GFlz0F04W6qvqNcuhwoee6Vbs6jZq+PcRfTX2FBc TbXAGcTomkbbC53aKMlsXiTKyoEdLFLNM0G+BqHG+GrdWtKLZSaw/QxrjCSVG5z3zKyN hCyTYduHKWG5+wofbPQOaMPR3aOnllRPY7w4pNBbopYtAUIU+q9KwviZhQY0xLvCGOpc gzNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hueohmRJ9LA4vdFIE8h+zk4Qy0ByO5Pie17cvxKgkyU=; b=Gm3ndiKMYbx1DZxolgyg/NTFN64zg0InzxWhNY5XrVgxR/LDF8YpdNF8ScktAW29ni OHNTTAILJMtmXVMnJqGND6mTHIhAjxy//RmpxTx73FNzAz1EAyPRN2hFZQzrhAc3tfKx 5ZOR84V0X0pRUDkDj2UUM9G5LjynUGqUh20tGI9YWz3AtlfVjwfyXkVa3ilROJ1I5sKA bMjXi0ZrC37/nEpY9GLfqYQeZPRu4NO9dXMnOSQzWPKkF0T69BuFE0FFeQo44aKqR/SN CflHC3rofOTJudZ1jGxzg/dD0x++jkG5uE0rVzxxVCnempIcflvQbEYEGFKnVU5Uizvx 2j1g== X-Gm-Message-State: AFqh2kqVt/zyZ6qB2behkZ8Ua4MJz3dlihXzf2uCVw9n0uBb8x6HOY4E 2yHCr5D5CcvXRSW41DjfhE0= X-Google-Smtp-Source: AMrXdXsBZoYzzb/HkgTI7bQ2tvHpHC/GwYRbD58u8jfWU2ugNbn3w+2ZkR6iSNzzBsi1StNVp1dIaA== X-Received: by 2002:a05:600c:34cf:b0:3d0:7415:c5a9 with SMTP id d15-20020a05600c34cf00b003d07415c5a9mr16979822wmq.21.1672192059797; Tue, 27 Dec 2022 17:47:39 -0800 (PST) Received: from smtpclient.apple (cpe-172-117-161-177.socal.res.rr.com. [172.117.161.177]) by smtp.gmail.com with ESMTPSA id o7-20020a05600c4fc700b003cf4ec90938sm21713511wmq.21.2022.12.27.17.47.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Dec 2022 17:47:39 -0800 (PST) From: Yuan Fu Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Message-Id: <1E7949EC-7420-4848-9F45-88A20BAAE1D8@gmail.com> Date: Tue, 27 Dec 2022 17:47:35 -0800 X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Wilhelm H Kirschbaum writes: > When `treesit-defun-type-regexp` is set with a cons cell (regexp . > some-pred) > the following case does not get handled as expected when calling > (end-of-defun): > > ```elixir > defmodule Example do > def foo() do ; regexp match, pred match > end > > ;; > @impl true ; regexp match, pred does not match > def bar() do ; regexp match, pred match > end > ;; > > def baz() do > end > end > ;; > ``` Thank you very much! The root cause is actually another problem, but anyway it is fixed now. May I also suggest you to use this function for the predicate: (defun elixir-ts-mode--capture-defun (node) ;; NODE should be a =E2=80=98call=E2=80=99 node. (member (treesit-node-text (treesit-node-child-by-field-name node "target")) elixir-ts-mode--definition-keywords)) This should be more accurate than the current one, and is IMO simpler too. Yuan From unknown Tue Jun 24 17:27:07 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60355: 29.0.60; Tree sitter incorrectly handles of PRED for treesit-defun-type-regexp Resent-From: Wilhelm H Kirschbaum Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 28 Dec 2022 06:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60355 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Yuan Fu Cc: 60355@debbugs.gnu.org Received: via spool by 60355-submit@debbugs.gnu.org id=B60355.167220922221637 (code B ref 60355); Wed, 28 Dec 2022 06:34:02 +0000 Received: (at 60355) by debbugs.gnu.org; 28 Dec 2022 06:33:42 +0000 Received: from localhost ([127.0.0.1]:56973 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAQ0U-0005cv-8j for submit@debbugs.gnu.org; Wed, 28 Dec 2022 01:33:42 -0500 Received: from mail-wm1-f54.google.com ([209.85.128.54]:34585) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAQ0S-0005ci-FN for 60355@debbugs.gnu.org; Wed, 28 Dec 2022 01:33:40 -0500 Received: by mail-wm1-f54.google.com with SMTP id bi26-20020a05600c3d9a00b003d3404a89faso9588281wmb.1 for <60355@debbugs.gnu.org>; Tue, 27 Dec 2022 22:33:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:in-reply-to :organization:date:subject:cc:to:from:user-agent:references:from:to :cc:subject:date:message-id:reply-to; bh=Bh6P7czEhSBykS+u6V+GIyp5JjeYh8RotQQ540cTSoM=; b=SFgxAj+RuRMI++7oe9iO5FuPGrvwQ1Lr0f9VGV2/d+jOvdES7cRhgGH88dJ2GyRUWx U566JVVE/IZvtOjUcrFX8tw5JA3mmDsgO7Kev/HpvRXP9vL7csSBhAoVdhTsKir1gJTL YCPKK10s+rK+7m/Qpn9ZTxhLYn9qcnkqOuWKEbtf9Xl7ycIw/2uKpuAPWiGpLeW3pIpn ntvVB2lP70p1HXNTnU6P5sSpa6puci5w4h8vM9P6ODDa2JhFcb220UOGB4kavD72OgPJ juTyd1xa1HwT0zTqLfbCydf7Y85EyoHDkLNA5Vv/H/RQ6ZDI98vaTiYSoZBCXIdFm/CT SjGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:in-reply-to :organization:date:subject:cc:to:from:user-agent:references :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Bh6P7czEhSBykS+u6V+GIyp5JjeYh8RotQQ540cTSoM=; b=zowfEI+UeKJuRB7j7iy6MuC/PELKUVU/k5R47dcYXqMcfHPaA5TmEiy9hMIGeVILid psLEyayDkFRKV8L42P/fLiYjaDGky5cRXn+0hZRxEcqs1kMp+a9+REx8G31nUsD9kk2T 6lENWHdExSQ5IDm4+ky0wrBJT1PZApZHbe2yWsfFB6viB4qTgEb7aG25kxy6DRACanSU PoVEdOgVgUzSqWwxYR0W7MVFJBeJ639evSX5J6duRlmlUT8YQDpkC4j1+oNwc+PNs2Ad Wi5sCBdFoMcQNkVBCs/cLIdCv6/0DqijbjIAs7CeA9GRfmB9BPNckSFZaCMsSJkZwbFt PQsw== X-Gm-Message-State: AFqh2kr9VLnHTGHVu81/ka+PGdv6QiDnxkrF7KBwqIlspUS44U282ey0 FQy1QfZ2/aGcJIPV8JGrxpx5HlQ1R5zarg== X-Google-Smtp-Source: AMrXdXte/gWNV8NC2r7XUCiUTrfeRkkss22dug0ulviPTapzGG7b+U1yyeZNPDUNOd1Ozdh9xt0QpA== X-Received: by 2002:a05:600c:1c27:b0:3cf:a83c:184a with SMTP id j39-20020a05600c1c2700b003cfa83c184amr17129639wms.24.1672209214282; Tue, 27 Dec 2022 22:33:34 -0800 (PST) Received: from melissa.local ([2c0f:ef18:1431:0:b09:9616:db04:c248]) by smtp.gmail.com with ESMTPSA id d9-20020a05600c3ac900b003d973d4fb28sm13851678wms.4.2022.12.27.22.33.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Dec 2022 22:33:33 -0800 (PST) References: <1E7949EC-7420-4848-9F45-88A20BAAE1D8@gmail.com> User-agent: mu4e 1.9.3; emacs 29.0.60 From: Wilhelm H Kirschbaum Date: Wed, 28 Dec 2022 08:31:32 +0200 Organization: Personal In-reply-to: <1E7949EC-7420-4848-9F45-88A20BAAE1D8@gmail.com> Message-ID: <87sfh0ujet.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Thanks Yuan, just checked and both the fix and your suggestion=20 works. I see there is a typo in your last change: @@ -310,7 +310,7 @@ java-ts-mode ;; Imenu. (setq-local treesit-simple-imenu-settings '(("Class" "\\`class_declaration\\'" nil nil) - ("Interface "\\`interface_declaration\\'" nil=20 nil) + ("Interface" "\\`interface_declaration\\'" nil=20 nil) ("Enum" "\\`record_declaration\\'" nil nil) ("Method" "\\`method_declaration\\'" nil nil))) (treesit-major-mode-setup)) Yuan Fu writes: > Wilhelm H Kirschbaum writes: > >> When `treesit-defun-type-regexp` is set with a cons cell=20 >> (regexp . >> some-pred) >> the following case does not get handled as expected when=20 >> calling >> (end-of-defun): >> >> ```elixir >> defmodule Example do >> def foo() do ; regexp match, pred match >> end >> >> ;; >> @impl true ; regexp match, pred does not match >> def bar() do ; regexp match, pred match >> end >> ;; >> >> def baz() do >> end >> end >> ;; >> ``` > > Thank you very much! The root cause is actually another problem,=20 > but > anyway it is fixed now. > > May I also suggest you to use this function for the predicate: > > (defun elixir-ts-mode--capture-defun (node) > ;; NODE should be a =E2=80=98call=E2=80=99 node. > (member (treesit-node-text > (treesit-node-child-by-field-name node "target")) > elixir-ts-mode--definition-keywords)) > > This should be more accurate than the current one, and is IMO=20 > simpler > too. > > Yuan From unknown Tue Jun 24 17:27:07 2025 X-Loop: help-debbugs@gnu.org Subject: bug#60355: 29.0.60; Tree sitter incorrectly handles of PRED for treesit-defun-type-regexp Resent-From: Yuan Fu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 28 Dec 2022 08:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60355 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Wilhelm H Kirschbaum Cc: 60355@debbugs.gnu.org Received: via spool by 60355-submit@debbugs.gnu.org id=B60355.16722164871039 (code B ref 60355); Wed, 28 Dec 2022 08:35:02 +0000 Received: (at 60355) by debbugs.gnu.org; 28 Dec 2022 08:34:47 +0000 Received: from localhost ([127.0.0.1]:57050 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pARtf-0000Gg-DU for submit@debbugs.gnu.org; Wed, 28 Dec 2022 03:34:47 -0500 Received: from mail-pj1-f53.google.com ([209.85.216.53]:36460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pARtd-0000GU-Iu for 60355@debbugs.gnu.org; Wed, 28 Dec 2022 03:34:46 -0500 Received: by mail-pj1-f53.google.com with SMTP id h7-20020a17090aa88700b00225f3e4c992so6821006pjq.1 for <60355@debbugs.gnu.org>; Wed, 28 Dec 2022 00:34:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=Y2flcWU8nhyH+sS6RdfPqSJvF1GwU2wrLFgomwKxkGo=; b=d+g2A0rIIC/yq1zJl6c59hnldO8C37hxQmZfmqxO67BN9adnn4IGGjNu2l5SwN+X8S Y1IyRk775hlitQLQyIzd2HPrUmJA+CByRl8HsNQaNU7XopExUngQEZjPlVj6MJVGX5Rr l2X99Hx1Cp8cnYOuvUiMXaQbpn0EEzN6nBhjEa6EE0xWmo33vCwNmejLJ3cQqbu9h1BT /ryWFXnJUesdMAXMfNehCEGOi59e6go6v9N3fQgAYWRS+ZcLvRns8VH86PeB+KVrlqoR ddEKOdJ9SwPD11WHc5GS4W4D7eVXms6HsFXwetUnr2eviYQh7eNmO2U2bFqQ2QmBurDH NrsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y2flcWU8nhyH+sS6RdfPqSJvF1GwU2wrLFgomwKxkGo=; b=RXeytC7aUh4MUaQ6bumWKGQ147Huza93CjDh9vRaWmO2hi93B3n5JNpVvky8uqSfGG oXR3SsgYsNE3b7XbxVI5giBQfZ7BtPkG0+/LSn3k7G4NkPsPPif5IBKPraNVNjpQMrD+ f9WFiCuaEAEgivc+2XXye/ge8dgaozHL1XRaEj1/dClXLjCdW1SZgCJx6yMES2NSYPys GJRKg2mCpb2rkXcVqE+3XZ54100OsH2W+KY7iujGxs43GSKpRkE5d6YKsv9ShSWZQ5Pg IH6+tdQ8vOp9vDyJE3fXhYCCDIxB2qquHm/B2cUDyDAh6Fkgx1dOJFgtUuN1LbLlAaIR T4Kg== X-Gm-Message-State: AFqh2koaqNZCUrJIMGfZDCpU2qM6L5nKDyb0G+Ef8LFcWobE9wr6mmyS 2+WWBLuW/ngYJHIjpHRoAek= X-Google-Smtp-Source: AMrXdXtjapetYElmsOdvO6ZwW5aAvGFIYdWmkCttZ19WrwWYBQxpax0n4OtCzoe+cJwtALqEO0PRJA== X-Received: by 2002:a17:902:c948:b0:188:a6ea:279f with SMTP id i8-20020a170902c94800b00188a6ea279fmr32486873pla.12.1672216478636; Wed, 28 Dec 2022 00:34:38 -0800 (PST) Received: from smtpclient.apple (cpe-172-117-161-177.socal.res.rr.com. [172.117.161.177]) by smtp.gmail.com with ESMTPSA id m15-20020a170902db0f00b0016c0c82e85csm10528364plx.75.2022.12.28.00.34.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Dec 2022 00:34:38 -0800 (PST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) From: Yuan Fu In-Reply-To: <87sfh0ujet.fsf@gmail.com> Date: Wed, 28 Dec 2022 00:34:37 -0800 Content-Transfer-Encoding: quoted-printable Message-Id: <40BD71EA-1281-43DE-8866-0AFFE6A90F94@gmail.com> References: <1E7949EC-7420-4848-9F45-88A20BAAE1D8@gmail.com> <87sfh0ujet.fsf@gmail.com> X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > On Dec 27, 2022, at 10:31 PM, Wilhelm H Kirschbaum = wrote: >=20 >=20 > Thanks Yuan, just checked and both the fix and your suggestion works. >=20 > I see there is a typo in your last change: >=20 > @@ -310,7 +310,7 @@ java-ts-mode > ;; Imenu. > (setq-local treesit-simple-imenu-settings > '(("Class" "\\`class_declaration\\'" nil nil) > - ("Interface "\\`interface_declaration\\'" nil = nil) > + ("Interface" "\\`interface_declaration\\'" nil nil) > ("Enum" "\\`record_declaration\\'" nil nil) > ("Method" "\\`method_declaration\\'" nil nil))) > (treesit-major-mode-setup)) Oops, was in a bit of hurry and forgot to byte-compile. Thanks for the = catch! Yuan= From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 07 18:30:12 2023 Received: (at control) by debbugs.gnu.org; 7 Jan 2023 23:30:13 +0000 Received: from localhost ([127.0.0.1]:59311 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pEIdg-0002Ow-MY for submit@debbugs.gnu.org; Sat, 07 Jan 2023 18:30:12 -0500 Received: from mail-pg1-f177.google.com ([209.85.215.177]:43901) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pEIde-0001vx-Ry for control@debbugs.gnu.org; Sat, 07 Jan 2023 18:30:11 -0500 Received: by mail-pg1-f177.google.com with SMTP id 36so3538634pgp.10 for ; Sat, 07 Jan 2023 15:30:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:date:message-id:subject:mime-version:content-transfer-encoding :from:from:to:cc:subject:date:message-id:reply-to; bh=UI2RrbDepx5jbvj0wMj/mm7xVZ+mmQeQJgUsFsD7+Ng=; b=idkydgXGfxIX7PP3m8NPPuTxz2BM5iyh+V/2J8pxdcY7XJvK4ni69MiHOGThX/fVf6 YnBrRpHRcj/pk0FW0TTyozRyQf3aq+Pb+ZHm6yu3e5gnCHOTBa/Qo0bsKdbmCCqcxlNE /5Y24Y6rIhxmOKdjC9H3kfw6OR2WXGAswouF8reg8tfncPFZYREKf87yl018tZT+y+EE +Lcj9kqymMbRQtxMHkHnh9QueGo1Xpx4suLJydKt6zxIyWIwnQ8Ci6/SKW1CHAq20BgH 22CJGbU65BYB4i2u37p1CAsu0x3AC9tWS2l9uTYbxCp21otIMd3JYZcYG0385v8BDhWZ QAtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:date:message-id:subject:mime-version:content-transfer-encoding :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UI2RrbDepx5jbvj0wMj/mm7xVZ+mmQeQJgUsFsD7+Ng=; b=J6M1lYkAhX/o6vbItJ65fWPeaSNJRwWNJDY3a4X8aZtUqhIU+ZXf+rNlCfgo+hSoaU 6nK10rwtb0SEt7ADEGedgN1Ob/fctPp5KFUDIc07ts5n2q2ZVop0mC6vmPuURWUjZWrg E09P9DJerGo4YGk0WYbS/ngs0UvLi4LUx5aCqR8HuDc4D96vYbjgbyMAfczXNLi2tW0t 8u735TBRRVSQ4qH3JDd7zP3eP6XFKSMdoZfIIq/qGvZbUReQcGLwLvHsKZBGa6Pe/Eu6 P4QPkLdr27HmAoxlWHWoD+SpAQccS6y9Bughhjdvs92ep00FvUesx48TPhSEdsiq1lIO LYiQ== X-Gm-Message-State: AFqh2kocfZb9QS1VcqXAiK+k2XQW5USimiyXQVl8fPfR4XlUor2JLOdH eVeJBB2ApvgXUgtArltGh4hAAN1Si6dMvg== X-Google-Smtp-Source: AMrXdXtkJwTT2ZpedOJj7gbo4VpnDfHDbOo1F2HxKvlB3E9C7CNuttmXsH7PJpY0YqhPCUi969P+6A== X-Received: by 2002:a05:6a00:1382:b0:586:a3a9:6163 with SMTP id t2-20020a056a00138200b00586a3a96163mr3843178pfg.28.1673134204887; Sat, 07 Jan 2023 15:30:04 -0800 (PST) Received: from smtpclient.apple (cpe-172-117-161-177.socal.res.rr.com. [172.117.161.177]) by smtp.gmail.com with ESMTPSA id g16-20020aa79dd0000000b005821156cd70sm3295125pfq.190.2023.01.07.15.30.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Jan 2023 15:30:04 -0800 (PST) From: Yuan Fu Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: control message for bug #60355 Message-Id: <96922FD5-C6F7-4DA8-AFA1-39ECCCF4F436@gmail.com> Date: Sat, 7 Jan 2023 15:30:03 -0800 To: control@debbugs.gnu.org X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) close 60355 29.1 quit