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

* lisp/progmodes/typescript-ts-mode.el: Fix regexp-opt of treesit-thing.

Browse source 
(typescript-ts-base-mode): Add arg 'symbols' to regexp-opt of 'sexp',
'sexp-list', 'sentence', 'text' (bug#73404, bug#74366, bug#74963).
(tsx-ts-mode): Add arg 'symbols' to regexp-opt of 'sexp', 'sentence'.
This avoids such mismatches as "string_fragment" by "string".
This commit is contained in:
Juri Linkov 2024-12-24 09:40:21 +02:00
parent 7ac7ebef6c
commit f0afebb991
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -514,12 +514,14 @@ This mode is intended to be inherited by concrete major modes."
(setq-local treesit-thing-settings
`((typescript
(sexp ,(regexp-opt typescript-ts-mode--sexp-nodes))
(sexp-list ,(regexp-opt typescript-ts-mode--sexp-list-nodes))
(sexp ,(regexp-opt typescript-ts-mode--sexp-nodes 'symbols))
(sexp-list ,(regexp-opt typescript-ts-mode--sexp-list-nodes
'symbols))
(sentence ,(regexp-opt
typescript-ts-mode--sentence-nodes))
typescript-ts-mode--sentence-nodes 'symbols))
(text ,(regexp-opt '("comment"
"template_string"))))))
"template_string")
'symbols)))))
;; Imenu (same as in `js-ts-mode').
(setq-local treesit-simple-imenu-settings
@ -597,11 +599,13 @@ at least 3 (which is the default value)."
`((tsx
(sexp ,(regexp-opt
(append typescript-ts-mode--sexp-nodes
'("jsx"))))
'("jsx"))
'symbols))
(sentence ,(regexp-opt
(append typescript-ts-mode--sentence-nodes
'("jsx_element"
"jsx_self_closing_element")))))))
"jsx_self_closing_element"))
'symbols)))))
;; Font-lock.
(setq-local treesit-font-lock-settings