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

when looking for a start node consider only nodes that can contribute to indentation

Browse source
This commit is contained in:
Vladimir Matveev 2014-09-12 16:18:06 -07:00
parent cd663f07f3
commit 54b8c73a78
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,7 +35,7 @@ module ts.formatting {
}
}
// try to find the node that will include 'position' starting from 'precedingToken'
// try to find node that can contribute to indentation and includes 'position' starting from 'precedingToken'
// if such node is found - compute initial indentation for 'position' inside this node
var previous: Node;
var current = precedingToken;
@ -43,14 +43,14 @@ module ts.formatting {
var indentation: number;
while (current) {
if (isPositionBelongToNode(current, position, sourceFile)) {
if (isPositionBelongToNode(current, position, sourceFile) && isNodeContentIndented(current, previous)) {
currentStart = getStartLineAndCharacterForNode(current, sourceFile);
if (discardInitialIndentationIfNextTokenIsOpenOrCloseBrace(precedingToken, current, lineAtPosition, sourceFile)) {
indentation = 0;
}
else {
indentation = isNodeContentIndented(current, previous) && lineAtPosition !== currentStart.line ? options.indentSpaces : 0;
indentation = lineAtPosition !== currentStart.line ? options.indentSpaces : 0;
}
break;
@ -444,7 +444,6 @@ module ts.formatting {
case SyntaxKind.DefaultClause:
case SyntaxKind.CaseClause:
case SyntaxKind.ParenExpression:
case SyntaxKind.BinaryExpression:
case SyntaxKind.CallExpression:
case SyntaxKind.NewExpression:
case SyntaxKind.VariableStatement: