address cr feedback

zhengbli · zhengbli · commit 09fc3b3a181e · 2016-12-29T10:26:34.000-08:00
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
@@ -3067,12 +3067,15 @@ namespace ts.projectSystem {
             const projectService = createProjectService(host);
             projectService.openClientFile(file1.path);
 
-            const project = projectService.inferredProjects[0];
-            const sourceFileForFile1 = project.getSourceFile(<Path>file1.path);
-            const sourceFileForModuleFile = project.getSourceFile(<Path>moduleFile.path);
-
-            assert.isNotNull(sourceFileForFile1);
-            assert.isNotNull(sourceFileForModuleFile);
+            let project = projectService.inferredProjects[0];
+            let options = project.getCompilerOptions();
+            assert.isTrue(options.maxNodeModuleJsDepth === 2);
+
+            // Assert the option sticks 
+            projectService.setCompilerOptionsForInferredProjects({ target: ScriptTarget.ES2016 });
+            project = projectService.inferredProjects[0];
+            options = project.getCompilerOptions();
+            assert.isTrue(options.maxNodeModuleJsDepth === 2);
         });
     });
 
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -1073,7 +1073,7 @@ namespace ts.server {
                 : new InferredProject(this, this.documentRegistry, this.compilerOptionsForInferredProjects);
 
             if (root.scriptKind === ScriptKind.JS || root.scriptKind === ScriptKind.JSX) {
-                project.isJsInferredProject = true;
+                project.setAsJsInferredProject();
             }
 
             project.addRoot(root);
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -713,14 +713,14 @@ namespace ts.server {
         })();
 
         private _isJsInferredProject = false;
-        set isJsInferredProject(newValue: boolean) {
-            if (newValue && !this._isJsInferredProject) {
-                this.setCompilerOptions(this.getCompilerOptions());
-            }
-            this._isJsInferredProject = newValue;
+
+        setAsJsInferredProject() {
+            this._isJsInferredProject = true;
+            this.setCompilerOptions();
         }
 
-        setCompilerOptions(newOptions: CompilerOptions) {
+        setCompilerOptions(newOptions?: CompilerOptions) {
+            newOptions = newOptions ? newOptions : this.getCompilerOptions();
             if (!newOptions) {
                 return;
             }

Original file line number	Diff line number	Diff line change
`@@ -1073,7 +1073,7 @@ namespace ts.server {`
`1073`	`1073`	`: new InferredProject(this, this.documentRegistry, this.compilerOptionsForInferredProjects);`
`1074`	`1074`
`1075`	`1075`	`if (root.scriptKind === ScriptKind.JS \|\| root.scriptKind === ScriptKind.JSX) {`
`1076`		`- project.isJsInferredProject = true;`
	`1076`	`+ project.setAsJsInferredProject();`
`1077`	`1077`	`}`
`1078`	`1078`
`1079`	`1079`	`project.addRoot(root);`