Skip to content

Commit af6c6a9

Browse files
authored
Fix current document position mappers (#57489)
1 parent 2fc6e2e commit af6c6a9

File tree

55 files changed

+158
-43
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+158
-43
lines changed

src/harness/projectServiceStateLogger.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,8 @@ export function patchServiceForStateBaseline(service: ProjectService) {
109109
(logs, project, data) => {
110110
if (project.autoImportProviderHost) autoImportProviderProjects.push(project.autoImportProviderHost);
111111
if (project.noDtsResolutionProject) auxiliaryProjects.push(project.noDtsResolutionProject);
112-
const documentMappers = getSourceMapper(project)?.documentPositionMappers;
113-
if (documentMappers) documentMappers.forEach(mapper => currentMappers.add(mapper));
114112
let projectDiff = newOrDeleted(project, projects, data);
113+
if (projectDiff !== Diff.Deleted) getSourceMapper(project)?.documentPositionMappers.forEach(mapper => currentMappers.add(mapper));
115114
const projectPropertyLogs = [] as string[];
116115
projectDiff = printProperty(PrintPropertyWhen.Always, data, "projectStateVersion", project.projectStateVersion, projectDiff, projectPropertyLogs);
117116
projectDiff = printProperty(PrintPropertyWhen.Always, data, "projectProgramVersion", project.projectProgramVersion, projectDiff, projectPropertyLogs);
@@ -162,8 +161,8 @@ export function patchServiceForStateBaseline(service: ProjectService) {
162161
[service.filenameToScriptInfo],
163162
scriptInfos,
164163
(logs, info, data) => {
165-
if (info.documentPositionMapper) currentMappers.add(info.documentPositionMapper);
166164
let infoDiff = newOrDeleted(info, scriptInfos, data);
165+
if (infoDiff !== Diff.Deleted && info.documentPositionMapper) currentMappers.add(info.documentPositionMapper);
167166
const infoPropertyLogs = [] as string[];
168167
const isOpen = info.isScriptOpen();
169168
infoDiff = printProperty(PrintPropertyWhen.Changed, data, "open", isOpen, infoDiff, infoPropertyLogs);

tests/baselines/reference/tsserver/declarationFileMaps/does-not-jump-to-source-if-inlined-sources.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,3 +539,6 @@ ScriptInfos::
539539
/user/user.ts *deleted*
540540
version: SVC-1-0
541541
containingProjects: 0
542+
543+
DocumentPositionMappers::
544+
DocumentPositionMapper1 *deleted*

tests/baselines/reference/tsserver/declarationFileMaps/findAllReferences-target-does-not-exist.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,3 +1059,6 @@ ScriptInfos::
10591059
/user/user.ts *deleted*
10601060
version: SVC-1-0
10611061
containingProjects: 0
1062+
1063+
DocumentPositionMappers::
1064+
DocumentPositionMapper1 *deleted*

tests/baselines/reference/tsserver/declarationFileMaps/findAllReferences.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,3 +1192,6 @@ ScriptInfos::
11921192
/user/user.ts *deleted*
11931193
version: SVC-1-0
11941194
containingProjects: 0
1195+
1196+
DocumentPositionMappers::
1197+
DocumentPositionMapper1 *deleted*

tests/baselines/reference/tsserver/declarationFileMaps/findAllReferencesFull.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,3 +1226,6 @@ ScriptInfos::
12261226
/user/user.ts *deleted*
12271227
version: SVC-1-0
12281228
containingProjects: 0
1229+
1230+
DocumentPositionMappers::
1231+
DocumentPositionMapper1 *deleted*

tests/baselines/reference/tsserver/declarationFileMaps/getDefinitionAndBoundSpan.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,3 +1073,6 @@ ScriptInfos::
10731073
/user/user.ts *deleted*
10741074
version: SVC-1-0
10751075
containingProjects: 0
1076+
1077+
DocumentPositionMappers::
1078+
DocumentPositionMapper1 *deleted*

tests/baselines/reference/tsserver/declarationFileMaps/getEditsForFileRename.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,3 +1086,7 @@ ScriptInfos::
10861086
/user/user.ts *deleted*
10871087
version: SVC-1-0
10881088
containingProjects: 0
1089+
1090+
DocumentPositionMappers::
1091+
DocumentPositionMapper1 *deleted*
1092+
DocumentPositionMapper2 *deleted*

tests/baselines/reference/tsserver/declarationFileMaps/goToDefinition-target-does-not-exist.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,3 +1038,6 @@ ScriptInfos::
10381038
/user/user.ts *deleted*
10391039
version: SVC-1-0
10401040
containingProjects: 0
1041+
1042+
DocumentPositionMappers::
1043+
DocumentPositionMapper1 *deleted*

tests/baselines/reference/tsserver/declarationFileMaps/goToDefinition.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,3 +1061,6 @@ ScriptInfos::
10611061
/user/user.ts *deleted*
10621062
version: SVC-1-0
10631063
containingProjects: 0
1064+
1065+
DocumentPositionMappers::
1066+
DocumentPositionMapper1 *deleted*

tests/baselines/reference/tsserver/declarationFileMaps/goToImplementation.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,3 +1061,6 @@ ScriptInfos::
10611061
/user/user.ts *deleted*
10621062
version: SVC-1-0
10631063
containingProjects: 0
1064+
1065+
DocumentPositionMappers::
1066+
DocumentPositionMapper1 *deleted*

0 commit comments

Comments
 (0)