From: Yuan Fu <casouri@gmail.com>
To: john muhl <jm@pub.pink>
Cc: 65813-done@debbugs.gnu.org
Subject: bug#65813: [PATCH] Fix elixir-ts-mode with embedded heex
Date: Thu, 7 Sep 2023 16:06:10 -0700 [thread overview]
Message-ID: <8E5115B6-4F98-4AA4-8EC4-2FFE3F32BE20@gmail.com> (raw)
In-Reply-To: <87r0n9d7nt.fsf@pub.pink>
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
> On Sep 7, 2023, at 1:46 PM, john muhl via Bug reports for GNU Emacs, the Swiss army knife of text editors <bug-gnu-emacs@gnu.org> wrote:
>
> Tags: patch
>
> The elixir test with embedded heex fails after d05494a9ff8. Restoring
> the ‘(when (eq (treesit-parser-language parser) language)’ part fixes
> it. The call to ‘(treesit-parser-list language)’ was not working right
> either since t-p-l expects the optional argument to be a buffer but
> language is a string like "heex".
>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Check-embedded-languages-use-the-correct-parser.patch --]
[-- Type: text/patch; x-unix-mode=0644; name="0001-Check-embedded-languages-use-the-correct-parser.patch", Size: 1309 bytes --]
From 2d7ea1119f12890350f0c04b1e6c70a9856e1f87 Mon Sep 17 00:00:00 2001
From: john muhl <jm@pub.pink>
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)))))))))
(defun treesit-parser-range-on (parser beg &optional end)
"Check if PARSER's range covers the portion between BEG and END.
--
2.41.0
[-- Attachment #3: Type: text/plain, Size: 59 bytes --]
Thank you very much, John. I pushed a fix to master.
Yuan
next prev parent reply other threads:[~2023-09-07 23:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-07 20:46 bug#65813: [PATCH] Fix elixir-ts-mode with embedded heex john muhl via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-09-07 23:06 ` Yuan Fu [this message]
2023-09-08 0:09 ` john muhl via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-09-08 0:46 ` Yuan Fu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8E5115B6-4F98-4AA4-8EC4-2FFE3F32BE20@gmail.com \
--to=casouri@gmail.com \
--cc=65813-done@debbugs.gnu.org \
--cc=jm@pub.pink \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).