Move create/update override to a separate hook.

Author: sandersn

src/harness/harnessLanguageService.ts

@@ -789,52 +789,43 @@ namespace Harness.LanguageService {
                     return {
                         module: () => ({
                             create(info: ts.server.PluginCreateInfo) {
-                                return info;
-                            },
-                            changeSourceFiles() {
                                 const clssf = ts.createLanguageServiceSourceFile;
                                 const ulssf = ts.updateLanguageServiceSourceFile;
-                                return {
-                                    createLanguageServiceSourceFile(fileName: string, scriptSnapshot: ts.IScriptSnapshot, scriptTarget: ts.ScriptTarget, version: string, setNodeParents: boolean, scriptKind?: ts.ScriptKind): ts.SourceFile {
+                                ts.overrideCreateupdateLanguageServiceSourceFile(
+                                    
+                                    (fileName: string, scriptSnapshot: ts.IScriptSnapshot, scriptTarget: ts.ScriptTarget, version: string, setNodeParents: boolean, scriptKind?: ts.ScriptKind): ts.SourceFile => {
                                         if (interested(fileName)) {
                                             const wrapped = scriptSnapshot;
                                             scriptSnapshot = {
                                                 getChangeRange: old => wrapped.getChangeRange(old),
                                                 getLength: () => wrapped.getLength(),
-                                                getText: (start, end) => parse(fileName, wrapped.getText(0, wrapped.getLength())).slice(start, end),
+                                                getText: (start, end) => parse(wrapped.getText(0, wrapped.getLength())).slice(start, end),
                                             };
                                         }
                                         var sourceFile = clssf(fileName, scriptSnapshot, scriptTarget, version, setNodeParents, scriptKind);
-                                        if (interested(fileName)) {
-                                            modifyVueSource(sourceFile);
-                                        }
                                         return sourceFile;
                                     },
-                                    updateLanguageServiceSourceFile(sourceFile: ts.SourceFile, scriptSnapshot: ts.IScriptSnapshot, version: string, textChangeRange: ts.TextChangeRange, aggressiveChecks?: boolean): ts.SourceFile {
+                                    (sourceFile: ts.SourceFile, scriptSnapshot: ts.IScriptSnapshot, version: string, textChangeRange: ts.TextChangeRange, aggressiveChecks?: boolean): ts.SourceFile => {
                                         if (interested(sourceFile.fileName)) {
                                             const wrapped = scriptSnapshot;
                                             scriptSnapshot = {
                                                 getChangeRange: old => wrapped.getChangeRange(old),
                                                 getLength: () => wrapped.getLength(),
-                                                getText: (start, end) => parse(sourceFile.fileName, wrapped.getText(0, wrapped.getLength())).slice(start, end),
+                                                getText: (start, end) => parse(wrapped.getText(0, wrapped.getLength())).slice(start, end),
                                             };
                                         }
                                         var sourceFile = ulssf(sourceFile, scriptSnapshot, version, textChangeRange, aggressiveChecks);
-                                        if (interested(sourceFile.fileName)) {
-                                            modifyVueSource(sourceFile);
-                                        }
                                         return sourceFile;
-                                    }
-                                }
+                                    });
+                                return makeDefaultProxy(info);
 
                                 function interested(filename: string) {
                                     return filename.length;
                                 }
-                                function modifyVueSource(sourcefile: ts.SourceFile) {
-                                    return sourcefile;
-                                }
-                                function parse(filename: string, text: string) {
-                                    return interested(filename) ? text : text;
+                                function parse(text: string) {
+                                    const start = text.indexOf("<script>") + "<script>".length;
+                                    const end = text.indexOf("</script>");
+                                    return text.slice(0, start).replace(/./g, ' ') + text.slice(start, end) + text.slice(end).replace(/./g, ' ');
                                 }
                             },
                             resolveModules() {
@@ -846,7 +837,7 @@ namespace Harness.LanguageService {
                                                     extension: ts.Extension.Ts,
                                                     isExternalLibraryImport: true,
                                                     // TODO: Fake this
-                                                    resolvedFileName: path.join(path.dirname(containingFile), path.basename(moduleName)),
+                                                    resolvedFileName: containingFile.slice(0, containingFile.lastIndexOf("/")) + "/" + moduleName,
                                                 }
                                             }
                                         }
@@ -855,7 +846,7 @@ namespace Harness.LanguageService {
                                         }
                                     };
                                 function importInterested(filename: string) {
-                                    return filename.length;
+                                    return filename.charAt(0) === "." && filename.slice(-4) === ".vue";
                                 }
                             }
                         }),

src/server/project.ts

@@ -103,14 +103,8 @@ namespace ts.server {
         create(createInfo: PluginCreateInfo): LanguageService;
         getExternalFiles?(proj: Project): string[];
         resolveModules?(createInfo: PluginCreateInfo): PluginResolveModules;
-        changeSourceFiles?(createInfo: PluginCreateInfo): PluginSourceFileChange;
     }
 
-    export type PluginSourceFileChange = {
-        createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean, scriptKind?: ScriptKind, cheat?: string): SourceFile,
-        updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean, cheat?: string): SourceFile,
-    };
-
     export type ModuleResolver = (moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache) => ResolvedModuleWithFailedLookupLocations;
 
     export type PluginResolveModules = {
@@ -917,11 +911,6 @@ namespace ts.server {
 
                 const pluginModule = pluginModuleFactory({ typescript: ts });
                 this.languageService = pluginModule.create(info);
-                if (pluginModule.changeSourceFiles) {
-                    const chg = pluginModule.changeSourceFiles(info);
-                    ts.createLanguageServiceSourceFile = chg.createLanguageServiceSourceFile;
-                    ts.updateLanguageServiceSourceFile = chg.updateLanguageServiceSourceFile;
-                }
                 if (pluginModule.resolveModules) {
                     this.lsHost.overrideResolveModuleName(pluginModule.resolveModules(info));
                 }

src/services/services.ts

@@ -891,6 +891,13 @@ namespace ts {
         sourceFile.scriptSnapshot = scriptSnapshot;
     }
 
+    export function overrideCreateupdateLanguageServiceSourceFile(
+        create: (fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean, scriptKind?: ScriptKind, cheat?: string) => SourceFile,
+        update: (sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean, cheat?: string) => SourceFile) {
+        ts.createLanguageServiceSourceFile = create;
+        ts.updateLanguageServiceSourceFile = update;
+    }
+
     export function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean, scriptKind?: ScriptKind): SourceFile {
         const text = scriptSnapshot.getText(0, scriptSnapshot.getLength());
         const sourceFile = createSourceFile(fileName, text, scriptTarget, setNodeParents, scriptKind);