Skip to content

Fix duplicate find references results #15728

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
T-Gro merged 1 commit into from
Aug 2, 2023
Merged

Fix duplicate find references results #15728

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
10 changes: 7 additions & 3 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 @@ -85,6 +85,10 @@ type internal FSharpFindUsagesService [<ImportingConstructor>] () =
}
|> liftAsync

let declarationSpans =
declarationSpans
|> List.distinctBy (fun x -> x.Document.FilePath, x.Document.Project.FilePath)

let isExternal = declarationSpans |> List.isEmpty

let displayParts =
Expand All @@ -98,7 +102,7 @@ type internal FSharpFindUsagesService [<ImportingConstructor>] () =

let definitionItems =
declarationSpans
|> List.map (fun span -> FSharpDefinitionItem.Create(tags, displayParts, span), span.Document.Project.Id)
|> List.map (fun span -> FSharpDefinitionItem.Create(tags, displayParts, span), span.Document.Project.FilePath)

for definitionItem, _ in definitionItems do
do! context.OnDefinitionFoundAsync(definitionItem) |> Async.AwaitTask |> liftAsync
Expand All @@ -123,8 +127,8 @@ type internal FSharpFindUsagesService [<ImportingConstructor>] () =
externalDefinitionItem
else
definitionItems
|> List.tryFind (fun (_, projectId) -> doc.Project.Id = projectId)
|> Option.map (fun (definitionItem, _) -> definitionItem)
|> List.tryFind (snd >> (=) doc.Project.FilePath)
|> Option.map fst
|> Option.defaultValue externalDefinitionItem

let referenceItem =
Expand Down