fix offsetting and tests

aozgaa · aozgaa · commit cc880915d5b1 · 2017-06-09T21:19:29.000-07:00
diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
@@ -1127,7 +1127,7 @@ namespace ts.formatting {
             const commentStart = range.pos;
             const commentLineStart = getLineStartPositionForPosition(commentStart, sourceFile);
             const { column, character } = SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(commentLineStart, commentStart, sourceFile, options);
-            return range.pos - character + column;
+            return column + /*length after whitespace ends*/ range.pos - (commentLineStart + character);
         }
         return undefined;
     }
@@ -1142,7 +1142,8 @@ namespace ts.formatting {
         if (commentRanges) {
             for (const range of commentRanges) {
                 // We need to extend the range when in an unclosed multi-line comment.
-                if (range.pos < position && (position < range.end || position === range.end && position === sourceFile.getFullWidth())) {
+                if (range.pos < position && position < range.end ||
+                    position === range.end && (range.kind === SyntaxKind.SingleLineCommentTrivia || position === sourceFile.getFullWidth())) {
                     return onlyMultiLine && range.kind !== SyntaxKind.MultiLineCommentTrivia ? undefined : range;
                 }
             }
diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
@@ -149,7 +149,7 @@ declare namespace FourSlashInterface {
         typeDefinitionCountIs(expectedCount: number): void;
         implementationListIsEmpty(): void;
         isValidBraceCompletionAtPosition(openingBrace?: string): void;
-        isInMultiLineCommentAtPosition(): void;
+        isInCommentAtPosition(onlyMultiLine: boolean): void;
         codeFixAvailable(): void;
         applicableRefactorAvailableAtMarker(markerName: string): void;
         codeFixDiagnosticsAvailableAtMarkers(markerNames: string[], diagnosticCode?: number): void;
diff --git a/tests/cases/fourslash/isInMultiLineComment.ts b/tests/cases/fourslash/isInMultiLineComment.ts
@@ -11,36 +11,37 @@
 const firstCommentStart = 0;
 const firstCommentEnd = 7;
 goTo.position(firstCommentStart);
-verify.not.isInMultiLineCommentAtPosition();
+verify.not.isInCommentAtPosition(/*onlyMultiLine*/ true);
 
 goTo.position(firstCommentStart + 1);
-verify.isInMultiLineCommentAtPosition();
+verify.isInCommentAtPosition(/*onlyMultiLine*/ true);
 goTo.position(firstCommentEnd - 1);
-verify.isInMultiLineCommentAtPosition();
+verify.isInCommentAtPosition(/*onlyMultiLine*/ true);
 
 goTo.position(firstCommentEnd);
-verify.not.isInMultiLineCommentAtPosition();
+verify.not.isInCommentAtPosition(/*onlyMultiLine*/ true);
 
 const multilineJsDocStart = firstCommentEnd + 1;
 const multilineJsDocEnd = multilineJsDocStart + 49;
 
 goTo.position(multilineJsDocStart);
-verify.not.isInMultiLineCommentAtPosition();
+verify.not.isInCommentAtPosition(/*onlyMultiLine*/ true);
 goTo.position(multilineJsDocStart + 1);
-verify.isInMultiLineCommentAtPosition();
+verify.isInCommentAtPosition(/*onlyMultiLine*/ true);
 goTo.position(multilineJsDocEnd - 1);
-verify.isInMultiLineCommentAtPosition();
+verify.isInCommentAtPosition(/*onlyMultiLine*/ true);
 goTo.position(multilineJsDocEnd);
-verify.not.isInMultiLineCommentAtPosition();
+verify.not.isInCommentAtPosition(/*onlyMultiLine*/ true);
 
 const singleLineCommentStart = multilineJsDocEnd + 1;
 
 goTo.position(singleLineCommentStart + 1);
-verify.not.isInMultiLineCommentAtPosition();
+verify.not.isInCommentAtPosition(/*onlyMultiLine*/ true);
+verify.isInCommentAtPosition(/*onlyMultiLine*/ false);
 
 const postNodeCommentStart = singleLineCommentStart + 16;
 
 goTo.position(postNodeCommentStart);
-verify.not.isInMultiLineCommentAtPosition();
+verify.not.isInCommentAtPosition(/*onlyMultiLine*/ true);
 goTo.position(postNodeCommentStart + 1);
-verify.isInMultiLineCommentAtPosition();
+verify.isInCommentAtPosition(/*onlyMultiLine*/ true);
diff --git a/tests/cases/fourslash/isInMultiLineCommentEOF.ts b/tests/cases/fourslash/isInMultiLineCommentEOF.ts

Original file line number	Diff line number	Diff line change
`@@ -1127,7 +1127,7 @@ namespace ts.formatting {`
`1127`	`1127`	`const commentStart = range.pos;`
`1128`	`1128`	`const commentLineStart = getLineStartPositionForPosition(commentStart, sourceFile);`
`1129`	`1129`	`const { column, character } = SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(commentLineStart, commentStart, sourceFile, options);`
`1130`		`- return range.pos - character + column;`
	`1130`	`+ return column + /length after whitespace ends/ range.pos - (commentLineStart + character);`
`1131`	`1131`	`}`
`1132`	`1132`	`return undefined;`
`1133`	`1133`	`}`
`@@ -1142,7 +1142,8 @@ namespace ts.formatting {`
`1142`	`1142`	`if (commentRanges) {`
`1143`	`1143`	`for (const range of commentRanges) {`
`1144`	`1144`	`// We need to extend the range when in an unclosed multi-line comment.`
`1145`		`- if (range.pos < position && (position < range.end \|\| position === range.end && position === sourceFile.getFullWidth())) {`
	`1145`	`+ if (range.pos < position && position < range.end \|\|`
	`1146`	`+ position === range.end && (range.kind === SyntaxKind.SingleLineCommentTrivia \|\| position === sourceFile.getFullWidth())) {`
`1146`	`1147`	`return onlyMultiLine && range.kind !== SyntaxKind.MultiLineCommentTrivia ? undefined : range;`
`1147`	`1148`	`}`
`1148`	`1149`	`}`