An elegant weapon for a more civilized age

Author: RyanCavanaugh

src/server/editorServices.ts

@@ -365,7 +365,8 @@ namespace ts.server {
 
         private onTypeRootFileChanged(project: ConfiguredProject, fileName: string) {
             this.logger.info(`Type root file ${fileName} changed`);
-            this.throttledOperations.schedule(project.configFileName, /*delay*/ 250, () => {
+            this.throttledOperations.schedule(project.configFileName + ' * type root', /*delay*/ 250, () => {
+                project.updateTypes();
                 this.updateConfiguredProject(project);
                 this.refreshInferredProjects();
             });
@@ -391,20 +392,15 @@ namespace ts.server {
                 () => this.handleChangeInSourceFileForConfiguredProject(project));
         }
 
-        getTypeRootsVersion(project: ConfiguredProject) {
-            return server.getLatestDirectoryChangeTime(project.getEffectiveTypeRoots(), this.host);
-        }
-
         private handleChangeInSourceFileForConfiguredProject(project: ConfiguredProject) {
             const { projectOptions, configFileErrors } = this.convertConfigFileContentToProjectOptions(project.configFileName);
             this.reportConfigFileDiagnostics(project.getProjectName(), configFileErrors);
 
             const newRootFiles = projectOptions.files.map((f => this.getCanonicalFileName(f)));
             const currentRootFiles = project.getRootFiles().map((f => this.getCanonicalFileName(f)));
-            const lastUpdateTypesRoot: number = this.getTypeRootsVersion(project);
 
             // We check if the project file list has changed. If so, we update the project.
-            if (!arrayIsEqualTo(currentRootFiles.sort(), newRootFiles.sort()) || (lastUpdateTypesRoot > project.lastUpdatedTypesRootTime)) {
+            if (!arrayIsEqualTo(currentRootFiles.sort(), newRootFiles.sort())) {
                 // For configured projects, the change is made outside the tsconfig file, and
                 // it is not likely to affect the project for other files opened by the client. We can
                 // just update the current project.
@@ -415,8 +411,6 @@ namespace ts.server {
                 // Call refreshInferredProjects to clean up inferred projects we may have
                 // created for the new files
                 this.refreshInferredProjects();
-
-                project.lastUpdatedTypesRootTime = lastUpdateTypesRoot;
             }
         }
 

src/server/lsHost.ts

@@ -146,8 +146,7 @@ namespace ts.server {
         }
 
         getTypeRootsVersion() {
-            const roots = ts.getEffectiveTypeRoots(this.project.getCompilerOptions(), this);
-            return server.getLatestDirectoryChangeTime(roots, this.host);
+            return this.project.typesVersion;
         }
 
         getScriptKind(fileName: string) {

src/server/project.ts

@@ -69,6 +69,8 @@ namespace ts.server {
 
         protected projectErrors: Diagnostic[];
 
+        public typesVersion = 0;
+
         public isJsOnlyProject() {
             this.updateGraph();
             return allFilesAreJsOrDts(this);
@@ -153,6 +155,12 @@ namespace ts.server {
             return this.program.getSourceFileByPath(path);
         }
 
+        updateTypes() {
+            this.typesVersion++;
+            this.markAsDirty();
+            this.updateGraph();
+        }
+
         close() {
             if (this.program) {
                 // if we have a program - release all files that are enlisted in program
@@ -573,7 +581,6 @@ namespace ts.server {
 
         /** Used for configured projects which may have multiple open roots */
         openRefCount = 0;
-        lastUpdatedTypesRootTime = 0;
 
         constructor(readonly configFileName: NormalizedPath,
             projectService: ProjectService,

src/server/utilities.ts

@@ -90,21 +90,6 @@ namespace ts.server {
         };
     }
 
-    export function getLatestDirectoryChangeTime(paths: string[] | undefined, host: System) {
-        if (!host.getModifiedTime || !host.directoryExists || !paths) {
-            return 0;
-        }
-
-        return Math.max(...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)) {