PR comments

sandersn · sandersn · commit 3cc0aeb6be16 · 2017-09-21T09:44:51.000-07:00
I plan to fix the missing comment issue when I add the
convert-jsdoc-types-to-typescript-types refactoring. Or at least work
around it.
diff --git a/src/services/textChanges.ts b/src/services/textChanges.ts
@@ -152,7 +152,9 @@ namespace ts.textChanges {
             return position === Position.Start ? start : fullStart;
         }
         // get start position of the line following the line that contains fullstart position
-        let adjustedStartPosition = getStartPositionOfLine(getLineOfLocalPosition(sourceFile, fullStartLine) + (fullStart > 0 ? 1 : 0), sourceFile);
+        // (but only if the fullstart isn't the very beginning of the file)
+        const nextLineStart = fullStart > 0 ? 1 : 0;
+        let adjustedStartPosition = getStartPositionOfLine(getLineOfLocalPosition(sourceFile, fullStartLine) + nextLineStart, sourceFile);
         // skip whitespaces/newlines
         adjustedStartPosition = skipWhitespacesAndLineBreaks(sourceFile.text, adjustedStartPosition);
         return getStartPositionOfLine(getLineOfLocalPosition(sourceFile, adjustedStartPosition), sourceFile);
diff --git a/tests/cases/fourslash/extract-method-uniqueName.ts b/tests/cases/fourslash/extract-method-uniqueName.ts
@@ -3,6 +3,8 @@
 ////// newFunction
 /////*start*/1 + 1/*end*/;
 
+// NOTE: '// newFunction' should be included, but due to incorrect handling of trivia,
+// it's omitted right now.
 goTo.select('start', 'end')
 edit.applyRefactor({
     refactorName: "Extract Method",
diff --git a/tests/cases/fourslash/server/convertFunctionToEs6Class-server.ts b/tests/cases/fourslash/server/convertFunctionToEs6Class-server.ts
@@ -12,6 +12,8 @@
 //// }
 
 verify.applicableRefactorAvailableAtMarker('1');
+// NOTE: '// Comment' should be included, but due to incorrect handling of trivia,
+// it's omitted right now.
 verify.fileAfterApplyingRefactorAtMarker('1',
 `class fn {
     constructor() {
