diff options
| -rw-r--r-- | lisp/progmodes/ts-mode.el | 57 |
1 files changed, 19 insertions, 38 deletions
diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el index 1f0a7fd5c40..20118bc3db9 100644 --- a/lisp/progmodes/ts-mode.el +++ b/lisp/progmodes/ts-mode.el | |||
| @@ -60,48 +60,29 @@ | |||
| 60 | ((node-is ")") parent-bol 0) | 60 | ((node-is ")") parent-bol 0) |
| 61 | ((node-is "]") parent-bol 0) | 61 | ((node-is "]") parent-bol 0) |
| 62 | ((node-is ">") parent-bol 0) | 62 | ((node-is ">") parent-bol 0) |
| 63 | ((parent-is "ternary_expression") | 63 | ((parent-is "ternary_expression") parent-bol ,ts-mode-indent-offset) |
| 64 | parent-bol ,ts-mode-indent-offset) | 64 | ((parent-is "member_expression") parent-bol ,ts-mode-indent-offset) |
| 65 | ((parent-is "member_expression") | 65 | ((parent-is "named_imports") parent-bol ,ts-mode-indent-offset) |
| 66 | parent-bol ,ts-mode-indent-offset) | 66 | ((parent-is "statement_block") parent-bol ,ts-mode-indent-offset) |
| 67 | ((parent-is "named_imports") | 67 | ((parent-is "type_arguments") parent-bol ,ts-mode-indent-offset) |
| 68 | parent-bol ,ts-mode-indent-offset) | 68 | ((parent-is "variable_declarator") parent-bol ,ts-mode-indent-offset) |
| 69 | ((parent-is "statement_block") | 69 | ((parent-is "arguments") parent-bol ,ts-mode-indent-offset) |
| 70 | parent-bol ,ts-mode-indent-offset) | 70 | ((parent-is "array") parent-bol ,ts-mode-indent-offset) |
| 71 | ((parent-is "type_arguments") | 71 | ((parent-is "formal_parameters") parent-bol ,ts-mode-indent-offset) |
| 72 | parent-bol ,ts-mode-indent-offset) | 72 | ((parent-is "template_substitution") parent-bol ,ts-mode-indent-offset) |
| 73 | ((parent-is "variable_declarator") | 73 | ((parent-is "object_pattern") parent-bol ,ts-mode-indent-offset) |
| 74 | parent-bol ,ts-mode-indent-offset) | 74 | ((parent-is "object") parent-bol ,ts-mode-indent-offset) |
| 75 | ((parent-is "arguments") | 75 | ((parent-is "object_type") parent-bol ,ts-mode-indent-offset) |
| 76 | parent-bol ,ts-mode-indent-offset) | 76 | ((parent-is "enum_body") parent-bol ,ts-mode-indent-offset) |
| 77 | ((parent-is "array") | 77 | ((parent-is "arrow_function") parent-bol ,ts-mode-indent-offset) |
| 78 | parent-bol ,ts-mode-indent-offset) | 78 | ((parent-is "parenthesized_expression") parent-bol ,ts-mode-indent-offset) |
| 79 | ((parent-is "formal_parameters") | ||
| 80 | parent-bol ,ts-mode-indent-offset) | ||
| 81 | ((parent-is "template_substitution") | ||
| 82 | parent-bol ,ts-mode-indent-offset) | ||
| 83 | ((parent-is "object_pattern") | ||
| 84 | parent-bol ,ts-mode-indent-offset) | ||
| 85 | ((parent-is "object") | ||
| 86 | parent-bol ,ts-mode-indent-offset) | ||
| 87 | ((parent-is "object_type") | ||
| 88 | parent-bol ,ts-mode-indent-offset) | ||
| 89 | ((parent-is "enum_body") | ||
| 90 | parent-bol ,ts-mode-indent-offset) | ||
| 91 | ((parent-is "arrow_function") | ||
| 92 | parent-bol ,ts-mode-indent-offset) | ||
| 93 | ((parent-is "parenthesized_expression") | ||
| 94 | parent-bol ,ts-mode-indent-offset) | ||
| 95 | 79 | ||
| 96 | ;; TSX | 80 | ;; TSX |
| 97 | ((parent-is "jsx_opening_element") | 81 | ((parent-is "jsx_opening_element") parent ,ts-mode-indent-offset) |
| 98 | parent ,ts-mode-indent-offset) | ||
| 99 | ((node-is "jsx_closing_element") parent 0) | 82 | ((node-is "jsx_closing_element") parent 0) |
| 100 | ((parent-is "jsx_element") | 83 | ((parent-is "jsx_element") parent ,ts-mode-indent-offset) |
| 101 | parent ,ts-mode-indent-offset) | ||
| 102 | ((node-is "/") parent 0) | 84 | ((node-is "/") parent 0) |
| 103 | ((parent-is "jsx_self_closing_element") | 85 | ((parent-is "jsx_self_closing_element") parent ,ts-mode-indent-offset) |
| 104 | parent ,ts-mode-indent-offset) | ||
| 105 | (no-node parent-bol 0))) | 86 | (no-node parent-bol 0))) |
| 106 | "Tree-sitter indent rules.") | 87 | "Tree-sitter indent rules.") |
| 107 | 88 | ||