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

more tests

Browse Source
This commit is contained in:
Vladimir Matveev 2016-06-30 13:23:55 -07:00
parent a9cd516119
commit bebc5711cb
3 changed files with 75 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/editorServices.ts
View File

@ -72,12 +72,12 @@ namespace ts.server {
/**
* a path to directory watcher map that detects added tsconfig files
**/
private directoryWatchersForTsconfig: Map<FileWatcher> = {};
private readonly directoryWatchersForTsconfig: Map<FileWatcher> = {};
/**
* count of how many projects are using the directory watcher.
* If the number becomes 0 for a watcher, then we should close it.
**/
private directoryWatchersRefCount: Map<number> = {};
private readonly directoryWatchersRefCount: Map<number> = {};
constructor(private readonly projectService: ProjectService) {
}
@ -208,7 +208,7 @@ namespace ts.server {
private updateProjectGraphs(projects: Project[]) {
let shouldRefreshInferredProjects = false;
for (const p of projects) {
if (p.updateGraph()) {
if (!p.updateGraph()) {
shouldRefreshInferredProjects = true;
}
}
@ -231,7 +231,6 @@ namespace ts.server {
if (info && (!info.isOpen)) {
// file has been changed which might affect the set of referenced files in projects that include
// this file and set of inferred projects
// TODO: add tests
info.reloadFromFile();
this.updateProjectGraphs(info.containingProjects);
}

4
src/server/project.ts
View File

@ -190,6 +190,10 @@ namespace ts.server {
this.projectStateVersion++;
}
/**
* Updates set of files that contribute to this project
* @returns: true if set of files in the project stays the same and false - otherwise.
*/
updateGraph(): boolean {
if (!this.languageServiceEnabled) {
return true;

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

@ -21,25 +21,34 @@ namespace ts {
};
const { content: libFileContent } = Harness.getDefaultLibraryFile(Harness.IO);
const libFile: FileOrFolder = {
path: "/a/lib/lib.d.ts",
content: libFileContent
};
function getExecutingFilePathFromLibFile(libFile: FileOrFolder): string {
function getExecutingFilePathFromLibFile(libFilePath: string): string {
return combinePaths(getDirectoryPath(libFile.path), "tsc.js");
}
interface TestServerHostCreationParameters {
fileOrFolderList: FileOrFolder[];
useCaseSensitiveFileNames?: boolean;
executingFilePath?: string;
libFile?: FileOrFolder;
currentDirectory?: string;
}
function createServerHost(params: TestServerHostCreationParameters): TestServerHost {
function createServerHost(fileOrFolderList: FileOrFolder[],
params?: TestServerHostCreationParameters,
libFilePath: string = libFile.path): TestServerHost {
if (!params) {
params = {};
}
return new TestServerHost(
params.useCaseSensitiveFileNames !== undefined ? params.useCaseSensitiveFileNames : false,
params.executingFilePath || getExecutingFilePathFromLibFile(params.libFile),
params.executingFilePath || getExecutingFilePathFromLibFile(libFilePath),
params.currentDirectory || "/",
params.fileOrFolderList);
fileOrFolderList);
}
interface FileOrFolder {
@ -365,10 +374,6 @@ namespace ts {
path: "/a/b/commonFile2.ts",
content: "let y = 1"
};
const libFile: FileOrFolder = {
path: "/a/lib/lib.d.ts",
content: libFileContent
};
it("create inferred project", () => {
const appFile: FileOrFolder = {
@ -383,7 +388,7 @@ namespace ts {
path: "/a/b/c/module.d.ts",
content: `export let x: number`
};
const host = createServerHost({ fileOrFolderList: [appFile, moduleFile, libFile], libFile });
const host = createServerHost([appFile, moduleFile, libFile]);
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ false);
const { configFileName } = projectService.openClientFile(appFile.path);
@ -421,8 +426,7 @@ namespace ts {
content: "let z = 1"
};
const host = createServerHost({ fileOrFolderList: [configFile, libFile, file1, file2, file3], libFile });
const host = createServerHost([configFile, libFile, file1, file2, file3]);
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ false);
const { configFileName, configFileErrors } = projectService.openClientFile(file1.path);
@ -447,7 +451,7 @@ namespace ts {
}`
};
const filesWithoutConfig = [libFile, commonFile1, commonFile2];
const host = createServerHost({ fileOrFolderList: filesWithoutConfig, libFile });
const host = createServerHost(filesWithoutConfig);
const filesWithConfig = [libFile, commonFile1, commonFile2, configFile];
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ false);
@ -480,7 +484,7 @@ namespace ts {
path: "/a/b/tsconfig.json",
content: `{}`
};
const host = createServerHost({ fileOrFolderList: [commonFile1, libFile, configFile], libFile });
const host = createServerHost([commonFile1, libFile, configFile]);
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ false);
projectService.openClientFile(commonFile1.path);
checkWatchedDirectories(host, ["/a/b"]);
@ -508,7 +512,7 @@ namespace ts {
]
}`
};
const host = createServerHost({ fileOrFolderList: [commonFile1, commonFile2, configFile], libFile });
const host = createServerHost([commonFile1, commonFile2, configFile]);
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ false);
projectService.openClientFile(commonFile1.path);
projectService.openClientFile(commonFile2.path);
@ -524,7 +528,7 @@ namespace ts {
path: "/a/b/tsconfig.json",
content: `{}`
};
const host = createServerHost({ fileOrFolderList: [commonFile1, commonFile2, configFile], libFile });
const host = createServerHost([commonFile1, commonFile2, configFile]);
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ false);
projectService.openClientFile(commonFile1.path);
@ -554,7 +558,7 @@ namespace ts {
}`
};
const files = [commonFile1, commonFile2, configFile];
const host = createServerHost({ fileOrFolderList: files, libFile });
const host = createServerHost(files);
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ false);
projectService.openClientFile(commonFile1.path);
@ -587,7 +591,7 @@ namespace ts {
content: `let t = 1;`
};
const host = createServerHost({ fileOrFolderList: [commonFile1, commonFile2, excludedFile1, configFile], libFile });
const host = createServerHost([commonFile1, commonFile2, excludedFile1, configFile]);
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ false);
projectService.openClientFile(commonFile1.path);
@ -621,7 +625,7 @@ namespace ts {
}`
};
const files = [file1, nodeModuleFile, classicModuleFile, configFile];
const host = createServerHost({ fileOrFolderList: files, libFile });
const host = createServerHost(files);
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ false);
projectService.openClientFile(file1.path);
projectService.openClientFile(nodeModuleFile.path);
@ -662,7 +666,7 @@ namespace ts {
"files": [ "main.ts" ]
}`
};
const host = createServerHost({ fileOrFolderList: [file1, file2, configFile], libFile });
const host = createServerHost([file1, file2, configFile]);
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ false);
projectService.openClientFile(file1.path);
projectService.closeClientFile(file1.path);
@ -689,7 +693,7 @@ namespace ts {
"files": [ "main.ts" ]
}`
};
const host = createServerHost({ fileOrFolderList: [file1, file2, configFile], libFile });
const host = createServerHost([file1, file2, configFile]);
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ false);
projectService.openClientFile(file1.path);
projectService.closeClientFile(file1.path);
@ -722,7 +726,7 @@ namespace ts {
content: "let x =1;"
};
const host = createServerHost({ fileOrFolderList: [file1, file2, file3, libFile], libFile });
const host = createServerHost([file1, file2, file3, libFile]);
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ true);
projectService.openClientFile(file1.path);
projectService.openClientFile(file2.path);
@ -755,7 +759,7 @@ namespace ts {
"files": [ "main.ts" ]
}`
};
const host = createServerHost({ fileOrFolderList: [file1, configFile, libFile], libFile });
const host = createServerHost([file1, configFile, libFile]);
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ true);
projectService.openClientFile(file1.path);
checkNumberOfConfiguredProjects(projectService, 1);
@ -774,7 +778,7 @@ namespace ts {
content: "let y =1;"
};
const externalProjectName = "externalproject";
const host = createServerHost({ fileOrFolderList: [file1, file2], libFile });
const host = createServerHost([file1, file2]);
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ false);
projectService.openExternalProject({
rootFiles: [ file1.path, file2.path ],
@ -832,7 +836,7 @@ namespace ts {
content: "let z =1;"
};
const externalProjectName = "externalproject";
const host = createServerHost({ fileOrFolderList: [file1, file2, file3, config1, config2], libFile });
const host = createServerHost([file1, file2, file3, config1, config2]);
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ false);
projectService.openExternalProject({
rootFiles: [ config1.path, config2.path, file3.path ],
@ -882,7 +886,7 @@ namespace ts {
content: JSON.stringify({ compilerOptions: {} })
};
const externalProjectName = "externalproject";
const host = createServerHost({ fileOrFolderList: [file1, configFile], libFile });
const host = createServerHost([file1, configFile]);
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ false);
projectService.openClientFile(file1.path);
@ -922,7 +926,7 @@ namespace ts {
content: JSON.stringify({ compilerOptions: {} })
};
const externalProjectName = "externalproject";
const host = createServerHost({ fileOrFolderList: [file1, configFile], libFile });
const host = createServerHost([file1, configFile]);
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useOneInferredProject*/ false);
projectService.openClientFile(file1.path);
@ -952,5 +956,42 @@ namespace ts {
checkNumberOfConfiguredProjects(projectService, 0);
checkNumberOfInferredProjects(projectService, 0);
});
it("changes in closed files are reflected in project structure", () => {
const file1 = {
path: "/a/b/f1.ts",
content: `export * from "./f2"`
};
const file2 = {
path: "/a/b/f2.ts",
content: `export let x = 1`
};
const file3 = {
path: "/a/c/f3.ts",
content: `export let y = 1;`
};
const host = createServerHost([file1, file2, file3]);
const projectService = new server.ProjectService(host, nullLogger, nullCancellationToken, /*useSingleInferredProject*/ false);
projectService.openClientFile(file1.path);
checkNumberOfInferredProjects(projectService, 1);
checkProjectActualFiles(projectService.inferredProjects[0], [ file1.path, file2.path ]);
projectService.openClientFile(file3.path);
checkNumberOfInferredProjects(projectService, 2);
checkProjectActualFiles(projectService.inferredProjects[1], [ file3.path ]);
const modifiedFile2 = {
path: file2.path,
content: `export * from "../c/f3"` // now inferred project should inclule file3
};
host.reloadFS([file1, modifiedFile2, file3]);
host.triggerFileWatcherCallback(modifiedFile2.path, /*removed*/ false);
checkNumberOfInferredProjects(projectService, 1);
checkProjectActualFiles(projectService.inferredProjects[0], [ file1.path, modifiedFile2.path, file3.path ]);
});
});
}