Skip to content

Commit 94e2326

Browse files
authored
Correctly assign references to definitions in Find Usage Service (#14665)
1 parent 035d908 commit 94e2326

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

vsintegration/src/FSharp.Editor/Navigation/FindUsagesService.fs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ type internal FSharpFindUsagesService
7171
let originationParts = ImmutableArray.Create(Microsoft.CodeAnalysis.TaggedText(TextTags.Assembly, symbolUse.Symbol.Assembly.SimpleName))
7272
let externalDefinitionItem = FSharpDefinitionItem.CreateNonNavigableItem(tags, displayParts, originationParts)
7373
let definitionItems =
74-
declarationSpans
75-
|> List.map (fun span -> FSharpDefinitionItem.Create(tags, displayParts, span), span.Document.Id)
76-
74+
declarationSpans
75+
|> List.map (fun span -> FSharpDefinitionItem.Create(tags, displayParts, span), span.Document.Project.Id)
76+
7777
for definitionItem, _ in definitionItems do
7878
do! context.OnDefinitionFoundAsync(definitionItem) |> Async.AwaitTask |> liftAsync
7979

8080
if isExternal then
8181
do! context.OnDefinitionFoundAsync(externalDefinitionItem) |> Async.AwaitTask |> liftAsync
82-
82+
8383
let onFound =
8484
fun (doc: Document) (textSpan: TextSpan) (symbolUse: range) ->
8585
async {
@@ -92,7 +92,7 @@ type internal FSharpFindUsagesService
9292
externalDefinitionItem
9393
else
9494
definitionItems
95-
|> List.tryFind (fun (_, docId) -> doc.Id = docId)
95+
|> List.tryFind (fun (_, projectId) -> doc.Project.Id = projectId)
9696
|> Option.map (fun (definitionItem, _) -> definitionItem)
9797
|> Option.defaultValue externalDefinitionItem
9898

0 commit comments

Comments
 (0)