PR Feedback

rbuckton · rbuckton · commit b0317775667b · 2017-08-10T17:43:22.000-07:00
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
@@ -190,7 +190,7 @@ namespace ts.projectSystem {
         if (opts.typingsInstaller === undefined) {
             opts.typingsInstaller = new TestTypingsInstaller("/a/data/", /*throttleLimit*/ 5, host);
         }
-        
+
         if (opts.eventHandler !== undefined) {
             opts.canUseEvents = true;
         }
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -484,8 +484,16 @@ namespace ts.server {
 
             const updatedProjects: Project[] = [];
             for (const project of this.inferredProjects) {
-                if (projectRootPath ? 
-                        project.projectRootPath === projectRootPath : 
+                // Only update compiler options in the following cases:
+                // - Inferred projects without a projectRootPath, if the new options do not apply to
+                //   a workspace root
+                // - Inferred projects with a projectRootPath, if the new options do not apply to a
+                //   workspace root and there is no more specific set of options for that project's
+                //   root path
+                // - Inferred projects with a projectRootPath, if the new options apply to that
+                //   project root path.
+                if (projectRootPath ?
+                        project.projectRootPath === projectRootPath :
                         !project.projectRootPath || !this.compilerOptionsForInferredProjectsPerProjectRoot.has(project.projectRootPath)) {
                     project.setCompilerOptions(compilerOptions);
                     project.compileOnSaveEnabled = compilerOptions.compileOnSave;
@@ -1320,7 +1328,7 @@ namespace ts.server {
                 return this.createInferredProject(/*isSingleInferredProject*/ false, projectRootPath);
             }
 
-            // we don't have an explicit root path, so we should try to find an inferred project 
+            // we don't have an explicit root path, so we should try to find an inferred project
             // that more closely contains the file.
             let bestMatch: InferredProject;
             for (const project of this.inferredProjects) {
@@ -1342,11 +1350,11 @@ namespace ts.server {
                 return undefined;
             }
 
-            // If `useInferredProjectPerProjectRoot` is not enabled, then there will only be one 
-            // inferred project for all files. If `useInferredProjectPerProjectRoot` is enabled 
+            // If `useInferredProjectPerProjectRoot` is not enabled, then there will only be one
+            // inferred project for all files. If `useInferredProjectPerProjectRoot` is enabled
             // then we want to put all files that are not opened with a `projectRootPath` into
             // the same inferred project.
-            // 
+            //
             // To avoid the cost of searching through the array and to optimize for the case where
             // `useInferredProjectPerProjectRoot` is not enabled, we will always put the inferred
             // project for non-rooted files at the front of the array.

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ namespace ts.projectSystem {`
`190`	`190`	`if (opts.typingsInstaller === undefined) {`
`191`	`191`	`opts.typingsInstaller = new TestTypingsInstaller("/a/data/", /throttleLimit/ 5, host);`
`192`	`192`	`}`
`193`		`-`
	`193`	`+`
`194`	`194`	`if (opts.eventHandler !== undefined) {`
`195`	`195`	`opts.canUseEvents = true;`
`196`	`196`	`}`