Merge branch 'master' into watchImprovements

This commit is contained in:
Sheetal Nandi
2017-10-02 12:25:22 -07:00
22 changed files with 125 additions and 153 deletions

View File

@@ -976,9 +976,10 @@ namespace ts.server {
// unknown version - return everything
const projectFileNames = this.getFileNames();
const externalFiles = this.getExternalFiles().map(f => toNormalizedPath(f));
this.lastReportedFileNames = arrayToSet(projectFileNames.concat(externalFiles));
const allFiles = projectFileNames.concat(externalFiles);
this.lastReportedFileNames = arrayToSet(allFiles);
this.lastReportedVersion = this.projectStructureVersion;
return { info, files: projectFileNames, projectErrors: this.getGlobalProjectErrors() };
return { info, files: allFiles, projectErrors: this.getGlobalProjectErrors() };
}
}