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

Fix treesit range rule for jsdoc

Browse source 
The parser for jsdoc is local, so it is necessary for the range
rule to take this into account.
* lisp/progmodes/js.el (js-ts-mode): Add ':local' keyword.
(js-ts-language-at-point): Remove 'js-ts-language-at-point'.
(Bug#71776)
This commit is contained in:
Vincenzo Pupillo 2024-06-27 16:13:58 +02:00 • committed by Eli Zaretskii
parent de3fa00a61
commit f910514721
1 changed files with 11 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

33
lisp/progmodes/js.el
View file

@ -3636,10 +3636,16 @@ Check if a node type is available, then return the right indent rules."
:override t :override t
'((escape_sequence) @font-lock-escape-face) '((escape_sequence) @font-lock-escape-face)
;; "document" should be first, to avoid overlap.
:language 'jsdoc
:override t
:feature 'document
'((document) @font-lock-doc-face)
:language 'jsdoc :language 'jsdoc
:override t :override t
:feature 'keyword :feature 'keyword
'((tag_name) @font-lock-keyword-face) '((tag_name) @font-lock-constant-face)
:language 'jsdoc :language 'jsdoc
:override t :override t
@ -3649,17 +3655,12 @@ Check if a node type is available, then return the right indent rules."
:language 'jsdoc :language 'jsdoc
:override t :override t
:feature 'property :feature 'property
'((type) @font-lock-variable-use-face) '((type) @font-lock-type-face)
:language 'jsdoc :language 'jsdoc
:override t :override t
:feature 'definition :feature 'definition
'((identifier) @font-lock-variable-name-face) '((identifier) @font-lock-variable-name-face))
:language 'jsdoc
:override t
:feature 'comment
'((description) @font-lock-comment-face))
"Tree-sitter font-lock settings.") "Tree-sitter font-lock settings.")
(defun js--fontify-template-string (node override start end &rest _) (defun js--fontify-template-string (node override start end &rest _)
@ -3933,7 +3934,7 @@ See `treesit-thing-settings' for more information.")
;; Fontification. ;; Fontification.
(setq-local treesit-font-lock-settings js--treesit-font-lock-settings) (setq-local treesit-font-lock-settings js--treesit-font-lock-settings)
(setq-local treesit-font-lock-feature-list (setq-local treesit-font-lock-feature-list
'(( comment definition) '(( comment document definition)
( keyword string) ( keyword string)
( assignment constant escape-sequence jsx number ( assignment constant escape-sequence jsx number
pattern string-interpolation) pattern string-interpolation)
@ -3944,10 +3945,9 @@ See `treesit-thing-settings' for more information.")
(treesit-range-rules (treesit-range-rules
:embed 'jsdoc :embed 'jsdoc
:host 'javascript :host 'javascript
:local t
`(((comment) @capture (:match ,js--treesit-jsdoc-beginning-regexp @capture)))))) `(((comment) @capture (:match ,js--treesit-jsdoc-beginning-regexp @capture))))))
(setq-local treesit-language-at-point-function #'js-ts-language-at-point)
;; Imenu ;; Imenu
(setq-local treesit-simple-imenu-settings (setq-local treesit-simple-imenu-settings
`(("Function" "\\`function_declaration\\'" nil nil) `(("Function" "\\`function_declaration\\'" nil nil)
@ -3989,17 +3989,6 @@ See `treesit-thing-settings' for more information.")
(put-text-property ns (1+ ns) 'syntax-table syntax) (put-text-property ns (1+ ns) 'syntax-table syntax)
(put-text-property (1- ne) ne 'syntax-table syntax))))) (put-text-property (1- ne) ne 'syntax-table syntax)))))
(defun js-ts-language-at-point (point)
"Return the language at POINT."
(let ((node (treesit-node-at point 'javascript)))
(if (and (treesit-ready-p 'jsdoc)
(equal (treesit-node-type node) "comment")
(string-match-p
js--treesit-jsdoc-beginning-regexp
(treesit-node-text node)))
'jsdoc
'javascript)))
;;;###autoload ;;;###autoload
(define-derived-mode js-json-mode prog-mode "JSON" (define-derived-mode js-json-mode prog-mode "JSON"
:syntax-table js-mode-syntax-table :syntax-table js-mode-syntax-table