Fix duplicate find references results (#15728)

dotnet · Aug 2, 2023 · 9513424 · 9513424
1 parent 6dd6899
commit 9513424
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/vsintegration/src/FSharp.Editor/Navigation/FindUsagesService.fs b/vsintegration/src/FSharp.Editor/Navigation/FindUsagesService.fs
@@ -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 =
@@ -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
@@ -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 =