Skip to content

Fix IFSharpFindDefinitionService MEF export #14647

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 30, 2023
Merged

Fix IFSharpFindDefinitionService MEF export #14647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08d09cb
Fix IFSharpFindDefinitionService MEF export
vzarytovskii Jan 23, 2023
0bfcd59
Add service
vzarytovskii Jan 23, 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
1 change: 1 addition & 0 deletions vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
<Compile Include="Navigation\NavigationBarItemService.fs" />
<Compile Include="Navigation\NavigateToSearchService.fs" />
<Compile Include="Navigation\FindUsagesService.fs" />
<Compile Include="Navigation\FindDefinitionService.fs" />
<Compile Include="QuickInfo\NavigableTextRun.fs" />
<Compile Include="QuickInfo\WpfNagivableTextRunViewElementFactory.fs" />
<Compile Include="QuickInfo\Views.fs" />
Expand Down
30 changes: 30 additions & 0 deletions vsintegration/src/FSharp.Editor/Navigation/FindDefinitionService.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.

namespace Microsoft.VisualStudio.FSharp.Editor

open System.Composition
open System.Threading

open FSharp.Compiler.Text.Range

open Microsoft.CodeAnalysis
open Microsoft.CodeAnalysis.ExternalAccess.FSharp.GoToDefinition

open Microsoft.VisualStudio.Shell
open Microsoft.VisualStudio.Shell.Interop
open System.Collections.Immutable
open System.Threading.Tasks

[<Export(typeof<IFSharpFindDefinitionService>)>]
[<Export(typeof<FSharpFindDefinitionService>)>]
type internal FSharpFindDefinitionService
[<ImportingConstructor>]
(metadataAsSource: FSharpMetadataAsSourceService) =

let statusBar = StatusBar(ServiceProvider.GlobalProvider.GetService<SVsStatusbar,IVsStatusbar>())

interface IFSharpFindDefinitionService with
member _.FindDefinitionsAsync (document: Document, position: int, cancellationToken: CancellationToken) =
let navigation = FSharpNavigation(statusBar, metadataAsSource, document, rangeStartup)
let definitions = navigation.FindDefinitions(position, cancellationToken)
ImmutableArray.CreateRange(definitions) |> Task.FromResult
1 change: 0 additions & 1 deletion vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,6 @@ type internal FSharpNavigation
| FSharpGoToDefinitionResult.NavigableItem(navItem) -> Some navItem
| _ -> None
)
|> Task.FromResult

member _.TryGoToDefinition(position, cancellationToken) =
let gtd = GoToDefinition(metadataAsSource)
Expand Down
2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/Navigation/GoToDefinitionService.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ type internal FSharpGoToDefinitionService
/// Invoked with Peek Definition.
member _.FindDefinitionsAsync (document: Document, position: int, cancellationToken: CancellationToken) =
let navigation = FSharpNavigation(statusBar, metadataAsSource, document, rangeStartup)
navigation.FindDefinitions(position, cancellationToken)
navigation.FindDefinitions(position, cancellationToken) |> Task.FromResult

/// Invoked with Go to Definition.
/// Try to navigate to the definiton of the symbol at the symbolRange in the originDocument
Expand Down