microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-24 02:21:30 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

add child delta for all nodes

Browse Source
This commit is contained in:
Vladimir Matveev
2014-11-05 19:35:53 -08:00
parent edbb99d959
commit 154977ce95
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/services/formatting/format.ts
View File

@@ -449,24 +449,6 @@ module ts.formatting {
}
}
else {
var increaseIndentation = SmartIndenter.nodeContentIsAlwaysIndented(child.kind);
if (!increaseIndentation) {
switch (child.kind) {
case SyntaxKind.IfStatement:
case SyntaxKind.ForInStatement:
case SyntaxKind.ForStatement:
case SyntaxKind.WhileStatement:
case SyntaxKind.DoStatement:
case SyntaxKind.FunctionExpression:
case SyntaxKind.FunctionDeclaration:
case SyntaxKind.Method:
case SyntaxKind.GetAccessor:
case SyntaxKind.SetAccessor:
increaseIndentation = true;
break;
}
}
if (SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(node, child, childStart.line, sourceFile)) {
childIndentationAmount = nodeIndentation.getBaseIndentation();
}
@@ -474,12 +456,31 @@ module ts.formatting {
childIndentationAmount = nodeIndentation.getBaseIndentation() + nodeIndentation.getDelta();
}
if (increaseIndentation) {
childDelta = options.IndentSize;
}
}
}
}
var increaseIndentation = SmartIndenter.nodeContentIsAlwaysIndented(child.kind);
if (!increaseIndentation) {
switch (child.kind) {
case SyntaxKind.IfStatement:
case SyntaxKind.ForInStatement:
case SyntaxKind.ForStatement:
case SyntaxKind.WhileStatement:
case SyntaxKind.DoStatement:
case SyntaxKind.FunctionExpression:
case SyntaxKind.FunctionDeclaration:
case SyntaxKind.Method:
case SyntaxKind.GetAccessor:
case SyntaxKind.SetAccessor:
increaseIndentation = true;
break;
}
}
if (increaseIndentation) {
childDelta = options.IndentSize;
}
if (nodeEffectiveStartLine === childStart.line) {
childIndentationAmount = nodeIndentation.getBaseIndentation();
childDelta = Math.min(options.IndentSize, delta + childDelta);