procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make compat check also check typescript

Browse source 
* lisp/progmodes/typescript-ts-mode.el
(tsx-ts-mode--font-lock-compatibility-bb1f97b):
Add argument so that we run the 'treesit-query-capture' when the
language is 'typescript', not only 'tsx'.

* lisp/progmodes/typescript-ts-mode.el
(typescript-ts-mode--font-lock-settings): Use supplied argument.
This commit is contained in:
Theodor Thornhill 2023-07-24 16:17:34 +02:00
parent 906ecf442c
commit 4e977136d3
No known key found for this signature in database
GPG key ID: 2B8CF6039F079DA3
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/progmodes/typescript-ts-mode.el
View file

@ -154,15 +154,16 @@ Argument LANGUAGE is either `typescript' or `tsx'."
"&&" "||" "!" "?.") "&&" "||" "!" "?.")
"TypeScript operators for tree-sitter font-locking.") "TypeScript operators for tree-sitter font-locking.")
(defun tsx-ts-mode--font-lock-compatibility-bb1f97b () (defun tsx-ts-mode--font-lock-compatibility-bb1f97b (language)
"Font lock rules helper, to handle different releases of tree-sitter-tsx. "Font lock rules helper, to handle different releases of tree-sitter-tsx.
Check if a node type is available, then return the right font lock rules." Check if a node type is available, then return the right font lock rules.
Argument LANGUAGE is either `typescript' or `tsx'."
;; handle commit bb1f97b ;; handle commit bb1f97b
;; Warning: treesitter-query-capture says both node types are valid, ;; Warning: treesitter-query-capture says both node types are valid,
;; but then raises an error if the wrong node type is used. So it is ;; but then raises an error if the wrong node type is used. So it is
;; important to check with the new node type (member_expression) ;; important to check with the new node type (member_expression)
(condition-case nil (condition-case nil
(progn (treesit-query-capture 'tsx '((member_expression) @capture)) (progn (treesit-query-capture language '((member_expression) @capture))
'((jsx_opening_element '((jsx_opening_element
[(member_expression (identifier)) (identifier)] [(member_expression (identifier)) (identifier)]
@typescript-ts-jsx-tag-face) @typescript-ts-jsx-tag-face)
@ -337,7 +338,7 @@ Argument LANGUAGE is either `typescript' or `tsx'."
:language language :language language
:feature 'jsx :feature 'jsx
(append (tsx-ts-mode--font-lock-compatibility-bb1f97b) (append (tsx-ts-mode--font-lock-compatibility-bb1f97b language)
`((jsx_attribute (property_identifier) @typescript-ts-jsx-attribute-face))) `((jsx_attribute (property_identifier) @typescript-ts-jsx-attribute-face)))
:language language :language language