Only scan in top level import trivia

microsoft · Apr 5, 2022 · f594067 · f594067
1 parent 24e4cd9
commit f594067
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/services/organizeImports.ts b/src/services/organizeImports.ts
@@ -92,7 +92,7 @@ namespace ts.OrganizeImports {
         const groupImports: ImportDeclaration[][] = [];
         let groupIndex = 0;
         for (const topLevelImportDecl of importDecls) {
-            if (isNewGroup(sourceFile, topLevelImportDecl, scanner)) {
+            if (isNewGroup(topLevelImportDecl, scanner)) {
                 groupIndex++;
             }
 
@@ -108,18 +108,20 @@ namespace ts.OrganizeImports {
 
     // a new group is created if an import includes at least two new line
     // new line from multi-line comment doesn't count
-    function isNewGroup(sourceFile: SourceFile, topLevelImportDecl: ImportDeclaration, scanner: Scanner) {
-        const startPos = topLevelImportDecl.getFullStart();
-        const endPos = topLevelImportDecl.getStart();
+    function isNewGroup(topLevelImportDecl: ImportDeclaration, scanner: Scanner) {
+        const leadingText = topLevelImportDecl.getFullText().substring(0, topLevelImportDecl.getLeadingTriviaWidth());
+        scanner.setText(leadingText);
 
-        scanner.setText(sourceFile.text, startPos);
         let numberOfNewLines = 0;
-        while (scanner.getTokenPos() < endPos) {
+        while (true) {
             const tokenKind = scanner.scan();
 
             if (tokenKind === SyntaxKind.NewLineTrivia) {
                 numberOfNewLines++;
             }
+            else if (tokenKind === SyntaxKind.EndOfFileToken) {
+                break;
+            }
         }
 
         return numberOfNewLines >= 2;