microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-15 11:35:42 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

types 2.0 WIP

Browse Source
This commit is contained in:
Jason Ramsay 2016-08-23 09:50:44 -07:00
parent 970ec1afb0
commit 5e37a310d7
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/editorServices.ts
View File

@ -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":

1
src/server/types.d.ts vendored
View File

@ -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";
}

11
src/server/typingsCache.ts
View File

@ -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
};
}

1
src/server/typingsInstaller/typingsInstaller.ts
View File

@ -287,6 +287,7 @@ namespace ts.server.typingsInstaller {
typingOptions: request.typingOptions,
compilerOptions: request.compilerOptions,
typings,
files: request.fileNames,
kind: "set"
};
}