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

Merge from savannah/emacs-29

Browse source 
9af03e0e18 typescript-ts-mode: Support indentation for conditionals ...
This commit is contained in:
Po Lu 2023-11-24 08:38:06 +08:00
commit ad26461b48
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -124,6 +124,11 @@ Argument LANGUAGE is either `typescript' or `tsx'."
((parent-is "arrow_function") parent-bol typescript-ts-mode-indent-offset)
((parent-is "parenthesized_expression") parent-bol typescript-ts-mode-indent-offset)
((parent-is "binary_expression") parent-bol typescript-ts-mode-indent-offset)
((match "while" "do_statement") parent-bol 0)
((match "else" "if_statement") parent-bol 0)
((parent-is ,(rx (or (seq (or "if" "for" "for_in" "while" "do") "_statement")
"else_clause")))
parent-bol typescript-ts-mode-indent-offset)
,@(when (eq language 'tsx)
(append (tsx-ts-mode--indent-compatibility-b893426)

22
test/lisp/progmodes/typescript-ts-mode-resources/indent.erts
View file

@ -23,6 +23,28 @@ const foo = () => {
}
=-=-=
Name: Statement indentation without braces
=-=
const foo = () => {
if (true)
console.log("if_statement");
else if (false)
console.log("if_statement");
else
console.log("else_clause");
for (let i = 0; i < 1; i++)
console.log("for_statement");
for (let i of [true])
console.log("for_in_statement");
while (false)
console.log("while_statement");
do
console.log("do_statement");
while (false)
};
=-=-=
Code:
(lambda ()
(setq indent-tabs-mode nil)