mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-30

Browse source 
9b3eb06c76 Indent jsx_text properly with modern grammars
1c87be8ac9 ; * lisp/gnus/gnus.el (gnus-summary-line-format): Reindent.
This commit is contained in:
Eli Zaretskii 2025-11-15 07:21:32 -05:00
commit 43fac918bf
3 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/progmodes/js.el
View file

@ -3449,7 +3449,7 @@ Check if a node type is available, then return the right indent rules."
((parent-is "jsx_fragment") parent js-indent-level))) ((parent-is "jsx_fragment") parent js-indent-level)))
(error (error
`(((match "<" "jsx_text") parent 0) `(((match "<" "jsx_text") parent 0)
((parent-is "jsx_text") parent js-indent-level))))) ((parent-is "jsx_text") parent-bol js-indent-level)))))
(defun js--treesit-switch-body-helper (_node parent _bol &rest _args) (defun js--treesit-switch-body-helper (_node parent _bol &rest _args)
"Anchor helper for the switch body.. "Anchor helper for the switch body..

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

@ -141,7 +141,7 @@ Check if a node type is available, then return the right indent rules."
((parent-is "jsx_fragment") parent typescript-ts-mode-indent-offset))) ((parent-is "jsx_fragment") parent typescript-ts-mode-indent-offset)))
(treesit-query-error (treesit-query-error
`(((match "<" "jsx_text") parent 0) `(((match "<" "jsx_text") parent 0)
((parent-is "jsx_text") parent typescript-ts-mode-indent-offset))))) ((parent-is "jsx_text") parent-bol typescript-ts-mode-indent-offset)))))
(defun typescript-ts-mode--anchor-decl (_n parent &rest _) (defun typescript-ts-mode--anchor-decl (_n parent &rest _)
"Return the position after the declaration keyword before PARENT. "Return the position after the declaration keyword before PARENT.