microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-10 18:04:18 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix(48109) - 'Convert to arrow function' refactoring adds extra indent (#48440)

Browse Source 
* fix(48109) - Remove extra indent when converting to arrow function

* fix(48109) - Only treat curly brace in object literal as block

* Apply suggestions from code review

Co-authored-by: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>
This commit is contained in:
Minh Quy
2022-04-05 02:57:34 +02:00
committed by GitHub
parent 276719753e
commit 25aecd4c3e
4 changed files with 57 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/services/formatting/smartIndenter.ts
View File

@@ -56,9 +56,9 @@ namespace ts.formatting {
// for block indentation, we should look for a line which contains something that's not
// whitespace.
const currentToken = getTokenAtPosition(sourceFile, position);
// for object literal, we want to the indentation work like block
// if { starts in any position (can be in the middle of line)
// the following indentation should treat { as starting of that line (including leading whitespace)
// For object literals, we want indentation to work just like with blocks.
// If the `{` starts in any position (even in the middle of a line), then
// the following indentation should treat `{` as the start of that line (including leading whitespace).
// ```
// const a: { x: undefined, y: undefined } = {} // leading 4 whitespaces and { starts in the middle of line
// ->
@@ -76,7 +76,8 @@ namespace ts.formatting {
// y: undefined,
// }
// ```
if (options.indentStyle === IndentStyle.Block || currentToken.kind === SyntaxKind.OpenBraceToken) {
const isObjectLiteral = currentToken.kind === SyntaxKind.OpenBraceToken && currentToken.parent.kind === SyntaxKind.ObjectLiteralExpression;
if (options.indentStyle === IndentStyle.Block || isObjectLiteral) {
return getBlockIndent(sourceFile, position, options);
}
@@ -91,7 +92,9 @@ namespace ts.formatting {
const containerList = getListByPosition(position, precedingToken.parent, sourceFile);
// use list position if the preceding token is before any list items
if (containerList && !rangeContainsRange(containerList, precedingToken)) {
return getActualIndentationForListStartLine(containerList, sourceFile, options) + options.indentSize!; // TODO: GH#18217
const useTheSameBaseIndentation = [SyntaxKind.FunctionExpression, SyntaxKind.ArrowFunction].indexOf(currentToken.parent.kind) !== -1;
const indentSize = useTheSameBaseIndentation ? 0 : options.indentSize!;
return getActualIndentationForListStartLine(containerList, sourceFile, options) + indentSize; // TODO: GH#18217
}
return getSmartIndent(sourceFile, position, precedingToken, lineAtPosition, assumeNewLineBeforeCloseBrace, options);