Factor worker method out of ts.OrganizeImports.organizeImports

Author: amcasey

src/services/organizeImports.ts

@@ -16,43 +16,42 @@ namespace ts.OrganizeImports {
         // TODO (https://github.com/Microsoft/TypeScript/issues/10020): sort *within* ambient modules (find using isAmbientModule)
 
         // All of the old ImportDeclarations in the file, in syntactic order.
-        const oldImportDecls = sourceFile.statements.filter(isImportDeclaration);
+        const topLevelImportDecls = sourceFile.statements.filter(isImportDeclaration);
 
-        if (oldImportDecls.length === 0) {
-            return [];
-        }
-
-        const oldImportGroups = group(oldImportDecls, importDecl => getExternalModuleName(importDecl.moduleSpecifier));
-
-        const sortedImportGroups = stableSort(oldImportGroups, (group1, group2) =>
-            compareModuleSpecifiers(group1[0].moduleSpecifier, group2[0].moduleSpecifier));
+        const changeTracker = textChanges.ChangeTracker.fromContext({ host, formatContext });
+        organizeImportsWorker(topLevelImportDecls);
+        return changeTracker.getChanges();
 
-        const newImportDecls = flatMap(sortedImportGroups, importGroup =>
-            getExternalModuleName(importGroup[0].moduleSpecifier)
-                ? coalesceImports(removeUnusedImports(importGroup, sourceFile, program))
-                : importGroup);
+        function organizeImportsWorker(oldImportDecls: ReadonlyArray<ImportDeclaration>) {
+            if (length(oldImportDecls) === 0) {
+                return;
+            }
 
-        const changeTracker = textChanges.ChangeTracker.fromContext({ host, formatContext });
+            const oldImportGroups = group(oldImportDecls, importDecl => getExternalModuleName(importDecl.moduleSpecifier));
+            const sortedImportGroups = stableSort(oldImportGroups, (group1, group2) => compareModuleSpecifiers(group1[0].moduleSpecifier, group2[0].moduleSpecifier));
+            const newImportDecls = flatMap(sortedImportGroups, importGroup =>
+                getExternalModuleName(importGroup[0].moduleSpecifier)
+                    ? coalesceImports(removeUnusedImports(importGroup, sourceFile, program))
+                    : importGroup);
 
-        // Delete or replace the first import.
-        if (newImportDecls.length === 0) {
-            changeTracker.deleteNode(sourceFile, oldImportDecls[0]);
-        }
-        else {
-            // Note: Delete the surrounding trivia because it will have been retained in newImportDecls.
-            changeTracker.replaceNodeWithNodes(sourceFile, oldImportDecls[0], newImportDecls, {
-                useNonAdjustedStartPosition: false,
-                useNonAdjustedEndPosition: false,
-                suffix: getNewLineOrDefaultFromHost(host, formatContext.options),
-            });
-        }
+            // Delete or replace the first import.
+            if (newImportDecls.length === 0) {
+                changeTracker.deleteNode(sourceFile, oldImportDecls[0]);
+            }
+            else {
+                // Note: Delete the surrounding trivia because it will have been retained in newImportDecls.
+                changeTracker.replaceNodeWithNodes(sourceFile, oldImportDecls[0], newImportDecls, {
+                    useNonAdjustedStartPosition: false,
+                    useNonAdjustedEndPosition: false,
+                    suffix: getNewLineOrDefaultFromHost(host, formatContext.options),
+                });
+            }
 
-        // Delete any subsequent imports.
-        for (let i = 1; i < oldImportDecls.length; i++) {
-            changeTracker.deleteNode(sourceFile, oldImportDecls[i]);
+            // Delete any subsequent imports.
+            for (let i = 1; i < oldImportDecls.length; i++) {
+                changeTracker.deleteNode(sourceFile, oldImportDecls[i]);
+            }
         }
-
-        return changeTracker.getChanges();
     }
 
     function removeUnusedImports(oldImports: ReadonlyArray<ImportDeclaration>, sourceFile: SourceFile, program: Program) {