use createHash from ServerHost instead of explicit require (microsoft#12043)

vladima · web-flow · commit 9a9f45f0fbaf · 2016-11-08T15:32:53.000-08:00
* use createHash from ServerHost instead of explicit require

* added missing method in ServerHost stub
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
@@ -720,6 +720,10 @@ namespace Harness.LanguageService {
         clearImmediate(timeoutId: any): void {
             clearImmediate(timeoutId);
         }
+
+        createHash(s: string) {
+            return s;
+        }
     }
 
     export class ServerLanguageServiceAdapter implements LanguageServiceAdapter {
diff --git a/src/harness/unittests/cachingInServerLSHost.ts b/src/harness/unittests/cachingInServerLSHost.ts
@@ -43,7 +43,8 @@ namespace ts {
             setTimeout,
             clearTimeout,
             setImmediate: typeof setImmediate !== "undefined" ? setImmediate : action => setTimeout(action, 0),
-            clearImmediate: typeof clearImmediate !== "undefined" ? clearImmediate : clearTimeout
+            clearImmediate: typeof clearImmediate !== "undefined" ? clearImmediate : clearTimeout,
+            createHash: s => s
         };
     }
 
diff --git a/src/harness/unittests/session.ts b/src/harness/unittests/session.ts
@@ -24,7 +24,8 @@ namespace ts.server {
         setTimeout() { return 0; },
         clearTimeout: noop,
         setImmediate: () => 0,
-        clearImmediate: noop
+        clearImmediate: noop,
+        createHash: s => s
     };
     const nullCancellationToken: HostCancellationToken = { isCancellationRequested: () => false };
     const mockLogger: Logger = {
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
@@ -434,6 +434,10 @@ namespace ts.projectSystem {
             };
         }
 
+        createHash(s: string): string {
+            return s;
+        }
+
         triggerDirectoryWatcherCallback(directoryName: string, fileName: string): void {
             const path = this.toPath(directoryName);
             const callbacks = this.watchedDirectories[path];
diff --git a/src/server/builder.ts b/src/server/builder.ts
@@ -5,15 +5,6 @@
 
 namespace ts.server {
 
-    interface Hash {
-        update(data: any, input_encoding?: string): Hash;
-        digest(encoding: string): any;
-    }
-
-    const crypto: {
-        createHash(algorithm: string): Hash
-    } = require("crypto");
-
     export function shouldEmitFile(scriptInfo: ScriptInfo) {
         return !scriptInfo.hasMixedContent;
     }
@@ -49,9 +40,7 @@ namespace ts.server {
         }
 
         private computeHash(text: string): string {
-            return crypto.createHash("md5")
-                .update(text)
-                .digest("base64");
+            return this.project.projectService.host.createHash(text);
         }
 
         private getSourceFile(): SourceFile {
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -250,6 +250,8 @@ namespace ts.server {
             readonly typingsInstaller: ITypingsInstaller = nullTypingsInstaller,
             private readonly eventHandler?: ProjectServiceEventHandler) {
 
+            Debug.assert(!!host.createHash, "'ServerHost.createHash' is required for ProjectService");
+
             this.toCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames);
             this.directoryWatchers = new DirectoryWatchers(this);
             this.throttledOperations = new ThrottledOperations(host);

Original file line number	Diff line number	Diff line change
`@@ -720,6 +720,10 @@ namespace Harness.LanguageService {`
`720`	`720`	`clearImmediate(timeoutId: any): void {`
`721`	`721`	`clearImmediate(timeoutId);`
`722`	`722`	`}`
	`723`	`+`
	`724`	`+ createHash(s: string) {`
	`725`	`+ return s;`
	`726`	`+ }`
`723`	`727`	`}`
`724`	`728`
`725`	`729`	`export class ServerLanguageServiceAdapter implements LanguageServiceAdapter {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@ namespace ts {`
`43`	`43`	`setTimeout,`
`44`	`44`	`clearTimeout,`
`45`	`45`	`setImmediate: typeof setImmediate !== "undefined" ? setImmediate : action => setTimeout(action, 0),`
`46`		`- clearImmediate: typeof clearImmediate !== "undefined" ? clearImmediate : clearTimeout`
	`46`	`+ clearImmediate: typeof clearImmediate !== "undefined" ? clearImmediate : clearTimeout,`
	`47`	`+ createHash: s => s`
`47`	`48`	`};`
`48`	`49`	`}`
`49`	`50`