Refactor

RyanCavanaugh · RyanCavanaugh · commit c0806439ea09 · 2016-09-19T18:20:50.000-07:00
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
@@ -1932,5 +1932,5 @@ namespace Harness {
         return { unitName: libFile, content: io.readFile(libFile) };
     }
 
-    if (Error) (<any>Error).stackTraceLimit = 25;
+    if (Error) (<any>Error).stackTraceLimit = 1;
 }
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
@@ -370,7 +370,7 @@ namespace Harness.LanguageService {
     function unwrapJSONCallResult(result: string): any {
         const parsedResult = JSON.parse(result);
         if (parsedResult.error) {
-            throw new Error("Language Service Shim Error: " + JSON.stringify(parsedResult));
+            throw new Error("Language Service Shim Error: " + JSON.stringify(parsedResult.error));
         }
         else if (parsedResult.canceled) {
             throw new ts.OperationCanceledException();
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -389,17 +389,7 @@ namespace ts.server {
         }
 
         getTypeRootsVersion(project: ConfiguredProject) {
-            const roots = project.getEffectiveTypeRoots();
-            if (roots === undefined) {
-                return 0;
-            }
-
-            return Math.max.apply(Math, project.getEffectiveTypeRoots().map(root => {
-               if (this.host.directoryExists(root)) {
-                   return +this.host.getModifiedTime(root);
-               }
-               return 0;
-            }));
+            return getLatestDirectoryChangeTime(project.getEffectiveTypeRoots(), this.host);
         }
 
         private handleChangeInSourceFileForConfiguredProject(project: ConfiguredProject) {
diff --git a/src/server/lsHost.ts b/src/server/lsHost.ts
@@ -147,13 +147,7 @@ namespace ts.server {
 
         getTypeRootsVersion() {
             const roots = ts.getEffectiveTypeRoots(this.project.getCompilerOptions(), this);
-            if (roots && roots.length > 0) {
-                return Math.max.apply(Math, roots.map(root => {
-                    return +this.host.getModifiedTime(root);
-                }));
-            } else {
-                return 0;
-            }
+            return getLatestChangeTime(roots, this.host);
         }
 
         getScriptKind(fileName: string) {
diff --git a/src/server/utilities.ts b/src/server/utilities.ts
@@ -90,6 +90,21 @@ namespace ts.server {
         };
     }
 
+    export function getLatestDirectoryChangeTime(paths: string[] | undefined, host: System) {
+        if (!host.getModifiedTime || !host.directoryExists || !paths) {
+            return 0;
+        }
+        
+        return Math.max.apply(Math, paths.map(path => {
+            if (host.directoryExists(path)) {
+                return host.getModifiedTime(path);
+            }
+            else {
+                return 0;
+            }
+        }));
+    }
+
     export function mergeMaps(target: MapLike<any>, source: MapLike <any>): void {
         for (const key in source) {
             if (hasProperty(source, key)) {
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -1188,7 +1188,7 @@ namespace ts {
         /*
          * LS host can optionally implement these methods to support automatic updating when new type libraries are installed
          */
-        getTypeRootsVersion(): number;
+        getTypeRootsVersion?(): number;
 
         /*
          * LS host can optionally implement this method if it wants to be completely in charge of module name resolution.

Original file line number	Diff line number	Diff line change
`@@ -1932,5 +1932,5 @@ namespace Harness {`
`1932`	`1932`	`return { unitName: libFile, content: io.readFile(libFile) };`
`1933`	`1933`	`}`
`1934`	`1934`
`1935`		`- if (Error) (<any>Error).stackTraceLimit = 25;`
	`1935`	`+ if (Error) (<any>Error).stackTraceLimit = 1;`
`1936`	`1936`	`}`
Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ namespace Harness.LanguageService {`
`370`	`370`	`function unwrapJSONCallResult(result: string): any {`
`371`	`371`	`const parsedResult = JSON.parse(result);`
`372`	`372`	`if (parsedResult.error) {`
`373`		`- throw new Error("Language Service Shim Error: " + JSON.stringify(parsedResult));`
	`373`	`+ throw new Error("Language Service Shim Error: " + JSON.stringify(parsedResult.error));`
`374`	`374`	`}`
`375`	`375`	`else if (parsedResult.canceled) {`
`376`	`376`	`throw new ts.OperationCanceledException();`