Fix typescript-ts-mode indentation (bug#77803)
Don't align variable names to their declaratory expression. Before this commit in code like: const a = 1, b = 2; the b would get indented to `const'. Similarly for `var' and `let'. The expected behavior instead is getting indented to `typescript-ts-mode-indent-offset'. * lisp/progmodes/typescript-ts-mode.el (typescript-ts-mode--indent-rules): Indent identifiers declarations to `typescript-ts-mode-indent-offset'. * test/lisp/progmodes/typescript-ts-mode-resources/indent.erts (Lexical and variable declarations): Update test accordingly.
This commit is contained in:
parent
ef8bfe90b7
commit
9750333dde
2 changed files with 15 additions and 15 deletions
|
@ -130,7 +130,7 @@ Argument LANGUAGE is either `typescript' or `tsx'."
|
|||
((parent-is "type_arguments") parent-bol typescript-ts-mode-indent-offset)
|
||||
((parent-is "type_parameters") parent-bol typescript-ts-mode-indent-offset)
|
||||
((parent-is ,(rx (or "variable" "lexical") "_" (or "declaration" "declarator")))
|
||||
typescript-ts-mode--anchor-decl 1)
|
||||
parent-bol typescript-ts-mode-indent-offset)
|
||||
((parent-is "arguments") parent-bol typescript-ts-mode-indent-offset)
|
||||
((parent-is "array") parent-bol typescript-ts-mode-indent-offset)
|
||||
((parent-is "formal_parameters") parent-bol typescript-ts-mode-indent-offset)
|
||||
|
|
|
@ -67,22 +67,22 @@ Name: Lexical and variable declarations
|
|||
=-=
|
||||
const foo = () => {
|
||||
let x = 1,
|
||||
yyyy: {
|
||||
[k: string | number]: string,
|
||||
} = {
|
||||
"foo": "foo",
|
||||
"bar": "bar",
|
||||
};
|
||||
yyyy: {
|
||||
[k: string | number]: string,
|
||||
} = {
|
||||
"foo": "foo",
|
||||
"bar": "bar",
|
||||
};
|
||||
var obar = 1,
|
||||
fo: { [x: any]: any } = {
|
||||
"a": 1,
|
||||
"b": 2,
|
||||
};
|
||||
fo: { [x: any]: any } = {
|
||||
"a": 1,
|
||||
"b": 2,
|
||||
};
|
||||
const cccc = 1,
|
||||
bbb = {
|
||||
"x": 0
|
||||
},
|
||||
ddddd = 0;
|
||||
bbb = {
|
||||
"x": 0
|
||||
},
|
||||
ddddd = 0;
|
||||
// First decls with value starting on same line
|
||||
const a = (x: string): string => {
|
||||
return x + x;
|
||||
|
|
Loading…
Add table
Reference in a new issue