Add nullchecks for typeRoots, remove getCurrentDirectory from ServerHost as it is always the installation location

zhengbli · zhengbli · commit d5cad239e858 · 2016-06-28T12:10:26.000-07:00
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -242,7 +242,7 @@ namespace ts {
         const failedLookupLocations: string[] = [];
 
         // Check primary library paths
-        if (typeRoots.length) {
+        if (typeRoots && typeRoots.length) {
             if (traceEnabled) {
                 trace(host, Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
             }
@@ -1060,9 +1060,11 @@ namespace ts {
         let result: string[] = [];
         if (host.directoryExists && host.getDirectories) {
             const typeRoots = getEffectiveTypeRoots(options, host);
-            for (const root of typeRoots) {
-                if (host.directoryExists(root)) {
-                    result = result.concat(host.getDirectories(root));
+            if (typeRoots) {
+                for (const root of typeRoots) {
+                    if (host.directoryExists(root)) {
+                        result = result.concat(host.getDirectories(root));
+                    }
                 }
             }
         }
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -113,7 +113,6 @@ namespace ts.server {
             this.moduleResolutionHost = {
                 fileExists: fileName => this.fileExists(fileName),
                 readFile: fileName => this.host.readFile(fileName),
-                getCurrentDirectory: () => this.host.getCurrentDirectory(),
                 directoryExists: directoryName => this.host.directoryExists(directoryName)
             };
         }

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ namespace ts {`
`242`	`242`	`const failedLookupLocations: string[] = [];`
`243`	`243`
`244`	`244`	`// Check primary library paths`
`245`		`- if (typeRoots.length) {`
	`245`	`+ if (typeRoots && typeRoots.length) {`
`246`	`246`	`if (traceEnabled) {`
`247`	`247`	`trace(host, Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));`
`248`	`248`	`}`
`@@ -1060,9 +1060,11 @@ namespace ts {`
`1060`	`1060`	`let result: string[] = [];`
`1061`	`1061`	`if (host.directoryExists && host.getDirectories) {`
`1062`	`1062`	`const typeRoots = getEffectiveTypeRoots(options, host);`
`1063`		`- for (const root of typeRoots) {`
`1064`		`- if (host.directoryExists(root)) {`
`1065`		`- result = result.concat(host.getDirectories(root));`
	`1063`	`+ if (typeRoots) {`
	`1064`	`+ for (const root of typeRoots) {`
	`1065`	`+ if (host.directoryExists(root)) {`
	`1066`	`+ result = result.concat(host.getDirectories(root));`
	`1067`	`+ }`
`1066`	`1068`	`}`
`1067`	`1069`	`}`
`1068`	`1070`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,6 @@ namespace ts.server {`
`113`	`113`	`this.moduleResolutionHost = {`
`114`	`114`	`fileExists: fileName => this.fileExists(fileName),`
`115`	`115`	`readFile: fileName => this.host.readFile(fileName),`
`116`		`- getCurrentDirectory: () => this.host.getCurrentDirectory(),`
`117`	`116`	`directoryExists: directoryName => this.host.directoryExists(directoryName)`
`118`	`117`	`};`
`119`	`118`	`}`