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

Correctly handled the local parser for jsdoc (bug#75456)

Browse source 
As a result of recent patches to treesitter, local parsers must
now be recognized by 'treesit-language-at-point' and have their
own indentation rules.

* lisp/progmodes/js.el
(js--treesit-indent-rules): New rule for jsdoc.
(js--treesit-language-at-point): New function.
(js-ts-mode): Use the new function.
This commit is contained in:
Vincenzo Pupillo 2025-02-03 22:14:44 +01:00 • committed by Yuan Fu
parent 12a3145b3b
commit 4396f6414c
No known key found for this signature in database
GPG key ID: 56E19BC57664A442
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lisp/progmodes/js.el
View file

@ -3490,7 +3490,10 @@ Check if a node type is available, then return the right indent rules."
((match "/" "jsx_self_closing_element") parent 0)
((parent-is "jsx_self_closing_element") parent js-indent-level)
;; FIXME(Theo): This no-node catch-all should be removed. When is it needed?
(no-node parent-bol 0)))))
(no-node parent-bol 0))
(jsdoc
((and (parent-is "document") c-ts-common-looking-at-star)
c-ts-common-comment-start-after-first-star -1)))))
(defvar js--treesit-keywords
'("as" "async" "await" "break" "case" "catch" "class" "const" "continue"
@ -3718,6 +3721,22 @@ Return nil if there is no name or if NODE is not a defun node."
("lexical_declaration" (treesit-node-top-level node))
(_ t)))
(defun js--treesit-language-at-point (point)
"Return the language at POINT."
(let* ((node (treesit-node-at point 'javascript))
(node-type (treesit-node-type node))
(node-start (treesit-node-start node))
(node-end (treesit-node-end node)))
(if (not (treesit-ready-p 'jsdoc t))
'javascript
(if (equal node-type "comment")
(save-excursion
(goto-char node-start)
(if (search-forward "/**" node-end t)
'jsdoc
'javascript))
'javascript))))
;;; Main Function
;;;###autoload
@ -3927,6 +3946,7 @@ See `treesit-thing-settings' for more information.")
;; Tree-sitter setup.
(setq-local treesit-primary-parser (treesit-parser-create 'javascript))
(setq-local treesit-language-at-point-function #'js--treesit-language-at-point)
;; Indent.
(setq-local treesit-simple-indent-rules js--treesit-indent-rules)