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

address cr feedback

Browse Source
This commit is contained in:
zhengbli 2016-12-29 10:26:34 -08:00
parent bf5faa04a6
commit 09fc3b3a18
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/harness/unittests/tsserverProjectSystem.ts
View File

@ -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);
let project = projectService.inferredProjects[0];
let options = project.getCompilerOptions();
assert.isTrue(options.maxNodeModuleJsDepth === 2);
assert.isNotNull(sourceFileForFile1);
assert.isNotNull(sourceFileForModuleFile);
// Assert the option sticks
projectService.setCompilerOptionsForInferredProjects({ target: ScriptTarget.ES2016 });
project = projectService.inferredProjects[0];
options = project.getCompilerOptions();
assert.isTrue(options.maxNodeModuleJsDepth === 2);
});
});

2
src/server/editorServices.ts
View File

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

12
src/server/project.ts
View File

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