From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#60525: 29.0.60; tree-sitter support in semantic-symref Date: Wed, 4 Jan 2023 03:51:28 +0200 Message-ID: References: <864jt7xzku.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2896"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 To: Juri Linkov , 60525@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Jan 04 02:52:15 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 1pCswx-0000WL-28 for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 04 Jan 2023 02:52:15 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pCswn-0000at-2V; Tue, 03 Jan 2023 20:52: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 1pCswk-0000aT-E6 for bug-gnu-emacs@gnu.org; Tue, 03 Jan 2023 20:52:02 -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 1pCswk-0000Lq-4L for bug-gnu-emacs@gnu.org; Tue, 03 Jan 2023 20:52:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pCswj-0003Z3-M1 for bug-gnu-emacs@gnu.org; Tue, 03 Jan 2023 20:52:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 04 Jan 2023 01:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60525 X-GNU-PR-Package: emacs Original-Received: via spool by 60525-submit@debbugs.gnu.org id=B60525.167279710013671 (code B ref 60525); Wed, 04 Jan 2023 01:52:01 +0000 Original-Received: (at 60525) by debbugs.gnu.org; 4 Jan 2023 01:51:40 +0000 Original-Received: from localhost ([127.0.0.1]:47194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCswO-0003YR-EU for submit@debbugs.gnu.org; Tue, 03 Jan 2023 20:51:40 -0500 Original-Received: from mail-wm1-f50.google.com ([209.85.128.50]:41561) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCswL-0003YC-FQ for 60525@debbugs.gnu.org; Tue, 03 Jan 2023 20:51:39 -0500 Original-Received: by mail-wm1-f50.google.com with SMTP id ay2-20020a05600c1e0200b003d22e3e796dso25500408wmb.0 for <60525@debbugs.gnu.org>; Tue, 03 Jan 2023 17:51:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=q9bIDwtKh+czNSja/T0cu9krQ3DbZjbVWTg1f4qysWs=; b=gDqv5TgLR0+YburQ6pn+Drqg16Dx4cokmJp1LSItsYqev7lTron5pYNBA48dt54BLO BHFJqKpKt5yQ9/jtQePkCE8TRi71rl1/xpmAQrT0ne3J3gWZeDv2PsGvXgGawq89OiVY Baq/vnwccOKmiQMD9Gj0jWoOAvTiyr9y7XJbiCTatpYGomYcXHH9ZpGI/c/cPI51nEPu FDAdcvuvIjN+5a3XXHmVDOoSvqpG5APLNvaPi/yDcPW9jNRkbed6rZwKrFkbHMwA9ejD k7+5Bw2ZQ9kqxDx2uCktdDLEhuE6QAlp0vYVJ6niw6kdQf2hLbtow32ZvubX8E5HnWUr mp3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=q9bIDwtKh+czNSja/T0cu9krQ3DbZjbVWTg1f4qysWs=; b=opGA/G//AkWCjuvFw58FipCusyeCLfhLJld5rMOD5/v/Q3//6LCzeuR5fIKan2BvOy CFdkivqO1BsgWxY+8C9Pse+L3JzwA2vAYcj1CMIdV2CmZgRM5YJT2j+zaafkQTQ/HHCy AFUDeUMC0/t2bJrNACvtOA2lQEHaswTjUOaqsIWfX5Q+R1Ulf0qhhL6BDjhQfmpvvOiG 6ZRrxAMbnQGzB1Y5H1EdcBf11+FPmcZPDayWfXFgcbosIxPWpKCoNBZLWM/0MPXKwlw0 9N1ucdsv50lvFuPBZqTBQsn4Daz7Hg+ULP7T7OW/U1qnGXLn8KuJCG8+Sj3/tuIszq0M nW5A== X-Gm-Message-State: AFqh2kqbbDigF1s1SKpB0j8DRakXR9wbeg3+guj0GAoBfQNZeJY+w5fK SjODED+GvA47w/6uVM5+YMU= X-Google-Smtp-Source: AMrXdXsCkMqPPNQMx9hzo8FsxIiULwc4PPVAk794Lqg0v1zYwtu+UPj7KZdTpfM9d2rZVZ4SieKRtQ== X-Received: by 2002:a1c:4b03:0:b0:3d9:103d:9081 with SMTP id y3-20020a1c4b03000000b003d9103d9081mr32014829wma.28.1672797091243; Tue, 03 Jan 2023 17:51:31 -0800 (PST) Original-Received: from [192.168.0.2] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id bg40-20020a05600c3ca800b003b4cba4ef71sm53927187wmb.41.2023.01.03.17.51.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 03 Jan 2023 17:51:30 -0800 (PST) Content-Language: en-US In-Reply-To: <864jt7xzku.fsf@mail.linkov.net> 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:252444 Archived-At: On 03/01/2023 20:06, Juri Linkov wrote: > + (c-ts-mode "*.[ch]") > (c++-mode "*.[chCH]" "*.[ch]pp" "*.cc" "*.hh") > + (c++-ts-mode "*.[chCH]" "*.[ch]pp" "*.cc" "*.hh") > (html-mode "*.html" "*.shtml" "*.php") > (mhtml-mode "*.html" "*.shtml" "*.php") ; FIXME: remove > ; duplication of > @@ -53,7 +55,10 @@ semantic-symref-filepattern-alist > ; major mode definition? > (ruby-mode "*.r[bu]" "*.rake" "*.gemspec" "*.erb" "*.haml" > "Rakefile" "Thorfile" "Capfile" "Guardfile" "Vagrantfile") > + (ruby-ts-mode "*.r[bu]" "*.rake" "*.gemspec" "*.erb" "*.haml" > + "Rakefile" "Thorfile" "Capfile" "Guardfile" "Vagrantfile") > (python-mode "*.py" "*.pyi" "*.pyw") Instead of duplicating entries, we could try to look up the remappings in major-mode-remap-alist. Or (more effort) change the structure of the "alist" to also contain lists of modes in the keys. Like in eglot-server-programs. diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el index c698c2ef5a2..ecfeaae220c 100644 --- a/lisp/cedet/semantic/symref/grep.el +++ b/lisp/cedet/semantic/symref/grep.el @@ -71,7 +71,10 @@ semantic-symref-derive-find-filepatterns Optional argument MODE specifies the `major-mode' to test." ;; First, try the filepattern alist. (let* ((mode (or mode major-mode)) - (pat (cdr (assoc mode semantic-symref-filepattern-alist)))) + (pat + (or (assoc-default mode semantic-symref-filepattern-alist) + (assoc-default (car (rassoc mode major-mode-remap-alist)) + semantic-symref-filepattern-alist)))) (when (not pat) ;; No hit, try auto-mode-alist. (dolist (X auto-mode-alist)