types 2.0 WIP

jramsay · jramsay · commit 5e37a310d709 · 2016-08-23T09:50:44.000-07:00
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -213,7 +213,7 @@ namespace ts.server {
             }
             switch (response.kind) {
                 case "set":
-                    this.typingsCache.updateTypingsForProject(response.projectName, response.compilerOptions, response.typingOptions, response.typings);
+                    this.typingsCache.updateTypingsForProject(response.projectName, response.compilerOptions, response.typingOptions, response.typings, response.files);
                     project.updateGraph();
                     break;
                 case "invalidate":
diff --git a/src/server/types.d.ts b/src/server/types.d.ts
@@ -45,6 +45,7 @@ declare namespace ts.server {
         readonly typingOptions: ts.TypingOptions;
         readonly compilerOptions: ts.CompilerOptions;
         readonly typings: string[];
+        readonly files: string[];
         readonly kind: "set";
     }
 
diff --git a/src/server/typingsCache.ts b/src/server/typingsCache.ts
@@ -17,6 +17,7 @@ namespace ts.server {
         readonly typingOptions: TypingOptions;
         readonly compilerOptions: CompilerOptions;
         readonly typings: TypingsArray;
+        readonly files: string[];
         poisoned: boolean;
     }
 
@@ -73,6 +74,10 @@ namespace ts.server {
         return opt1.allowJs != opt2.allowJs;
     }
 
+    function filesChanged(before: string[], after: string[]): boolean {
+        return !setIsEqualTo(before, after);
+    }
+
     export interface TypingsArray extends ReadonlyArray<string> {
         " __typingsArrayBrand": any;
     }
@@ -97,7 +102,7 @@ namespace ts.server {
 
             const entry = this.perProjectCache[project.getProjectName()];
             const result: TypingsArray = entry ? entry.typings : <any>emptyArray;
-            if (!entry || typingOptionsChanged(typingOptions, entry.typingOptions) || compilerOptionsChanged(project.getCompilerOptions(), entry.compilerOptions)) {
+            if (!entry || typingOptionsChanged(typingOptions, entry.typingOptions) || compilerOptionsChanged(project.getCompilerOptions(), entry.compilerOptions) || filesChanged(project.getFileNames(), entry.files)) {
                 // something has been changed, issue a request to update typings
                 this.installer.enqueueInstallTypingsRequest(project, typingOptions);
                 // Note: entry is now poisoned since it does not really contain typings for a given combination of compiler options\typings options.
@@ -106,6 +111,7 @@ namespace ts.server {
                     compilerOptions: project.getCompilerOptions(),
                     typingOptions,
                     typings: result,
+                    files: project.getFileNames(),
                     poisoned: true
                 };
             }
@@ -120,11 +126,12 @@ namespace ts.server {
             this.installer.enqueueInstallTypingsRequest(project, typingOptions);
         }
 
-        updateTypingsForProject(projectName: string, compilerOptions: CompilerOptions, typingOptions: TypingOptions, newTypings: string[]) {
+        updateTypingsForProject(projectName: string, compilerOptions: CompilerOptions, typingOptions: TypingOptions, newTypings: string[], files: string[]) {
             this.perProjectCache[projectName] = {
                 compilerOptions,
                 typingOptions,
                 typings: toTypingsArray(newTypings),
+                files: files,
                 poisoned: false
             };
         }
diff --git a/src/server/typingsInstaller/typingsInstaller.ts b/src/server/typingsInstaller/typingsInstaller.ts
@@ -287,6 +287,7 @@ namespace ts.server.typingsInstaller {
                 typingOptions: request.typingOptions,
                 compilerOptions: request.compilerOptions,
                 typings,
+                files: request.fileNames,
                 kind: "set"
             };
         }

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ namespace ts.server {`
`213`	`213`	`}`
`214`	`214`	`switch (response.kind) {`
`215`	`215`	`case "set":`
`216`		`- this.typingsCache.updateTypingsForProject(response.projectName, response.compilerOptions, response.typingOptions, response.typings);`
	`216`	`+ this.typingsCache.updateTypingsForProject(response.projectName, response.compilerOptions, response.typingOptions, response.typings, response.files);`
`217`	`217`	`project.updateGraph();`
`218`	`218`	`break;`
`219`	`219`	`case "invalidate":`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ declare namespace ts.server {`
`45`	`45`	`readonly typingOptions: ts.TypingOptions;`
`46`	`46`	`readonly compilerOptions: ts.CompilerOptions;`
`47`	`47`	`readonly typings: string[];`
	`48`	`+ readonly files: string[];`
`48`	`49`	`readonly kind: "set";`
`49`	`50`	`}`
`50`	`51`
Original file line number	Diff line number	Diff line change
`@@ -287,6 +287,7 @@ namespace ts.server.typingsInstaller {`
`287`	`287`	`typingOptions: request.typingOptions,`
`288`	`288`	`compilerOptions: request.compilerOptions,`
`289`	`289`	`typings,`
	`290`	`+ files: request.fileNames,`
`290`	`291`	`kind: "set"`
`291`	`292`	`};`
`292`	`293`	`}`