Refactor watched system from tsserver tests so that tscLib watch can leverage it

sheetalkamat · sheetalkamat · commit 69e5abd5b774 · 2017-08-07T11:24:06.000-07:00
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
@@ -753,6 +753,10 @@ namespace Harness {
         }
     }
 
+    export function mockHash(s: string): string {
+        return `hash-${s}`;
+    }
+
     const environment = Utils.getExecutionEnvironment();
     switch (environment) {
         case Utils.ExecutionEnvironment.Node:
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
@@ -853,8 +853,4 @@ namespace Harness.LanguageService {
         getClassifier(): ts.Classifier { throw new Error("getClassifier is not available using the server interface."); }
         getPreProcessedFileInfo(): ts.PreProcessedFileInfo { throw new Error("getPreProcessedFileInfo is not available using the server interface."); }
     }
-
-    export function mockHash(s: string): string {
-        return `hash-${s}`;
-    }
 }
diff --git a/src/harness/tsconfig.json b/src/harness/tsconfig.json
@@ -1,4 +1,4 @@
-﻿{
+{
     "extends": "../tsconfig-base",
     "compilerOptions": {
         "removeComments": false,
@@ -44,6 +44,7 @@
         "../compiler/declarationEmitter.ts",
         "../compiler/emitter.ts",
         "../compiler/program.ts",
+        "../compiler/builder.ts",
         "../compiler/commandLineParser.ts",
         "../compiler/diagnosticInformationMap.generated.ts",
         "../services/breakpoints.ts",
diff --git a/src/harness/unittests/cachingInServerLSHost.ts b/src/harness/unittests/cachingInServerLSHost.ts
@@ -47,7 +47,7 @@ namespace ts {
             clearTimeout,
             setImmediate: typeof setImmediate !== "undefined" ? setImmediate : action => setTimeout(action, 0),
             clearImmediate: typeof clearImmediate !== "undefined" ? clearImmediate : clearTimeout,
-            createHash: Harness.LanguageService.mockHash,
+            createHash: Harness.mockHash,
         };
     }
 
diff --git a/src/harness/unittests/session.ts b/src/harness/unittests/session.ts
@@ -25,7 +25,7 @@ namespace ts.server {
         clearTimeout: noop,
         setImmediate: () => 0,
         clearImmediate: noop,
-        createHash: Harness.LanguageService.mockHash,
+        createHash: Harness.mockHash,
     };
 
     const mockLogger: Logger = {
diff --git a/src/harness/unittests/telemetry.ts b/src/harness/unittests/telemetry.ts
@@ -53,7 +53,7 @@ namespace ts.projectSystem {
 
             // TODO: Apparently compilerOptions is mutated, so have to repeat it here!
             et.assertProjectInfoTelemetryEvent({
-                projectId: Harness.LanguageService.mockHash("/hunter2/foo.csproj"),
+                projectId: Harness.mockHash("/hunter2/foo.csproj"),
                 compilerOptions: { strict: true },
                 compileOnSave: true,
                 // These properties can't be present for an external project, so they are undefined instead of false.
@@ -195,7 +195,7 @@ namespace ts.projectSystem {
             const et = new EventTracker([jsconfig, file]);
             et.service.openClientFile(file.path);
             et.assertProjectInfoTelemetryEvent({
-                projectId: Harness.LanguageService.mockHash("/jsconfig.json"),
+                projectId: Harness.mockHash("/jsconfig.json"),
                 fileStats: fileStats({ js: 1 }),
                 compilerOptions: autoJsCompilerOptions,
                 typeAcquisition: {
@@ -215,7 +215,7 @@ namespace ts.projectSystem {
             et.service.openClientFile(file.path);
             et.getEvent<server.ProjectLanguageServiceStateEvent>(server.ProjectLanguageServiceStateEvent, /*mayBeMore*/ true);
             et.assertProjectInfoTelemetryEvent({
-                projectId: Harness.LanguageService.mockHash("/jsconfig.json"),
+                projectId: Harness.mockHash("/jsconfig.json"),
                 fileStats: fileStats({ js: 1 }),
                 compilerOptions: autoJsCompilerOptions,
                 configFileName: "jsconfig.json",
@@ -251,7 +251,7 @@ namespace ts.projectSystem {
 
         assertProjectInfoTelemetryEvent(partial: Partial<server.ProjectInfoTelemetryEventData>): void {
             assert.deepEqual(this.getEvent<server.ProjectInfoTelemetryEvent>(ts.server.ProjectInfoTelemetryEvent), {
-                projectId: Harness.LanguageService.mockHash("/tsconfig.json"),
+                projectId: Harness.mockHash("/tsconfig.json"),
                 fileStats: fileStats({ ts: 1 }),
                 compilerOptions: {},
                 extends: false,
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
diff --git a/src/harness/virtualFileSystemWithWatch.ts b/src/harness/virtualFileSystemWithWatch.ts

Original file line number	Diff line number	Diff line change
`@@ -753,6 +753,10 @@ namespace Harness {`
`753`	`753`	`}`
`754`	`754`	`}`
`755`	`755`
	`756`	`+ export function mockHash(s: string): string {`
	`757`	+ return `hash-${s}`;
	`758`	`+ }`
	`759`	`+`
`756`	`760`	`const environment = Utils.getExecutionEnvironment();`
`757`	`761`	`switch (environment) {`
`758`	`762`	`case Utils.ExecutionEnvironment.Node:`
Original file line number	Diff line number	Diff line change
`@@ -853,8 +853,4 @@ namespace Harness.LanguageService {`
`853`	`853`	`getClassifier(): ts.Classifier { throw new Error("getClassifier is not available using the server interface."); }`
`854`	`854`	`getPreProcessedFileInfo(): ts.PreProcessedFileInfo { throw new Error("getPreProcessedFileInfo is not available using the server interface."); }`
`855`	`855`	`}`
`856`		`-`
`857`		`- export function mockHash(s: string): string {`
`858`		- return `hash-${s}`;
`859`		`- }`
`860`	`856`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ namespace ts {`
`47`	`47`	`clearTimeout,`
`48`	`48`	`setImmediate: typeof setImmediate !== "undefined" ? setImmediate : action => setTimeout(action, 0),`
`49`	`49`	`clearImmediate: typeof clearImmediate !== "undefined" ? clearImmediate : clearTimeout,`
`50`		`- createHash: Harness.LanguageService.mockHash,`
	`50`	`+ createHash: Harness.mockHash,`
`51`	`51`	`};`
`52`	`52`	`}`
`53`	`53`