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

adjust delta when recomputing parent indentation

Browse source
This commit is contained in:
Vladimir Matveev 2014-11-07 00:31:49 -08:00
parent 62dd501a48
commit 4b19eb3e93
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/services/format.ts
View file

@ -241,6 +241,12 @@ module ts.formatting {
indentation -= options.IndentSize;
commentIndentation -= options.IndentSize;
}
if (shouldIndentChildNodes(node.kind)) {
delta = options.IndentSize;
}
else {
delta = 0;
}
}
},
increaseCommentIndentation: (delta) => {
@ -362,9 +368,9 @@ module ts.formatting {
}
function processChildNode(
child: Node,
inheritedIndentation: number,
childEffectiveStartLine: number,
child: Node,
inheritedIndentation: number,
childEffectiveStartLine: number,
isListElement: boolean): number {
if (child.kind === SyntaxKind.Missing) {
@ -404,6 +410,13 @@ module ts.formatting {
}
}
if (isToken(child)) {
var tokenInfo = formattingScanner.readTokenInfo(node);
Debug.assert(tokenInfo.token.end === child.end);
doConsumeTokenAndAdvanceScanner(tokenInfo, node, nodeIndentation);
return inheritedIndentation;
}
if (childIndentationAmount === Indentation.Unknown) {
if (isSomeBlock(child.kind)) {
// child is indented
@ -434,17 +447,8 @@ module ts.formatting {
childDelta = Math.min(options.IndentSize, delta + childDelta);
}
// ensure that current token is inside child node
if (isToken(child)) {
var tokenInfo = formattingScanner.readTokenInfo(node);
Debug.assert(tokenInfo.token.end === child.end);
var childIndentation = getDynamicIndentation(node, childEffectiveStartLine, childIndentationAmount, childIndentationAmount, childDelta);
doConsumeTokenAndAdvanceScanner(tokenInfo, node, childIndentation);
}
else {
processNode(child, childContextNode, childStart.line, childIndentationAmount, childDelta);
childContextNode = node;
}
processNode(child, childContextNode, childStart.line, childIndentationAmount, childDelta);
childContextNode = node;
return inheritedIndentation;
}