maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'watchImprovements' into builder

Browse source
This commit is contained in:
Sheetal Nandi 2017-08-21 11:44:09 -07:00
parent 60e2e68dfb 84b2e23033
commit 3908325f46
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/server/editorServices.ts
View file

@ -1722,7 +1722,7 @@ namespace ts.server {
*/ */
reloadProjects() { reloadProjects() {
this.logger.info("reload projects."); this.logger.info("reload projects.");
this.reloadConfiguredsProjectForFiles(this.openFiles, /*delayReload*/ false); this.reloadConfiguredProjectForFiles(this.openFiles, /*delayReload*/ false);
this.refreshInferredProjects(); this.refreshInferredProjects();
} }
@ -1738,7 +1738,7 @@ namespace ts.server {
} }
} }
); );
this.reloadConfiguredsProjectForFiles(openFiles, /*delayReload*/ true); this.reloadConfiguredProjectForFiles(openFiles, /*delayReload*/ true);
this.delayInferredProjectsRefresh(); this.delayInferredProjectsRefresh();
} }
@ -1748,7 +1748,7 @@ namespace ts.server {
* or schedules it for reload depending on delayReload option * or schedules it for reload depending on delayReload option
* If the there is no existing project it just opens the configured project for the config file * If the there is no existing project it just opens the configured project for the config file
*/ */
private reloadConfiguredsProjectForFiles(openFiles: ScriptInfo[], delayReload: boolean) { private reloadConfiguredProjectForFiles(openFiles: ReadonlyArray<ScriptInfo>, delayReload: boolean) {
const updatedProjects = createMap<true>(); const updatedProjects = createMap<true>();
// try to reload config file for all open files // try to reload config file for all open files
for (const info of openFiles) { for (const info of openFiles) {
@ -1782,11 +1782,19 @@ namespace ts.server {
*/ */
private removeRootOfInferredProjectIfNowPartOfOtherProject(info: ScriptInfo) { private removeRootOfInferredProjectIfNowPartOfOtherProject(info: ScriptInfo) {
// If the script info is root of inferred project, it could only be first containing project // If the script info is root of inferred project, it could only be first containing project
// since info is added to inferred project and made root only when there are no other projects containing it // since info is added as root to the inferred project only when there are no other projects containing it
// So even if it is root of the inferred project and after project structure updates its now part // So when it is root of the inferred project and after project structure updates its now part
// of multiple project it needs to be removed from that inferred project because: // of multiple project it needs to be removed from that inferred project because:
// - references in inferred project supercede the root part // - references in inferred project supercede the root part
// - root / reference in non - inferred project beats root in inferred project // - root / reference in non - inferred project beats root in inferred project
// eg. say this is structure /a/b/a.ts /a/b/c.ts where c.ts references a.ts
// When a.ts is opened, since there is no configured project/external project a.ts can be part of
// a.ts is added as root to inferred project.
// Now at time of opening c.ts, c.ts is also not aprt of any existing project,
// so it will be added to inferred project as a root. (for sake of this example assume single inferred project is false)
// So at this poing a.ts is part of first inferred project and second inferred project (of which c.ts is root)
// And hence it needs to be removed from the first inferred project.
if (info.containingProjects.length > 1 && if (info.containingProjects.length > 1 &&
info.containingProjects[0].projectKind === ProjectKind.Inferred && info.containingProjects[0].projectKind === ProjectKind.Inferred &&
info.containingProjects[0].isRoot(info)) { info.containingProjects[0].isRoot(info)) {

2
src/server/project.ts
View file

@ -931,7 +931,7 @@ namespace ts.server {
this.projectService.stopWatchingConfigFilesForInferredProjectRoot(info, WatcherCloseReason.NotNeeded); this.projectService.stopWatchingConfigFilesForInferredProjectRoot(info, WatcherCloseReason.NotNeeded);
super.removeRoot(info); super.removeRoot(info);
if (this._isJsInferredProject && info.isJavaScript()) { if (this._isJsInferredProject && info.isJavaScript()) {
if (!some(this.getRootScriptInfos(), info => info.isJavaScript())) { if (every(this.getRootScriptInfos(), rootInfo => !rootInfo.isJavaScript())) {
this.toggleJsInferredProject(/*isJsInferredProject*/ false); this.toggleJsInferredProject(/*isJsInferredProject*/ false);
} }
} }