Skip to content

Clean up FAR aggregation #48619

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
amcasey merged 11 commits into from
May 19, 2022
Merged

Clean up FAR aggregation #48619

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
99fa17e
Clean up FAR and RenameLocations
amcasey Feb 11, 2022
205a6e1
Stop enforcing search and aggregation order
amcasey Mar 30, 2022
fe0713f
Introduce LanguageService.updateIsDefinitionOfReferencedSymbols
amcasey Apr 7, 2022
12a78b0
Update baselines
amcasey Apr 7, 2022
b5fab0d
Tidy diff
amcasey Apr 7, 2022
5f088f6
De-dup simplified results
amcasey Apr 7, 2022
d9ff2cc
Baseline cross-project isDefinition results
amcasey Apr 7, 2022
7003203
Move de-duping upstream to fix Full output
amcasey Apr 8, 2022
780a84e
Add server baseline test to confirm searches are not repeated
amcasey Apr 8, 2022
d47ae8a
Manually merge #48758
amcasey May 17, 2022
827f5f3
Update baseline for newer fix to #48963
amcasey May 17, 2022
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
Prev Previous commit
Next Next commit
Move de-duping upstream to fix Full output
  • Loading branch information
@amcasey
amcasey committed May 17, 2022
commit 70032036f6f5e289f56643fb94c13e44cc968e0d
17 changes: 8 additions & 9 deletions src/server/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,11 @@ namespace ts.server {
// of each definition and merging references from all the projects where they appear.

const results: ReferencedSymbol[] = [];
const seenRefs = createDocumentSpanSet(); // It doesn't make sense to have a reference in two definition lists, so we de-dup globally

// TODO: We might end up with a more logical allocation of refs to defs if we pre-sorted the defs by descending ref-count.
// Otherwise, it just ends up attached to the first corresponding def we happen to process. The others may or may not be
// dropped later when we check for defs with ref-count 0.
perProjectResults.forEach((projectResults, project) => {
for (const referencedSymbol of projectResults) {
const mappedDefinitionFile = getMappedLocationForProject(documentSpanLocation(referencedSymbol.definition), project);
Expand All @@ -449,7 +453,8 @@ namespace ts.server {
}

for (const ref of referencedSymbol.references) {
if (!contains(symbolToAddTo.references, ref, documentSpansEqual) && !getMappedLocationForProject(documentSpanLocation(ref), project)) {
if (!seenRefs.has(ref) && !getMappedLocationForProject(documentSpanLocation(ref), project)) {
seenRefs.add(ref);
symbolToAddTo.references.push(ref);
}
}
Expand Down Expand Up @@ -1803,14 +1808,8 @@ namespace ts.server {
const nameSpan = nameInfo && nameInfo.textSpan;
const symbolStartOffset = nameSpan ? scriptInfo.positionToLineOffset(nameSpan.start).offset : 0;
const symbolName = nameSpan ? scriptInfo.getSnapshot().getText(nameSpan.start, textSpanEnd(nameSpan)) : "";
const refs: protocol.ReferencesResponseItem[] = [];
const seen = createDocumentSpanSet();
references.forEach(referencedSymbol => {
referencedSymbol.references.forEach(entry => {
if (tryAddToSet(seen, entry)) {
refs.push(referenceEntryToReferencesResponseItem(this.projectService, entry));
}
});
const refs: readonly protocol.ReferencesResponseItem[] = flatMap(references, referencedSymbol => {
return referencedSymbol.references.map(entry => referenceEntryToReferencesResponseItem(this.projectService, entry));
});
return { refs, symbolName, symbolStartOffset, symbolDisplayString };
}
Expand Down
144 changes: 6 additions & 138 deletions tests/baselines/reference/isDefinitionAcrossGlobalProjects.baseline.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@
// export function FC() {}
// }
//
// interface [|I|][|I|] {
// interface [|I|] {
// FC();
// }
//
// const ic: [|I|][|I|] = { FC() {} };
// const ic: [|I|] = { FC() {} };

// === /a/index.ts ===
// namespace NS {
Expand Down Expand Up @@ -230,61 +230,6 @@
"isDefinition": false
}
]
},
{
"definition": {
"containerKind": "",
"containerName": "",
"fileName": "/c/index.ts",
"kind": "interface",
"name": "interface I",
"textSpan": {
"start": 56,
"length": 1
},
"displayParts": [
{
"text": "interface",
"kind": "keyword"
},
{
"text": " ",
"kind": "space"
},
{
"text": "I",
"kind": "interfaceName"
}
],
"contextSpan": {
"start": 46,
"length": 25
}
},
"references": [
{
"textSpan": {
"start": 56,
"length": 1
},
"fileName": "/c/index.ts",
"contextSpan": {
"start": 46,
"length": 25
},
"isWriteAccess": true,
"isDefinition": true
},
{
"textSpan": {
"start": 83,
"length": 1
},
"fileName": "/c/index.ts",
"isWriteAccess": false,
"isDefinition": false
}
]
}
]

Expand Down Expand Up @@ -533,11 +478,11 @@
// export function FC() {}
// }
//
// interface [|I|][|I|] {
// interface [|I|] {
// FC();
// }
//
// const ic: [|I|][|I|] = { FC() {} };
// const ic: [|I|] = { FC() {} };

// === /a/index.ts ===
// namespace NS {
Expand Down Expand Up @@ -655,61 +600,6 @@
"isDefinition": false
}
]
},
{
"definition": {
"containerKind": "",
"containerName": "",
"fileName": "/c/index.ts",
"kind": "interface",
"name": "interface I",
"textSpan": {
"start": 56,
"length": 1
},
"displayParts": [
{
"text": "interface",
"kind": "keyword"
},
{
"text": " ",
"kind": "space"
},
{
"text": "I",
"kind": "interfaceName"
}
],
"contextSpan": {
"start": 46,
"length": 25
}
},
"references": [
{
"textSpan": {
"start": 56,
"length": 1
},
"fileName": "/c/index.ts",
"contextSpan": {
"start": 46,
"length": 25
},
"isWriteAccess": true,
"isDefinition": true
},
{
"textSpan": {
"start": 83,
"length": 1
},
"fileName": "/c/index.ts",
"isWriteAccess": false,
"isDefinition": false
}
]
}
]

Expand Down Expand Up @@ -945,11 +835,11 @@
// export function FC() {}
// }
//
// interface /*FIND ALL REFS*/[|I|]/*FIND ALL REFS*/[|I|] {
// interface /*FIND ALL REFS*/[|I|] {
// FC();
// }
//
// const ic: [|I|][|I|] = { FC() {} };
// const ic: [|I|] = { FC() {} };

// === /b/index.ts ===
// namespace NS {
Expand Down Expand Up @@ -1088,28 +978,6 @@
"isWriteAccess": false,
"isDefinition": false
},
{
"textSpan": {
"start": 56,
"length": 1
},
"fileName": "/c/index.ts",
"contextSpan": {
"start": 46,
"length": 25
},
"isWriteAccess": true,
"isDefinition": true
},
{
"textSpan": {
"start": 83,
"length": 1
},
"fileName": "/c/index.ts",
"isWriteAccess": false,
"isDefinition": false
},
{
"textSpan": {
"start": 75,
Expand Down