Skip to content

Fix current document position mappers #57489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 22, 2024
Merged

Fix current document position mappers #57489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/harness/projectServiceStateLogger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,8 @@ export function patchServiceForStateBaseline(service: ProjectService) {
(logs, project, data) => {
if (project.autoImportProviderHost) autoImportProviderProjects.push(project.autoImportProviderHost);
if (project.noDtsResolutionProject) auxiliaryProjects.push(project.noDtsResolutionProject);
const documentMappers = getSourceMapper(project)?.documentPositionMappers;
if (documentMappers) documentMappers.forEach(mapper => currentMappers.add(mapper));
let projectDiff = newOrDeleted(project, projects, data);
if (projectDiff !== Diff.Deleted) getSourceMapper(project)?.documentPositionMappers.forEach(mapper => currentMappers.add(mapper));
const projectPropertyLogs = [] as string[];
projectDiff = printProperty(PrintPropertyWhen.Always, data, "projectStateVersion", project.projectStateVersion, projectDiff, projectPropertyLogs);
projectDiff = printProperty(PrintPropertyWhen.Always, data, "projectProgramVersion", project.projectProgramVersion, projectDiff, projectPropertyLogs);
Expand Down Expand Up @@ -162,8 +161,8 @@ export function patchServiceForStateBaseline(service: ProjectService) {
[service.filenameToScriptInfo],
scriptInfos,
(logs, info, data) => {
if (info.documentPositionMapper) currentMappers.add(info.documentPositionMapper);
let infoDiff = newOrDeleted(info, scriptInfos, data);
if (infoDiff !== Diff.Deleted && info.documentPositionMapper) currentMappers.add(info.documentPositionMapper);
const infoPropertyLogs = [] as string[];
const isOpen = info.isScriptOpen();
infoDiff = printProperty(PrintPropertyWhen.Changed, data, "open", isOpen, infoDiff, infoPropertyLogs);
Expand Down
3 changes: 3 additions & 0 deletions ...ines/reference/tsserver/declarationFileMaps/does-not-jump-to-source-if-inlined-sources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,3 +539,6 @@ ScriptInfos::
/user/user.ts *deleted*
version: SVC-1-0
containingProjects: 0

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
3 changes: 3 additions & 0 deletions ...selines/reference/tsserver/declarationFileMaps/findAllReferences-target-does-not-exist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,3 +1059,6 @@ ScriptInfos::
/user/user.ts *deleted*
version: SVC-1-0
containingProjects: 0

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
3 changes: 3 additions & 0 deletions tests/baselines/reference/tsserver/declarationFileMaps/findAllReferences.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,3 +1192,6 @@ ScriptInfos::
/user/user.ts *deleted*
version: SVC-1-0
containingProjects: 0

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
3 changes: 3 additions & 0 deletions tests/baselines/reference/tsserver/declarationFileMaps/findAllReferencesFull.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1226,3 +1226,6 @@ ScriptInfos::
/user/user.ts *deleted*
version: SVC-1-0
containingProjects: 0

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
3 changes: 3 additions & 0 deletions tests/baselines/reference/tsserver/declarationFileMaps/getDefinitionAndBoundSpan.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,3 +1073,6 @@ ScriptInfos::
/user/user.ts *deleted*
version: SVC-1-0
containingProjects: 0

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
4 changes: 4 additions & 0 deletions tests/baselines/reference/tsserver/declarationFileMaps/getEditsForFileRename.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,3 +1086,7 @@ ScriptInfos::
/user/user.ts *deleted*
version: SVC-1-0
containingProjects: 0

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
DocumentPositionMapper2 *deleted*
3 changes: 3 additions & 0 deletions .../baselines/reference/tsserver/declarationFileMaps/goToDefinition-target-does-not-exist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,3 +1038,6 @@ ScriptInfos::
/user/user.ts *deleted*
version: SVC-1-0
containingProjects: 0

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
3 changes: 3 additions & 0 deletions tests/baselines/reference/tsserver/declarationFileMaps/goToDefinition.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,3 +1061,6 @@ ScriptInfos::
/user/user.ts *deleted*
version: SVC-1-0
containingProjects: 0

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
3 changes: 3 additions & 0 deletions tests/baselines/reference/tsserver/declarationFileMaps/goToImplementation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,3 +1061,6 @@ ScriptInfos::
/user/user.ts *deleted*
version: SVC-1-0
containingProjects: 0

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
3 changes: 3 additions & 0 deletions tests/baselines/reference/tsserver/declarationFileMaps/goToType.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,3 +1061,6 @@ ScriptInfos::
/user/user.ts *deleted*
version: SVC-1-0
containingProjects: 0

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
4 changes: 4 additions & 0 deletions tests/baselines/reference/tsserver/declarationFileMaps/navigateTo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,3 +1102,7 @@ ScriptInfos::
/user/user.ts *deleted*
version: SVC-1-0
containingProjects: 0

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
DocumentPositionMapper2 *deleted*
3 changes: 3 additions & 0 deletions ...baselines/reference/tsserver/declarationFileMaps/renameLocations-target-does-not-exist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,3 +1076,6 @@ ScriptInfos::
/user/user.ts *deleted*
version: SVC-1-0
containingProjects: 0

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
3 changes: 3 additions & 0 deletions tests/baselines/reference/tsserver/declarationFileMaps/renameLocations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,3 +1206,6 @@ ScriptInfos::
/user/user.ts *deleted*
version: SVC-1-0
containingProjects: 0

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
3 changes: 3 additions & 0 deletions tests/baselines/reference/tsserver/declarationFileMaps/renameLocationsFull.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,3 +1167,6 @@ ScriptInfos::
/user/user.ts *deleted*
version: SVC-1-0
containingProjects: 0

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
3 changes: 3 additions & 0 deletions ...rver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-created.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1635,3 +1635,6 @@ ScriptInfos::
version: SVC-1-0
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
4 changes: 2 additions & 2 deletions ...rver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-deleted.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,11 +1333,11 @@ ScriptInfos::
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

Before request

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*

Before request

Info seq [hh:mm:ss:mss] request:
{
"command": "close",
Expand Down
3 changes: 3 additions & 0 deletions ...r/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-created.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1672,3 +1672,6 @@ ScriptInfos::
version: SVC-1-0
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
6 changes: 3 additions & 3 deletions ...r/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-deleted.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,9 @@ ScriptInfos::
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*

Info seq [hh:mm:ss:mss] request:
{
"command": "rename",
Expand Down Expand Up @@ -912,9 +915,6 @@ ScriptInfos::
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*

Before request

Info seq [hh:mm:ss:mss] request:
Expand Down
3 changes: 3 additions & 0 deletions ...e/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/rename-locations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1477,3 +1477,6 @@ ScriptInfos::
version: SVC-1-0
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
3 changes: 3 additions & 0 deletions ...erver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-created.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1640,3 +1640,6 @@ ScriptInfos::
version: SVC-1-0
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
4 changes: 2 additions & 2 deletions ...erver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-deleted.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1338,11 +1338,11 @@ ScriptInfos::
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

Before request

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*

Before request

Info seq [hh:mm:ss:mss] request:
{
"command": "close",
Expand Down
3 changes: 3 additions & 0 deletions ...er/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-created.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1677,3 +1677,6 @@ ScriptInfos::
version: SVC-1-0
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
6 changes: 3 additions & 3 deletions ...er/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-deleted.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,9 @@ ScriptInfos::
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*

Info seq [hh:mm:ss:mss] request:
{
"command": "rename",
Expand Down Expand Up @@ -917,9 +920,6 @@ ScriptInfos::
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*

Before request

Info seq [hh:mm:ss:mss] request:
Expand Down
3 changes: 3 additions & 0 deletions ...ce/tsserver/projectReferencesSourcemap/dependency/configWithReference/rename-locations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1482,3 +1482,6 @@ ScriptInfos::
version: SVC-1-0
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
3 changes: 3 additions & 0 deletions ...sserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-created.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1641,3 +1641,6 @@ ScriptInfos::
version: SVC-1-0
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
4 changes: 2 additions & 2 deletions ...sserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-deleted.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1339,11 +1339,11 @@ ScriptInfos::
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

Before request

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*

Before request

Info seq [hh:mm:ss:mss] request:
{
"command": "close",
Expand Down
3 changes: 3 additions & 0 deletions ...rver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-created.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1678,3 +1678,6 @@ ScriptInfos::
version: SVC-1-0
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
6 changes: 3 additions & 3 deletions ...rver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-deleted.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,9 @@ ScriptInfos::
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*

Info seq [hh:mm:ss:mss] request:
{
"command": "rename",
Expand Down Expand Up @@ -918,9 +921,6 @@ ScriptInfos::
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*

Before request

Info seq [hh:mm:ss:mss] request:
Expand Down
3 changes: 3 additions & 0 deletions ...ence/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/rename-locations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1483,3 +1483,6 @@ ScriptInfos::
version: SVC-1-0
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
3 changes: 3 additions & 0 deletions ...jectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-created.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2687,3 +2687,6 @@ ScriptInfos::
version: SVC-1-0
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
4 changes: 2 additions & 2 deletions ...jectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-deleted.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2073,11 +2073,11 @@ ScriptInfos::
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

Before request

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*

Before request

Info seq [hh:mm:ss:mss] request:
{
"command": "close",
Expand Down
3 changes: 3 additions & 0 deletions ...tReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-created.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2754,3 +2754,6 @@ ScriptInfos::
version: SVC-1-0
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
6 changes: 3 additions & 3 deletions ...tReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-deleted.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,9 @@ ScriptInfos::
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*

Info seq [hh:mm:ss:mss] request:
{
"command": "definitionAndBoundSpan",
Expand Down Expand Up @@ -1277,9 +1280,6 @@ Projects::
projectStateVersion: 1
projectProgramVersion: 1

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*

Before request

Info seq [hh:mm:ss:mss] request:
Expand Down
3 changes: 3 additions & 0 deletions ...ferencesSourcemap/dependencyAndUsage/configHasNoReference/goToDef-and-rename-locations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2447,3 +2447,6 @@ ScriptInfos::
version: SVC-1-0
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
3 changes: 3 additions & 0 deletions ...ojectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-created.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2731,3 +2731,6 @@ ScriptInfos::
version: SVC-1-0
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
4 changes: 2 additions & 2 deletions ...ojectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-deleted.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2231,11 +2231,11 @@ ScriptInfos::
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

Before request

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*

Before request

Info seq [hh:mm:ss:mss] request:
{
"command": "close",
Expand Down
3 changes: 3 additions & 0 deletions ...ctReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-created.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2795,3 +2795,6 @@ ScriptInfos::
version: SVC-1-0
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
6 changes: 3 additions & 3 deletions ...ctReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-deleted.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,6 +1168,9 @@ ScriptInfos::
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*

Info seq [hh:mm:ss:mss] request:
{
"command": "definitionAndBoundSpan",
Expand Down Expand Up @@ -1237,9 +1240,6 @@ Projects::
projectStateVersion: 1
projectProgramVersion: 1

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*

Before request

Info seq [hh:mm:ss:mss] request:
Expand Down
3 changes: 3 additions & 0 deletions ...eferencesSourcemap/dependencyAndUsage/configWithReference/goToDef-and-rename-locations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2451,3 +2451,6 @@ ScriptInfos::
version: SVC-1-0
containingProjects: 1
/user/username/projects/myproject/random/tsconfig.json *default*

DocumentPositionMappers::
DocumentPositionMapper1 *deleted*
Loading