Move codefix types into services/types.ts (#35506)

* Move codefix types into services/types.ts

* Also split apart refactorProvider

* Move all meanings of DocumentHighlights into one file

* Use setter for object allocator

* Remove unneeded namespace reference

* Remove some shorthand references to nonlocal namespace variables

* Convert WatchType string enum to a structure that can be merged across modules

* Rename harness to harnessIO

* Move accidental globals into namespace

* Remove unused globals

* Suppress lints - these qualifiers are needed for the migration to go smoothly

* Hide global declaration

Author: weswigham

src/compiler/utilities.ts

@@ -4958,6 +4958,10 @@ namespace ts {
         getSourceMapSourceConstructor: () => <any>SourceMapSource,
     };
 
+    export function setObjectAllocator(alloc: ObjectAllocator) {
+        objectAllocator = alloc;
+    }
+
     export function formatStringFromArgs(text: string, args: ArrayLike<string | number>, baseIndex = 0): string {
         return text.replace(/{(\d+)}/g, (_match, index: string) => "" + Debug.assertDefined(args[+index + baseIndex]));
     }

src/compiler/watch.ts

@@ -243,13 +243,23 @@ namespace ts {
         };
     }
 
-    export const enum WatchType {
-        ConfigFile = "Config file",
-        SourceFile = "Source file",
-        MissingFile = "Missing file",
-        WildcardDirectory = "Wild card directory",
-        FailedLookupLocations = "Failed Lookup Locations",
-        TypeRoots = "Type roots"
+    export type WatchType = WatchTypeRegistry[keyof WatchTypeRegistry];
+    export const WatchType: WatchTypeRegistry = {
+        ConfigFile: "Config file",
+        SourceFile: "Source file",
+        MissingFile: "Missing file",
+        WildcardDirectory: "Wild card directory",
+        FailedLookupLocations: "Failed Lookup Locations",
+        TypeRoots: "Type roots"
+    };
+
+    export interface WatchTypeRegistry {
+        ConfigFile: "Config file",
+        SourceFile: "Source file",
+        MissingFile: "Missing file",
+        WildcardDirectory: "Wild card directory",
+        FailedLookupLocations: "Failed Lookup Locations",
+        TypeRoots: "Type roots"
     }
 
     interface WatchFactory<X, Y = undefined> extends ts.WatchFactory<X, Y> {

src/harness/harnessGlobals.ts

@@ -27,22 +27,4 @@ var assert: typeof _chai.assert = _chai.assert;
         }
     };
 }
-
-var global: NodeJS.Global = Function("return this").call(undefined); // eslint-disable-line no-new-func
-
-declare var window: {};
-declare var XMLHttpRequest: new() => XMLHttpRequest;
-
-interface XMLHttpRequest {
-    readonly readyState: number;
-    readonly responseText: string;
-    readonly status: number;
-    readonly statusText: string;
-    open(method: string, url: string, async?: boolean, user?: string, password?: string): void;
-    send(data?: string): void;
-    setRequestHeader(header: string, value: string): void;
-    getAllResponseHeaders(): string;
-    getResponseHeader(header: string): string | null;
-    overrideMimeType(mime: string): void;
-}
 /* eslint-enable no-var */

src/harness/harness.ts renamed to src/harness/harnessIO.ts

@@ -33,7 +33,7 @@
         "sourceMapRecorder.ts",
         "harnessGlobals.ts",
         "harnessUtils.ts",
-        "harness.ts",
+        "harnessIO.ts",
         "harnessLanguageService.ts",
         "virtualFileSystemWithWatch.ts",
         "fourslash.ts",

src/harness/tsconfig.json

@@ -1625,7 +1625,7 @@ namespace ts.server {
                 totalNonTsFileSize += this.host.getFileSize(fileName);
 
                 if (totalNonTsFileSize > maxProgramSizeForNonTsFiles || totalNonTsFileSize > availableSpace) {
-                    this.logger.info(getExceedLimitMessage({ propertyReader, hasTSFileExtension, host: this.host }, totalNonTsFileSize));
+                    this.logger.info(getExceedLimitMessage({ propertyReader, hasTSFileExtension: ts.hasTSFileExtension, host: this.host }, totalNonTsFileSize)); // eslint-disable-line @typescript-eslint/no-unnecessary-qualifier
                     // Keep the size as zero since it's disabled
                     return fileName;
                 }
@@ -1694,7 +1694,7 @@ namespace ts.server {
                 configFileName: configFileName(),
                 projectType: project instanceof ExternalProject ? "external" : "configured",
                 languageServiceEnabled: project.languageServiceEnabled,
-                version,
+                version: ts.version, // eslint-disable-line @typescript-eslint/no-unnecessary-qualifier
             };
             this.eventHandler({ eventName: ProjectInfoTelemetryEvent, data });
 

src/harness/typeWriter.ts

@@ -1575,7 +1575,7 @@ namespace ts.server.protocol {
         /**
          * List of last known projects
          */
-        knownProjects: protocol.ProjectVersionInfo[];
+        knownProjects: ProjectVersionInfo[];
     }
 
     /**

src/server/editorServices.ts

@@ -2147,7 +2147,7 @@ namespace ts.server {
 
         private handlers = createMapFromTemplate<(request: protocol.Request) => HandlerResponse>({
             [CommandNames.Status]: () => {
-                const response: protocol.StatusResponseBody = { version };
+                const response: protocol.StatusResponseBody = { version: ts.version }; // eslint-disable-line @typescript-eslint/no-unnecessary-qualifier
                 return this.requiredResponse(response);
             },
             [CommandNames.OpenExternalProject]: (request: protocol.OpenExternalProjectRequest) => {

src/server/protocol.ts

@@ -1,13 +1,20 @@
 /* @internal */
 namespace ts {
     // Additional tsserver specific watch information
-    export const enum WatchType {
-        ClosedScriptInfo = "Closed Script info",
-        ConfigFileForInferredRoot = "Config file for the inferred project root",
-        NodeModulesForClosedScriptInfo = "node_modules for closed script infos in them",
-        MissingSourceMapFile = "Missing source map file",
-        NoopConfigFileForInferredRoot = "Noop Config file for the inferred project root",
-        MissingGeneratedFile = "Missing generated file",
-        PackageJsonFile = "package.json file for import suggestions"
+    export interface WatchTypeRegistry {
+        ClosedScriptInfo: "Closed Script info",
+        ConfigFileForInferredRoot: "Config file for the inferred project root",
+        NodeModulesForClosedScriptInfo: "node_modules for closed script infos in them",
+        MissingSourceMapFile: "Missing source map file",
+        NoopConfigFileForInferredRoot: "Noop Config file for the inferred project root",
+        MissingGeneratedFile: "Missing generated file",
+        PackageJsonFile: "package.json file for import suggestions"
     }
+    WatchType.ClosedScriptInfo = "Closed Script info";
+    WatchType.ConfigFileForInferredRoot = "Config file for the inferred project root";
+    WatchType.NodeModulesForClosedScriptInfo = "node_modules for closed script infos in them";
+    WatchType.MissingSourceMapFile = "Missing source map file";
+    WatchType.NoopConfigFileForInferredRoot = "Noop Config file for the inferred project root";
+    WatchType.MissingGeneratedFile = "Missing generated file";
+    WatchType.PackageJsonFile = "package.json file for import suggestions";
 }