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

Change test instead of behavior

Browse Source
This commit is contained in:
Benjamin Lichtman
2019-05-31 14:46:15 -07:00
parent 7ac5fa783b
commit d3b6ba557a
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/editorServices.ts
View File

@@ -1002,10 +1002,10 @@ namespace ts.server {
directory,
fileOrDirectory => {
const fileOrDirectoryPath = this.toPath(fileOrDirectory);
const fileSystemResult = project.getCachedDirectoryStructureHost().addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath);
project.getCachedDirectoryStructureHost().addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath);
// don't trigger callback on open, existing files
if (project.fileIsOpen(fileOrDirectoryPath) && fileSystemResult && fileSystemResult.fileExists) {
if (project.fileIsOpen(fileOrDirectoryPath)) {
return;
}

8
src/testRunner/unittests/tsserver/projects.ts
View File

@@ -1343,7 +1343,7 @@ var x = 10;`
it("no project structure update on directory watch invoke on open file save", () => {
const projectRootPath = "/users/username/projects/project";
const fileA: File = {
const file1: File = {
path: `${projectRootPath}/a.ts`,
content: "export const a = 10;"
};
@@ -1351,13 +1351,13 @@ var x = 10;`
path: `${projectRootPath}/tsconfig.json`,
content: "{}"
};
const files = [fileA, config];
const files = [file1, config];
const host = createServerHost(files);
const service = createProjectService(host);
service.openClientFile(fileA.path);
service.openClientFile(file1.path);
checkNumberOfProjects(service, { configuredProjects: 1 });
host.invokeWatchedDirectoriesRecursiveCallback(projectRootPath, "a.ts");
host.modifyFile(file1.path, file1.content, { invokeFileDeleteCreateAsPartInsteadOfChange: true });
host.checkTimeoutQueueLength(0);
});

2
src/testRunner/unittests/tsserver/resolutionCache.ts
View File

@@ -1000,7 +1000,7 @@ export const x = 10;`
verifyWatchesWithConfigFile(host, files, file1, expectedNonRelativeDirectories);
// invoke callback to simulate saving
host.invokeWatchedDirectoriesRecursiveCallback(projectLocation + "/src", "file1.ts");
host.modifyFile(file1.path, file1.content, { invokeFileDeleteCreateAsPartInsteadOfChange: true });
host.checkTimeoutQueueLengthAndRun(0);
});
});

5
src/testRunner/unittests/tsserver/syntaxOperations.ts
View File

@@ -60,13 +60,14 @@ describe("Test Suite 1", () => {
const navBarResultUnitTest1 = navBarFull(session, unitTest1);
host.deleteFile(unitTest1.path);
host.checkTimeoutQueueLengthAndRun(2);
checkProjectActualFiles(project, expectedFilesWithoutUnitTest1);
host.checkTimeoutQueueLengthAndRun(0);
checkProjectActualFiles(project, expectedFilesWithUnitTest1);
session.executeCommandSeq<protocol.CloseRequest>({
command: protocol.CommandTypes.Close,
arguments: { file: unitTest1.path }
});
host.checkTimeoutQueueLengthAndRun(2);
checkProjectActualFiles(project, expectedFilesWithoutUnitTest1);
const unitTest1WithChangedContent: File = {