Tidy up code to make it harder to call incorrectly

amcasey · amcasey · commit fa758cc357e7 · 2018-01-09T15:33:54.000-08:00
diff --git a/src/services/pathCompletions.ts b/src/services/pathCompletions.ts
@@ -326,29 +326,28 @@ namespace ts.Completions.PathCompletions {
 
             if (typeRoots) {
                 for (const root of typeRoots) {
-                    getCompletionEntriesFromDirectories(host, root, span, result);
+                    getCompletionEntriesFromDirectories(root);
                 }
             }
-        }
 
-        if (host.getDirectories) {
             // Also get all @types typings installed in visible node_modules directories
             for (const packageJson of findPackageJsons(scriptPath, host)) {
                 const typesDir = combinePaths(getDirectoryPath(packageJson), "node_modules/@types");
-                getCompletionEntriesFromDirectories(host, typesDir, span, result);
+                getCompletionEntriesFromDirectories(typesDir);
             }
         }
 
         return result;
-    }
 
-    function getCompletionEntriesFromDirectories(host: LanguageServiceHost, directory: string, span: TextSpan, result: Push<CompletionEntry>) {
-        if (host.getDirectories && tryDirectoryExists(host, directory)) {
-            const directories = tryGetDirectories(host, directory);
-            if (directories) {
-                for (let typeDirectory of directories) {
-                    typeDirectory = normalizePath(typeDirectory);
-                    result.push(createCompletionEntryForModule(getBaseFileName(typeDirectory), ScriptElementKind.externalModuleName, span));
+        function getCompletionEntriesFromDirectories(directory: string) {
+            Debug.assert(!!host.getDirectories);
+            if (tryDirectoryExists(host, directory)) {
+                const directories = tryGetDirectories(host, directory);
+                if (directories) {
+                    for (let typeDirectory of directories) {
+                        typeDirectory = normalizePath(typeDirectory);
+                        result.push(createCompletionEntryForModule(getBaseFileName(typeDirectory), ScriptElementKind.externalModuleName, span));
+                    }
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -326,29 +326,28 @@ namespace ts.Completions.PathCompletions {`
`326`	`326`
`327`	`327`	`if (typeRoots) {`
`328`	`328`	`for (const root of typeRoots) {`
`329`		`- getCompletionEntriesFromDirectories(host, root, span, result);`
	`329`	`+ getCompletionEntriesFromDirectories(root);`
`330`	`330`	`}`
`331`	`331`	`}`
`332`		`- }`
`333`	`332`
`334`		`- if (host.getDirectories) {`
`335`	`333`	`// Also get all @types typings installed in visible node_modules directories`
`336`	`334`	`for (const packageJson of findPackageJsons(scriptPath, host)) {`
`337`	`335`	`const typesDir = combinePaths(getDirectoryPath(packageJson), "node_modules/@types");`
`338`		`- getCompletionEntriesFromDirectories(host, typesDir, span, result);`
	`336`	`+ getCompletionEntriesFromDirectories(typesDir);`
`339`	`337`	`}`
`340`	`338`	`}`
`341`	`339`
`342`	`340`	`return result;`
`343`		`- }`
`344`	`341`
`345`		`- function getCompletionEntriesFromDirectories(host: LanguageServiceHost, directory: string, span: TextSpan, result: Push<CompletionEntry>) {`
`346`		`- if (host.getDirectories && tryDirectoryExists(host, directory)) {`
`347`		`- const directories = tryGetDirectories(host, directory);`
`348`		`- if (directories) {`
`349`		`- for (let typeDirectory of directories) {`
`350`		`- typeDirectory = normalizePath(typeDirectory);`
`351`		`- result.push(createCompletionEntryForModule(getBaseFileName(typeDirectory), ScriptElementKind.externalModuleName, span));`
	`342`	`+ function getCompletionEntriesFromDirectories(directory: string) {`
	`343`	`+ Debug.assert(!!host.getDirectories);`
	`344`	`+ if (tryDirectoryExists(host, directory)) {`
	`345`	`+ const directories = tryGetDirectories(host, directory);`
	`346`	`+ if (directories) {`
	`347`	`+ for (let typeDirectory of directories) {`
	`348`	`+ typeDirectory = normalizePath(typeDirectory);`
	`349`	`+ result.push(createCompletionEntryForModule(getBaseFileName(typeDirectory), ScriptElementKind.externalModuleName, span));`
	`350`	`+ }`
`352`	`351`	`}`
`353`	`352`	`}`
`354`	`353`	`}`