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#65813: [PATCH] Fix elixir-ts-mode with embedded heex Date: Thu, 7 Sep 2023 16:06:10 -0700 Message-ID: <8E5115B6-4F98-4AA4-8EC4-2FFE3F32BE20@gmail.com> References: <87r0n9d7nt.fsf@pub.pink> Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Content-Type: multipart/mixed; boundary="Apple-Mail=_B18900E1-43C7-4B00-B25E-7A2F16D72698" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="329"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 65813-done@debbugs.gnu.org To: john muhl Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Sep 08 01:07:18 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 1qeO5l-000AP4-Mo for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 08 Sep 2023 01:07:17 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeO5V-0002pe-LR; Thu, 07 Sep 2023 19:07:01 -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 1qeO5U-0002p5-8S for bug-gnu-emacs@gnu.org; Thu, 07 Sep 2023 19:07:00 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qeO5T-00059X-WE for bug-gnu-emacs@gnu.org; Thu, 07 Sep 2023 19:07:00 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qeO5V-0008Hp-SH for bug-gnu-emacs@gnu.org; Thu, 07 Sep 2023 19:07:01 -0400 Resent-From: Yuan Fu Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Thu, 07 Sep 2023 23:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 65813 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Mail-Followup-To: 65813@debbugs.gnu.org, casouri@gmail.com, jm@pub.pink Original-Received: via spool by 65813-done@debbugs.gnu.org id=D65813.169412800031814 (code D ref 65813); Thu, 07 Sep 2023 23:07:01 +0000 Original-Received: (at 65813-done) by debbugs.gnu.org; 7 Sep 2023 23:06:40 +0000 Original-Received: from localhost ([127.0.0.1]:41712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeO57-0008H1-5T for submit@debbugs.gnu.org; Thu, 07 Sep 2023 19:06:40 -0400 Original-Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]:42458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeO51-0008Gi-9f for 65813-done@debbugs.gnu.org; Thu, 07 Sep 2023 19:06:35 -0400 Original-Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-56f84de64b9so999047a12.1 for <65813-done@debbugs.gnu.org>; Thu, 07 Sep 2023 16:06:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694127982; x=1694732782; darn=debbugs.gnu.org; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=Fr4f9yQZBqoPoViDSSPZqIo9PfJmVEfNLWrEl94/lKs=; b=qQRkcN+N/1eX9Dq6Um+TF1iuvZEcncfajdSbuIglEkyqyRQaIfoWmIv2vDBqVXm+FB KtGtnOM/81nrnHnrgnnkB34A99n3bhysEvmCEr2OypWh9nLmR9w8q2Uu0TsijEJykZvk XB+PqBYCWQGzsvJ7qHPISlV0W+jTn4NRECS4qZK9hPVuQi8NvlAGpLulP6X7dq8m0Xxz qzAFNBNrdVWHZFz5ePAf4dr4cEEtOeLuOypqUozHLASViH1xhExbGTuHrr5YyiYvZFSU NlXMcCyrjVFTMTRvGCOHKycL4/iT5b3pvEUcwQqDGMVn5ZIcrOGKGVzNuXaG+po9V12R I8eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694127982; x=1694732782; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Fr4f9yQZBqoPoViDSSPZqIo9PfJmVEfNLWrEl94/lKs=; b=c7+3a1cA9OxCRheVDHHNyEtG5GoYwvrz7sZ2+OuNo5g0XR0ZQbekmo276qc+XuNYrl CVg/IT/aNiX/p87jkDz2F0Px0f3ru/TGVuSp5S4oacP/y/Ual5De/jCbOVRNZbipu2se T2vLDojgzXUlbfmS01lmvPwpUtOG6HKG2EoByRGUjHIBZYAp5Tk8+umKwVjogO4Gra7L b7tTUvh7ukj6ngr9I/PwD0dFheo2XRvTTl0M+gh+JEPH2lHXSSyC+HzGF5goi9QS0eJl y1mdj9vg8VQk6BLNSCJXm80ffbPLSgjtNL+LejzALFkn2y0bpo05dNfnDz1b/Vo6QceF iBsg== X-Gm-Message-State: AOJu0YyBuNt4+MGnRLrHYAbj3HPIopVd/1VR4aPdpxkUrohj8xsDHqaa nxwYIp/g+NQ+ogD1sbklVI0= X-Google-Smtp-Source: AGHT+IGh26b+dmYKBhQIQTZOj/6EQqOFC5O6OJ/eHOrsF2ENJriNO6OQaMhTitLifAMgscNPqjIXqQ== X-Received: by 2002:a05:6a20:3d21:b0:13f:b3b4:1986 with SMTP id y33-20020a056a203d2100b0013fb3b41986mr881110pzi.12.1694127982153; Thu, 07 Sep 2023 16:06:22 -0700 (PDT) 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 b22-20020aa78716000000b006887b72ba38sm205452pfo.164.2023.09.07.16.06.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Sep 2023 16:06:21 -0700 (PDT) In-Reply-To: <87r0n9d7nt.fsf@pub.pink> X-Mailer: Apple Mail (2.3731.700.6) 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:269704 Archived-At: --Apple-Mail=_B18900E1-43C7-4B00-B25E-7A2F16D72698 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Sep 7, 2023, at 1:46 PM, john muhl via Bug reports for GNU Emacs, = the Swiss army knife of text editors wrote: >=20 > Tags: patch >=20 > The elixir test with embedded heex fails after d05494a9ff8. Restoring > the =E2=80=98(when (eq (treesit-parser-language parser) language)=E2=80=99= part fixes > it. The call to =E2=80=98(treesit-parser-list language)=E2=80=99 was = not working right > either since t-p-l expects the optional argument to be a buffer but > language is a string like "heex". >=20 --Apple-Mail=_B18900E1-43C7-4B00-B25E-7A2F16D72698 Content-Disposition: attachment; filename=0001-Check-embedded-languages-use-the-correct-parser.patch Content-Type: text/patch; x-unix-mode=0644; name="0001-Check-embedded-languages-use-the-correct-parser.patch" Content-Transfer-Encoding: quoted-printable =46rom 2d7ea1119f12890350f0c04b1e6c70a9856e1f87 Mon Sep 17 00:00:00 2001 From: john muhl Date: Thu, 7 Sep 2023 15:43:01 -0500 Subject: [PATCH] Check embedded languages use the correct parser * lisp/treesit.el (treesit-update-ranges): Restore check to ensure embedded languages are handled by the appropriate parser. --- lisp/treesit.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lisp/treesit.el b/lisp/treesit.el index 6fefc122582..63515e7f45c 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -680,9 +680,11 @@ treesit-update-ranges (treesit--merge-ranges old-ranges new-ranges beg end) (point-min) (point-max)))) - (dolist (parser (treesit-parser-list language)) - (treesit-parser-set-included-ranges - parser set-ranges)))))))) + (dolist (parser (treesit-parser-list)) + (when (eq (treesit-parser-language parser) + language) + (treesit-parser-set-included-ranges + parser set-ranges))))))))) =20 (defun treesit-parser-range-on (parser beg &optional end) "Check if PARSER's range covers the portion between BEG and END. --=20 2.41.0 --Apple-Mail=_B18900E1-43C7-4B00-B25E-7A2F16D72698 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii Thank you very much, John. I pushed a fix to master. Yuan --Apple-Mail=_B18900E1-43C7-4B00-B25E-7A2F16D72698--