Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 12:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

js-ts-mode: Fix font-lock rules conflict

Browse source 
* lisp/progmodes/js.el (js--treesit-font-lock-settings): Move
'property' to after 'jsx'.  Stop using predicate (bug#67684).
(js--treesit-property-not-function-p): Delete.
This commit is contained in:
Dmitry Gutov 2023-12-13 00:00:38 +02:00
parent c165247c30
commit 400ef15bdc
1 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lisp/progmodes/js.el
View file

@ -3580,16 +3580,6 @@ Check if a node type is available, then return the right indent rules."
;; full namespace import (* as alias) ;; full namespace import (* as alias)
(import_clause (namespace_import (identifier) @font-lock-variable-name-face))) (import_clause (namespace_import (identifier) @font-lock-variable-name-face)))
:language 'javascript
:feature 'property
'(((property_identifier) @font-lock-property-use-face
(:pred js--treesit-property-not-function-p
@font-lock-property-use-face))
(pair value: (identifier) @font-lock-variable-use-face)
((shorthand_property_identifier) @font-lock-property-use-face))
:language 'javascript :language 'javascript
:feature 'assignment :feature 'assignment
'((assignment_expression '((assignment_expression
@ -3610,6 +3600,12 @@ Check if a node type is available, then return the right indent rules."
(jsx_self_closing_element name: (_) @font-lock-function-call-face) (jsx_self_closing_element name: (_) @font-lock-function-call-face)
(jsx_attribute (property_identifier) @font-lock-constant-face)) (jsx_attribute (property_identifier) @font-lock-constant-face))
:language 'javascript
:feature 'property
'(((property_identifier) @font-lock-property-use-face)
(pair value: (identifier) @font-lock-variable-use-face)
((shorthand_property_identifier) @font-lock-property-use-face))
:language 'javascript :language 'javascript
:feature 'number :feature 'number
'((number) @font-lock-number-face '((number) @font-lock-number-face
@ -3661,14 +3657,6 @@ OVERRIDE is the override flag described in
(setq font-beg (treesit-node-end child) (setq font-beg (treesit-node-end child)
child (treesit-node-next-sibling child))))) child (treesit-node-next-sibling child)))))
(defun js--treesit-property-not-function-p (node)
"Check that NODE, a property_identifier, is not used as a function."
(not (equal (treesit-node-type
(treesit-node-parent ; Maybe call_expression.
(treesit-node-parent ; Maybe member_expression.
node)))
"call_expression")))
(defvar js--treesit-lhs-identifier-query (defvar js--treesit-lhs-identifier-query
(when (treesit-available-p) (when (treesit-available-p)
(treesit-query-compile 'javascript '((identifier) @id (treesit-query-compile 'javascript '((identifier) @id