mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-11 14:01:43 -08:00
Code Issues Projects Releases Wiki Activity

Improve namespacing situation WRT to recent change in typescript-ts-mode.el

Browse source 
* lisp/progmodes/typescript-ts-mode.el
(typescript-ts--syntax-propertize):
Rename from ts-ts--syntax-propertize.
(tsx-ts--syntax-propertize-captures):
Rename from ts-ts--syntax-propertize-captures.
(typescript-ts--s-p-query):
Rename from ts-ts--s-p-query.
Update all references (bug#65470).
This commit is contained in:
Dmitry Gutov 2023-09-16 22:55:17 +03:00
parent 33ff4fed03
commit 67c8271076
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -421,7 +421,7 @@ Argument LANGUAGE is either `typescript' or `tsx'."
(keyword string escape-sequence)
(constant expression identifier number pattern property)
(function bracket delimiter)))
(setq-local syntax-propertize-function #'ts-ts--syntax-propertize)
(setq-local syntax-propertize-function #'typescript-ts--syntax-propertize)
(treesit-major-mode-setup)))
@ -472,7 +472,7 @@ at least 3 (which is the default value)."
(treesit-major-mode-setup)))
(defvar ts-ts--s-p-query
(defvar typescript-ts--s-p-query
(when (treesit-available-p)
(treesit-query-compile 'typescript
'(((regex pattern: (regex_pattern) @regexp))))))
@ -487,15 +487,15 @@ at least 3 (which is the default value)."
((parenthesized_expression (jsx_element) @jsx))
((return_statement (jsx_element) @jsx))))))
(defun ts-ts--syntax-propertize (beg end)
(let ((captures (treesit-query-capture 'typescript ts-ts--s-p-query beg end)))
(ts-ts--syntax-propertize-captures captures)))
(defun typescript-ts--syntax-propertize (beg end)
(let ((captures (treesit-query-capture 'typescript typescript-ts--s-p-query beg end)))
(tsx-ts--syntax-propertize-captures captures)))
(defun tsx-ts--syntax-propertize (beg end)
(let ((captures (treesit-query-capture 'tsx tsx-ts--s-p-query beg end)))
(ts-ts--syntax-propertize-captures captures)))
(tsx-ts--syntax-propertize-captures captures)))
(defun ts-ts--syntax-propertize-captures (captures)
(defun tsx-ts--syntax-propertize-captures (captures)
(pcase-dolist (`(,name . ,node) captures)
(let* ((ns (treesit-node-start node))
(ne (treesit-node-end node))