Merge pull request microsoft#5353 from Microsoft/tokenFollowingMultilineComment

vladima · vladima · commit 402baba28b48 · 2015-10-21T13:35:55.000-07:00
do not indent token if its start line matches end line of previous to…
diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
@@ -695,8 +695,8 @@ namespace ts.formatting {
                 let tokenStart = sourceFile.getLineAndCharacterOfPosition(currentTokenInfo.token.pos);
                 if (isTokenInRange) {
                     let rangeHasError = rangeContainsError(currentTokenInfo.token);
-                    // save prevStartLine since processRange will overwrite this value with current ones
-                    let prevStartLine = previousRangeStartLine;
+                    // save previousRange since processRange will overwrite this value with current one
+                    let savePreviousRange = previousRange;
                     lineAdded = processRange(currentTokenInfo.token, tokenStart, parent, childContextNode, dynamicIndentation);
                     if (rangeHasError) {
                         // do not indent comments\token if token range overlaps with some error
@@ -707,7 +707,9 @@ namespace ts.formatting {
                             indentToken = lineAdded;
                         }
                         else {
-                            indentToken = lastTriviaWasNewLine && tokenStart.line !== prevStartLine;
+                            // indent token only if end line of previous range does not match start line of the token
+                            const prevEndLine = savePreviousRange && sourceFile.getLineAndCharacterOfPosition(savePreviousRange.end).line;
+                            indentToken = lastTriviaWasNewLine &&  tokenStart.line !== prevEndLine;
                         }
                     }
                 }
diff --git a/tests/cases/fourslash/formatAfterMultilineComment.ts b/tests/cases/fourslash/formatAfterMultilineComment.ts
@@ -0,0 +1,7 @@
+/// <reference path="fourslash.ts"/>
+/////*foo
+////*/"123123";
+
+format.document();
+verify.currentFileContentIs(`/*foo
+*/"123123";`)

Original file line number	Diff line number	Diff line change
`@@ -695,8 +695,8 @@ namespace ts.formatting {`
`695`	`695`	`let tokenStart = sourceFile.getLineAndCharacterOfPosition(currentTokenInfo.token.pos);`
`696`	`696`	`if (isTokenInRange) {`
`697`	`697`	`let rangeHasError = rangeContainsError(currentTokenInfo.token);`
`698`		`- // save prevStartLine since processRange will overwrite this value with current ones`
`699`		`- let prevStartLine = previousRangeStartLine;`
	`698`	`+ // save previousRange since processRange will overwrite this value with current one`
	`699`	`+ let savePreviousRange = previousRange;`
`700`	`700`	`lineAdded = processRange(currentTokenInfo.token, tokenStart, parent, childContextNode, dynamicIndentation);`
`701`	`701`	`if (rangeHasError) {`
`702`	`702`	`// do not indent comments\token if token range overlaps with some error`
`@@ -707,7 +707,9 @@ namespace ts.formatting {`
`707`	`707`	`indentToken = lineAdded;`
`708`	`708`	`}`
`709`	`709`	`else {`
`710`		`- indentToken = lastTriviaWasNewLine && tokenStart.line !== prevStartLine;`
	`710`	`+ // indent token only if end line of previous range does not match start line of the token`
	`711`	`+ const prevEndLine = savePreviousRange && sourceFile.getLineAndCharacterOfPosition(savePreviousRange.end).line;`
	`712`	`+ indentToken = lastTriviaWasNewLine && tokenStart.line !== prevEndLine;`
`711`	`713`	`}`
`712`	`714`	`}`
`713`	`715`	`}`