Also wrap getEffectiveTypeRoots in import completion code

riknoll · riknoll · commit 6ea5c227603e · 2016-09-12T18:17:54.000-07:00
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -575,9 +575,17 @@ namespace ts.Completions {
                 }
             }
             else if (host.getDirectories) {
-                const typeRoots = getEffectiveTypeRoots(options, host);
-                for (const root of typeRoots) {
-                    getCompletionEntriesFromDirectories(host, options, root, span, result);
+                let typeRoots: string[];
+                try {
+                    // Wrap in try catch because getEffectiveTypeRoots touches the filesystem
+                    typeRoots = getEffectiveTypeRoots(options, host);
+                }
+                catch (e) {}
+
+                if (typeRoots) {
+                    for (const root of typeRoots) {
+                        getCompletionEntriesFromDirectories(host, options, root, span, result);
+                    }
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -575,9 +575,17 @@ namespace ts.Completions {`
`575`	`575`	`}`
`576`	`576`	`}`
`577`	`577`	`else if (host.getDirectories) {`
`578`		`- const typeRoots = getEffectiveTypeRoots(options, host);`
`579`		`- for (const root of typeRoots) {`
`580`		`- getCompletionEntriesFromDirectories(host, options, root, span, result);`
	`578`	`+ let typeRoots: string[];`
	`579`	`+ try {`
	`580`	`+ // Wrap in try catch because getEffectiveTypeRoots touches the filesystem`
	`581`	`+ typeRoots = getEffectiveTypeRoots(options, host);`
	`582`	`+ }`
	`583`	`+ catch (e) {}`
	`584`	`+`
	`585`	`+ if (typeRoots) {`
	`586`	`+ for (const root of typeRoots) {`
	`587`	`+ getCompletionEntriesFromDirectories(host, options, root, span, result);`
	`588`	`+ }`
`581`	`589`	`}`
`582`	`590`	`}`
`583`	`591`