>From fab9765fdaa7d4712d0bf3b4b8068d02f4dd73c2 Mon Sep 17 00:00:00 2001 From: Vincenzo Pupillo Date: Sat, 15 Jul 2023 13:47:41 +0200 Subject: [PATCH] Updated JSX support due to changes in tree-sitter-javascript A recent change in tree-sitter-javascript grammar support for JSX (commit bb1f97b), changed two things: 1. renamed nested_identifier to member_expression 2. removed jsx_fragment, jsx_text is used instead * lisp/progmodes/js.el: (js--treesit-font-lock-settings): replace nested_identifier with member_expression * lisp/progmodes/js.el: (js--treesit-indent-rules): replace jsx_fragment with jsx_text --- lisp/progmodes/js.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index de1a820ba11..7ee72a22daa 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3462,8 +3462,8 @@ js--treesit-indent-rules ((parent-is "statement_block") parent-bol js-indent-level) ;; JSX - ((match "<" "jsx_fragment") parent 0) - ((parent-is "jsx_fragment") parent js-indent-level) + ((match "<" "jsx_text") parent 0) + ((parent-is "jsx_text") parent js-indent-level) ((node-is "jsx_closing_element") parent 0) ((match "jsx_element" "statement") parent js-indent-level) ((parent-is "jsx_element") parent js-indent-level) @@ -3600,15 +3600,15 @@ js--treesit-font-lock-settings :language 'javascript :feature 'jsx '((jsx_opening_element - [(nested_identifier (identifier)) (identifier)] + [(member_expression (identifier)) (identifier)] @font-lock-function-call-face) (jsx_closing_element - [(nested_identifier (identifier)) (identifier)] + [(member_expression (identifier)) (identifier)] @font-lock-function-call-face) (jsx_self_closing_element - [(nested_identifier (identifier)) (identifier)] + [(member_expression (identifier)) (identifier)] @font-lock-function-call-face) (jsx_attribute -- 2.41.0