aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodor Thornhill2022-12-14 21:23:33 +0100
committerYuan Fu2022-12-14 14:39:29 -0800
commit2ca06aed7b39afdc00041ab7cd9c7a8cb50332f6 (patch)
treed227c62bf65f3e600f622b7e6f464dee1f8f4748
parenta54d5f500c1a9959b1f87c731aa9ac1b7eed27c9 (diff)
downloademacs-2ca06aed7b39afdc00041ab7cd9c7a8cb50332f6.tar.gz
emacs-2ca06aed7b39afdc00041ab7cd9c7a8cb50332f6.zip
Add indent rules to js/typescript/tsx-ts-mode (bug#60074)
* lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode--indent-rules): Add in binary_expression and jsx_fragment. * lisp/progmodes/js.el (js--treesit-indent-rules): Add the same rules.
-rw-r--r--lisp/progmodes/js.el3
-rw-r--r--lisp/progmodes/typescript-ts-mode.el3
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 02990813ef4..8ec14cf7ad1 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3445,12 +3445,15 @@ This function is intended for use in `after-change-functions'."
3445 ((parent-is "pair") parent-bol js-indent-level) 3445 ((parent-is "pair") parent-bol js-indent-level)
3446 ((parent-is "arrow_function") parent-bol js-indent-level) 3446 ((parent-is "arrow_function") parent-bol js-indent-level)
3447 ((parent-is "parenthesized_expression") parent-bol js-indent-level) 3447 ((parent-is "parenthesized_expression") parent-bol js-indent-level)
3448 ((parent-is "binary_expression") parent-bol js-indent-level)
3448 ((parent-is "class_body") parent-bol js-indent-level) 3449 ((parent-is "class_body") parent-bol js-indent-level)
3449 ((parent-is ,switch-case) parent-bol js-indent-level) 3450 ((parent-is ,switch-case) parent-bol js-indent-level)
3450 ((parent-is "statement_block") parent-bol js-indent-level) 3451 ((parent-is "statement_block") parent-bol js-indent-level)
3451 3452
3452 ;; JSX 3453 ;; JSX
3453 ((parent-is "jsx_opening_element") parent js-indent-level) 3454 ((parent-is "jsx_opening_element") parent js-indent-level)
3455 ((match "<" "jsx_fragment") parent 0)
3456 ((parent-is "jsx_fragment") parent js-indent-level)
3454 ((node-is "jsx_closing_element") parent 0) 3457 ((node-is "jsx_closing_element") parent 0)
3455 ((node-is "jsx_text") parent js-indent-level) 3458 ((node-is "jsx_text") parent js-indent-level)
3456 ((parent-is "jsx_element") parent js-indent-level) 3459 ((parent-is "jsx_element") parent js-indent-level)
diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el
index b8a921e9c24..e7bd65c5e2f 100644
--- a/lisp/progmodes/typescript-ts-mode.el
+++ b/lisp/progmodes/typescript-ts-mode.el
@@ -92,9 +92,12 @@ Argument LANGUAGE is either `typescript' or `tsx'."
92 ((parent-is "class_body") parent-bol typescript-ts-mode-indent-offset) 92 ((parent-is "class_body") parent-bol typescript-ts-mode-indent-offset)
93 ((parent-is "arrow_function") parent-bol typescript-ts-mode-indent-offset) 93 ((parent-is "arrow_function") parent-bol typescript-ts-mode-indent-offset)
94 ((parent-is "parenthesized_expression") parent-bol typescript-ts-mode-indent-offset) 94 ((parent-is "parenthesized_expression") parent-bol typescript-ts-mode-indent-offset)
95 ((parent-is "binary_expression") parent-bol typescript-ts-mode-indent-offset)
95 96
96 ,@(when (eq language 'tsx) 97 ,@(when (eq language 'tsx)
97 `(((parent-is "jsx_opening_element") parent typescript-ts-mode-indent-offset) 98 `(((parent-is "jsx_opening_element") parent typescript-ts-mode-indent-offset)
99 ((match "<" "jsx_fragment") parent 0)
100 ((parent-is "jsx_fragment") parent typescript-ts-mode-indent-offset)
98 ((node-is "jsx_closing_element") parent 0) 101 ((node-is "jsx_closing_element") parent 0)
99 ((parent-is "jsx_element") parent typescript-ts-mode-indent-offset) 102 ((parent-is "jsx_element") parent typescript-ts-mode-indent-offset)
100 ((node-is "/") parent 0) 103 ((node-is "/") parent 0)