Skip to content

Correctly assign references to definitions in Find Usage Service #14665

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 2 commits into from
Jan 26, 2023
Merged

Correctly assign references to definitions in Find Usage Service #14665

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9585a26
Correctly assign references to definitions in Find Usage Service
0101 Jan 26, 2023
3d5ac5d
Merge branch 'main' into fix-9983
0101 Jan 26, 2023
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
10 changes: 5 additions & 5 deletions vsintegration/src/FSharp.Editor/Navigation/FindUsagesService.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ type internal FSharpFindUsagesService
let originationParts = ImmutableArray.Create(Microsoft.CodeAnalysis.TaggedText(TextTags.Assembly, symbolUse.Symbol.Assembly.SimpleName))
let externalDefinitionItem = FSharpDefinitionItem.CreateNonNavigableItem(tags, displayParts, originationParts)
let definitionItems =
declarationSpans
|> List.map (fun span -> FSharpDefinitionItem.Create(tags, displayParts, span), span.Document.Id)
declarationSpans
|> List.map (fun span -> FSharpDefinitionItem.Create(tags, displayParts, span), span.Document.Project.Id)

for definitionItem, _ in definitionItems do
do! context.OnDefinitionFoundAsync(definitionItem) |> Async.AwaitTask |> liftAsync

if isExternal then
do! context.OnDefinitionFoundAsync(externalDefinitionItem) |> Async.AwaitTask |> liftAsync

let onFound =
fun (doc: Document) (textSpan: TextSpan) (symbolUse: range) ->
async {
Expand All @@ -92,7 +92,7 @@ type internal FSharpFindUsagesService
externalDefinitionItem
else
definitionItems
|> List.tryFind (fun (_, docId) -> doc.Id = docId)
|> List.tryFind (fun (_, projectId) -> doc.Project.Id = projectId)
|> Option.map (fun (definitionItem, _) -> definitionItem)
|> Option.defaultValue externalDefinitionItem

Expand Down