maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Handle feedback from #32359

Browse source
This commit is contained in:
Orta Therox 2019-07-15 10:48:10 -04:00
parent 59d5585814
commit 1d78218053
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/services/formatting/formatting.ts
View file

@ -490,7 +490,7 @@ namespace ts.formatting {
else if (SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(parent, node, startLine, sourceFile)) {
return { indentation: parentDynamicIndentation.getIndentation(), delta };
}
else if (SmartIndenter.childStartsInlineWithPreviousObject(parent, node, startLine, sourceFile)) {
else if (SmartIndenter.argumentStartsOnSameLineAsPreviousArgument(parent, node, startLine, sourceFile)) {
return { indentation: parentDynamicIndentation.getIndentation(), delta };
}
else {

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

@ -322,16 +322,15 @@ namespace ts.formatting {
return false;
}
export function childStartsInlineWithPreviousObject(parent: Node, child: TextRangeWithKind, childStartLine: number, sourceFile: SourceFileLike): boolean {
if (parent.kind === SyntaxKind.CallExpression) {
const parentCallExpression = <CallExpression>parent;
const currentNode = find(parentCallExpression.arguments, arg => arg.pos === child.pos);
if (!currentNode) return false; // Shouldn't happen
export function argumentStartsOnSameLineAsPreviousArgument(parent: Node, child: TextRangeWithKind, childStartLine: number, sourceFile: SourceFileLike): boolean {
if (isCallOrNewExpression(parent)) {
if (!parent.arguments) return false;
const currentIndex = parentCallExpression.arguments.indexOf(currentNode);
const currentNode = Debug.assertDefined(find(parent.arguments, arg => arg.pos === child.pos));
const currentIndex = parent.arguments.indexOf(currentNode);
if (currentIndex === 0) return false; // Can't look at previous node if first
const previousNode = parentCallExpression.arguments[currentIndex - 1];
const previousNode = parent.arguments[currentIndex - 1];
const lineOfPreviousNode = getLineAndCharacterOfPosition(sourceFile, previousNode.getEnd()).line;
if (childStartLine === lineOfPreviousNode) {