From 9585a2690b4009bbafa67f58c781da01d3dee9d9 Mon Sep 17 00:00:00 2001 From: 0101 <0101@innit.cz> Date: Thu, 26 Jan 2023 16:57:55 +0100 Subject: [PATCH] Correctly assign references to definitions in Find Usage Service --- .../src/FSharp.Editor/Navigation/FindUsagesService.fs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vsintegration/src/FSharp.Editor/Navigation/FindUsagesService.fs b/vsintegration/src/FSharp.Editor/Navigation/FindUsagesService.fs index 9e7557b9d7a..702ed777426 100644 --- a/vsintegration/src/FSharp.Editor/Navigation/FindUsagesService.fs +++ b/vsintegration/src/FSharp.Editor/Navigation/FindUsagesService.fs @@ -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 { @@ -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