From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Yuan Fu Newsgroups: gmane.emacs.bugs Subject: bug#60355: 29.0.60; Tree sitter incorrectly handles of PRED for treesit-defun-type-regexp Date: Tue, 27 Dec 2022 17:47:35 -0800 Message-ID: <1E7949EC-7420-4848-9F45-88A20BAAE1D8@gmail.com> References: <87cz85yqx2.fsf@gmail.com> Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23698"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 60355@debbugs.gnu.org To: Wilhelm Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Dec 28 02:48:19 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 1pALYI-00060N-QC for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 28 Dec 2022 02:48:18 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pALY4-00027r-WD; Tue, 27 Dec 2022 20:48:05 -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 1pALY3-00027U-7I for bug-gnu-emacs@gnu.org; Tue, 27 Dec 2022 20:48:03 -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 1pALY2-0002mX-I6 for bug-gnu-emacs@gnu.org; Tue, 27 Dec 2022 20:48:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pALY1-0006Qi-W6 for bug-gnu-emacs@gnu.org; Tue, 27 Dec 2022 20:48:02 -0500 X-Loop: help-debbugs@gnu.org 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 Original-Received: via spool by 60355-submit@debbugs.gnu.org id=B60355.167219206724622 (code B ref 60355); Wed, 28 Dec 2022 01:48:01 +0000 Original-Received: (at 60355) by debbugs.gnu.org; 28 Dec 2022 01:47:47 +0000 Original-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 Original-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 Original-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) Original-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) X-Mailer: Apple Mail (2.3696.120.41.1.1) 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:251974 Archived-At: 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