microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-10 21:07:52 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #9073 from zhengbli/i8523

Browse Source 
Increase project reference count even when the opened file is referenced by it but not its root
This commit is contained in:
Zhengbo Li
2016-06-15 12:42:14 -07:00
committed by GitHub
parent 9a2cf115c0 1e7790df06
commit 8c38cbfb4b
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/editorServices.ts
View File

@@ -807,6 +807,7 @@ namespace ts.server {
else {
this.findReferencingProjects(info);
if (info.defaultProject) {
info.defaultProject.addOpenRef();
this.openFilesReferenced.push(info);
}
else {

27
tests/cases/unittests/tsserverProjectSystem.ts
View File

@@ -567,5 +567,32 @@ namespace ts {
checkConfiguredProjectActualFiles(project, [file1.path, classicModuleFile.path]);
checkNumberOfInferredProjects(projectService, 1);
});
it("should keep the configured project when the opened file is referenced by the project but not its root", () => {
const file1: FileOrFolder = {
path: "/a/b/main.ts",
content: "import { objA } from './obj-a';"
};
const file2: FileOrFolder = {
path: "/a/b/obj-a.ts",
content: `export const objA = Object.assign({foo: "bar"}, {bar: "baz"});`
};
const configFile: FileOrFolder = {
path: "/a/b/tsconfig.json",
content: `{
"compilerOptions": {
"target": "es6"
},
"files": [ "main.ts" ]
}`
};
const host = new TestServerHost(/*useCaseSensitiveFileNames*/ false, getExecutingFilePathFromLibFile(libFile), "/", [file1, file2, configFile]);
const projectService = new server.ProjectService(host, nullLogger);
projectService.openClientFile(file1.path);
projectService.closeClientFile(file1.path);
projectService.openClientFile(file2.path);
checkNumberOfConfiguredProjects(projectService, 1);
checkNumberOfInferredProjects(projectService, 0);
});
});
}