always give container

saschanaz · saschanaz · commit cddc72a25e1a · 2016-12-21T20:58:52.000+09:00
diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
@@ -566,7 +566,7 @@ namespace ts.formatting {
                 if (tokenInfo.token.end > node.end) {
                     break;
                 }
-                consumeTokenAndAdvanceScanner(tokenInfo, node, nodeDynamicIndentation);
+                consumeTokenAndAdvanceScanner(tokenInfo, node, nodeDynamicIndentation, node);
             }
 
             function processChildNode(
@@ -617,7 +617,7 @@ namespace ts.formatting {
                         break;
                     }
 
-                    consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation);
+                    consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, node);
                 }
 
                 if (!formattingScanner.isOnToken()) {
@@ -673,11 +673,11 @@ namespace ts.formatting {
                                 computeIndentation(tokenInfo.token, startLine, Constants.Unknown, parent, parentDynamicIndentation, parentStartLine);
 
                             listDynamicIndentation = getDynamicIndentation(parent, parentStartLine, indentation.indentation, indentation.delta);
-                            consumeTokenAndAdvanceScanner(tokenInfo, parent, listDynamicIndentation);
+                            consumeTokenAndAdvanceScanner(tokenInfo, parent, listDynamicIndentation, parent);
                         }
                         else {
                             // consume any tokens that precede the list as child elements of 'node' using its indentation scope
-                            consumeTokenAndAdvanceScanner(tokenInfo, parent, parentDynamicIndentation);
+                            consumeTokenAndAdvanceScanner(tokenInfo, parent, parentDynamicIndentation, parent);
                         }
                     }
                 }
@@ -697,13 +697,13 @@ namespace ts.formatting {
                         // without this check close paren will be interpreted as list end token for function expression which is wrong
                         if (tokenInfo.token.kind === listEndToken && rangeContainsRange(parent, tokenInfo.token)) {
                             // consume list end token
-                            consumeTokenAndAdvanceScanner(tokenInfo, parent, listDynamicIndentation);
+                            consumeTokenAndAdvanceScanner(tokenInfo, parent, listDynamicIndentation, parent);
                         }
                     }
                 }
             }
 
-            function consumeTokenAndAdvanceScanner(currentTokenInfo: TokenInfo, parent: Node, dynamicIndentation: DynamicIndentation, container?: Node): void {
+            function consumeTokenAndAdvanceScanner(currentTokenInfo: TokenInfo, parent: Node, dynamicIndentation: DynamicIndentation, container: Node): void {
                 Debug.assert(rangeContainsRange(parent, currentTokenInfo.token));
 
                 const lastTriviaWasNewLine = formattingScanner.lastTrailingTriviaWasNewLine();

Original file line number	Diff line number	Diff line change
`@@ -566,7 +566,7 @@ namespace ts.formatting {`
`566`	`566`	`if (tokenInfo.token.end > node.end) {`
`567`	`567`	`break;`
`568`	`568`	`}`
`569`		`- consumeTokenAndAdvanceScanner(tokenInfo, node, nodeDynamicIndentation);`
	`569`	`+ consumeTokenAndAdvanceScanner(tokenInfo, node, nodeDynamicIndentation, node);`
`570`	`570`	`}`
`571`	`571`
`572`	`572`	`function processChildNode(`
`@@ -617,7 +617,7 @@ namespace ts.formatting {`
`617`	`617`	`break;`
`618`	`618`	`}`
`619`	`619`
`620`		`- consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation);`
	`620`	`+ consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, node);`
`621`	`621`	`}`
`622`	`622`
`623`	`623`	`if (!formattingScanner.isOnToken()) {`
`@@ -673,11 +673,11 @@ namespace ts.formatting {`
`673`	`673`	`computeIndentation(tokenInfo.token, startLine, Constants.Unknown, parent, parentDynamicIndentation, parentStartLine);`
`674`	`674`
`675`	`675`	`listDynamicIndentation = getDynamicIndentation(parent, parentStartLine, indentation.indentation, indentation.delta);`
`676`		`- consumeTokenAndAdvanceScanner(tokenInfo, parent, listDynamicIndentation);`
	`676`	`+ consumeTokenAndAdvanceScanner(tokenInfo, parent, listDynamicIndentation, parent);`
`677`	`677`	`}`
`678`	`678`	`else {`
`679`	`679`	`// consume any tokens that precede the list as child elements of 'node' using its indentation scope`
`680`		`- consumeTokenAndAdvanceScanner(tokenInfo, parent, parentDynamicIndentation);`
	`680`	`+ consumeTokenAndAdvanceScanner(tokenInfo, parent, parentDynamicIndentation, parent);`
`681`	`681`	`}`
`682`	`682`	`}`
`683`	`683`	`}`
`@@ -697,13 +697,13 @@ namespace ts.formatting {`
`697`	`697`	`// without this check close paren will be interpreted as list end token for function expression which is wrong`
`698`	`698`	`if (tokenInfo.token.kind === listEndToken && rangeContainsRange(parent, tokenInfo.token)) {`
`699`	`699`	`// consume list end token`
`700`		`- consumeTokenAndAdvanceScanner(tokenInfo, parent, listDynamicIndentation);`
	`700`	`+ consumeTokenAndAdvanceScanner(tokenInfo, parent, listDynamicIndentation, parent);`
`701`	`701`	`}`
`702`	`702`	`}`
`703`	`703`	`}`
`704`	`704`	`}`
`705`	`705`
`706`		`- function consumeTokenAndAdvanceScanner(currentTokenInfo: TokenInfo, parent: Node, dynamicIndentation: DynamicIndentation, container?: Node): void {`
	`706`	`+ function consumeTokenAndAdvanceScanner(currentTokenInfo: TokenInfo, parent: Node, dynamicIndentation: DynamicIndentation, container: Node): void {`
`707`	`707`	`Debug.assert(rangeContainsRange(parent, currentTokenInfo.token));`
`708`	`708`
`709`	`709`	`const lastTriviaWasNewLine = formattingScanner.lastTrailingTriviaWasNewLine();`