Skip to content

Commit d3b6ba5

Browse files
author
Benjamin Lichtman
committed
Change test instead of behavior
1 parent 7ac5fa7 commit d3b6ba5

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

src/server/editorServices.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,10 +1002,10 @@ namespace ts.server {
10021002
directory,
10031003
fileOrDirectory => {
10041004
const fileOrDirectoryPath = this.toPath(fileOrDirectory);
1005-
const fileSystemResult = project.getCachedDirectoryStructureHost().addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath);
1005+
project.getCachedDirectoryStructureHost().addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath);
10061006

10071007
// don't trigger callback on open, existing files
1008-
if (project.fileIsOpen(fileOrDirectoryPath) && fileSystemResult && fileSystemResult.fileExists) {
1008+
if (project.fileIsOpen(fileOrDirectoryPath)) {
10091009
return;
10101010
}
10111011

src/testRunner/unittests/tsserver/projects.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1343,21 +1343,21 @@ var x = 10;`
13431343

13441344
it("no project structure update on directory watch invoke on open file save", () => {
13451345
const projectRootPath = "/users/username/projects/project";
1346-
const fileA: File = {
1346+
const file1: File = {
13471347
path: `${projectRootPath}/a.ts`,
13481348
content: "export const a = 10;"
13491349
};
13501350
const config: File = {
13511351
path: `${projectRootPath}/tsconfig.json`,
13521352
content: "{}"
13531353
};
1354-
const files = [fileA, config];
1354+
const files = [file1, config];
13551355
const host = createServerHost(files);
13561356
const service = createProjectService(host);
1357-
service.openClientFile(fileA.path);
1357+
service.openClientFile(file1.path);
13581358
checkNumberOfProjects(service, { configuredProjects: 1 });
13591359

1360-
host.invokeWatchedDirectoriesRecursiveCallback(projectRootPath, "a.ts");
1360+
host.modifyFile(file1.path, file1.content, { invokeFileDeleteCreateAsPartInsteadOfChange: true });
13611361
host.checkTimeoutQueueLength(0);
13621362
});
13631363

src/testRunner/unittests/tsserver/resolutionCache.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ export const x = 10;`
10001000
verifyWatchesWithConfigFile(host, files, file1, expectedNonRelativeDirectories);
10011001

10021002
// invoke callback to simulate saving
1003-
host.invokeWatchedDirectoriesRecursiveCallback(projectLocation + "/src", "file1.ts");
1003+
host.modifyFile(file1.path, file1.content, { invokeFileDeleteCreateAsPartInsteadOfChange: true });
10041004
host.checkTimeoutQueueLengthAndRun(0);
10051005
});
10061006
});

src/testRunner/unittests/tsserver/syntaxOperations.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,14 @@ describe("Test Suite 1", () => {
6060

6161
const navBarResultUnitTest1 = navBarFull(session, unitTest1);
6262
host.deleteFile(unitTest1.path);
63-
host.checkTimeoutQueueLengthAndRun(2);
64-
checkProjectActualFiles(project, expectedFilesWithoutUnitTest1);
63+
host.checkTimeoutQueueLengthAndRun(0);
64+
checkProjectActualFiles(project, expectedFilesWithUnitTest1);
6565

6666
session.executeCommandSeq<protocol.CloseRequest>({
6767
command: protocol.CommandTypes.Close,
6868
arguments: { file: unitTest1.path }
6969
});
70+
host.checkTimeoutQueueLengthAndRun(2);
7071
checkProjectActualFiles(project, expectedFilesWithoutUnitTest1);
7172

7273
const unitTest1WithChangedContent: File = {

0 commit comments

Comments
 (0)