From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Basil Contovounesios via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#64019: 29.0.91; Fix some tree-sitter :match regexps Date: Thu, 15 Jun 2023 18:17:29 +0100 Message-ID: <87ilbo4pcm.fsf@epfl.ch> References: <87o7lkzrj1.fsf@epfl.ch> <1959ea93-0ca3-59cd-3abb-e841bd337c57@gutov.dev> <87fs6vbgla.fsf@epfl.ch> Reply-To: Basil Contovounesios Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39330"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Randy Taylor , Yuan Fu , Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= , Theodor Thornhill , 64019@debbugs.gnu.org, Daniel Colascione To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Jun 15 19:18:10 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 1q9qbq-000A2z-Nc for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 15 Jun 2023 19:18:10 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q9qbk-000715-Ma; Thu, 15 Jun 2023 13:18:04 -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 1q9qbi-00070l-QO for bug-gnu-emacs@gnu.org; Thu, 15 Jun 2023 13:18:03 -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 1q9qbi-0003RP-I9 for bug-gnu-emacs@gnu.org; Thu, 15 Jun 2023 13:18:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q9qbi-0002Zz-0Q for bug-gnu-emacs@gnu.org; Thu, 15 Jun 2023 13:18:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Basil Contovounesios Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 15 Jun 2023 17:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64019 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 64019-submit@debbugs.gnu.org id=B64019.16868494609886 (code B ref 64019); Thu, 15 Jun 2023 17:18:01 +0000 Original-Received: (at 64019) by debbugs.gnu.org; 15 Jun 2023 17:17:40 +0000 Original-Received: from localhost ([127.0.0.1]:47739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9qbM-0002ZO-5T for submit@debbugs.gnu.org; Thu, 15 Jun 2023 13:17:40 -0400 Original-Received: from mail-lf1-f51.google.com ([209.85.167.51]:58714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9qbJ-0002Z8-0D for 64019@debbugs.gnu.org; Thu, 15 Jun 2023 13:17:38 -0400 Original-Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-4f6195d2b3fso11089073e87.1 for <64019@debbugs.gnu.org>; Thu, 15 Jun 2023 10:17:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd.ie; s=google21; t=1686849451; x=1689441451; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=P3wPlkFFj5zxYdaBK72V46iijkb5pgItK2ncw7JJaj0=; b=aG6CXndAFzdmME/bPiJu+n0U4PCaY+aagWkk6Q/qP/dNpyDQE8Fxt9GcpTNoJl+fHG yz46Hvdn+5PCCYSixrEnvbV9nadwShueLbhHriJnBr8BDKo8t8Vq5OmcEWnZnkaqZGkg eKWvSG55676c8sP5Uhm5+yr+4Ej2jBzGYP/1qxgfpyFEI3vPvrR/iXlCwCzdUA5rkbzJ EY7vis4pCq1QmltnFWYd7FXqu1L3jhr4JIzDJAO4GPO/gNnqyuhadpgKrB9BwCycZiIz LThcFvcodLt6DT473cSfirqWTE6gD4whrGJqiAM4838uA+d7kK/k2L/wm3XsWwtXbnoj BKmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686849451; x=1689441451; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=P3wPlkFFj5zxYdaBK72V46iijkb5pgItK2ncw7JJaj0=; b=PPUVripSqdEkjNcV8Q5NeiQkPemEQkLtd0/gFzPkcA7AfpO8N1i1n2vbKFqG8gugEn 0HgZCIzYYI3GlqKoPUaCRDnIvmgdNXjSGfy26yiEmPcAHW1vb4YJa9iAGl1cYiXulmOQ mjjsmJ29NsQDi2WRH+elHRICo5nUO7Qk19NEC/Mw6F0Jkj8UYnpJM/jxtPqn8PsveFi6 Mfbu16G8AeVtgUujMPzW4LduH0ZXzTJyA8Hy8yqcOaJSdJdKU7gQO+cCDfLppZWUyRP1 dtK63KFRFrHMyjdEqXDYne5UF6teP0wiUzHevoYJtc8hxmx4A3ZQhCglbmC61L9lXVuf WA/g== X-Gm-Message-State: AC+VfDym0VuTvtqWCW2dNZlRKb5/DpgPM8JtYhAiaejR//iI5ACAfVi9 CpgvzaTHEaLz+g0aI9i1pOL78A== X-Google-Smtp-Source: ACHHUZ6YbODcWYxpkR4UWJFEcuYOOYbdb8iY1iTuX9XFGBQ3geuAia285UK8PAMFwku9+CCJUy1GuQ== X-Received: by 2002:a05:6512:29c:b0:4f6:26fe:9e1 with SMTP id j28-20020a056512029c00b004f626fe09e1mr11168681lfp.30.1686849451030; Thu, 15 Jun 2023 10:17:31 -0700 (PDT) Original-Received: from localhost ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id o6-20020a05600c378600b003f7cb42fa20sm21188469wmr.42.2023.06.15.10.17.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jun 2023 10:17:30 -0700 (PDT) In-Reply-To: <87fs6vbgla.fsf@epfl.ch> (Basil Contovounesios's message of "Tue, 13 Jun 2023 15:08:01 +0100") 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:263431 Archived-At: --=-=-= Content-Type: text/plain Basil Contovounesios [2023-06-13 15:08 +0100] wrote: > I'm less concerned about the trivial bol/bos conversions in the patch > and more about the corrections to incorrect regexps, such as: > - the more benign \(:?...\) -> \(?:...\) > - and the less benign [\d] -> [0-9]. [...] > Here's the updated patch against emacs-29: Mattias also spotted the following in https://github.com/mattiase/relint/pull/14: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=ruby.diff diff --git a/lisp/progmodes/ruby-ts-mode.el b/lisp/progmodes/ruby-ts-mode.el index 91d65a2777b..4b951f7606f 100644 --- a/lisp/progmodes/ruby-ts-mode.el +++ b/lisp/progmodes/ruby-ts-mode.el @@ -1021,7 +1021,7 @@ ruby-ts--s-p-query (:match "\\`\\$[#\"'`:?]" @global_var)) ;; ?' ?" ?` are character literals. ((character) @char - (:match "\\`?[#\"'`:?]" @char)) + (:match "\\`\\?[#\"'`:?]" @char)) ;; Symbols like :+, :<=> or :foo=. ((simple_symbol) @symbol (:match "\\s." @symbol)) --=-=-= Content-Type: text/plain Is that TRT? Thanks, -- Basil --=-=-=--