Skip to content

Roslyn Shim - Round 2 #6734

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
brettfo merged 23 commits into from
Jun 13, 2019
Merged

Roslyn Shim - Round 2 #6734

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8a39f54
Added shims over document diagnostic analyzers
TIHan May 7, 2019
089d60c
Shims over completions and sig help
TIHan May 8, 2019
aefc92e
Removed content type definitions, putting them in external access
TIHan May 8, 2019
9f8ec0b
Added shim over InlineRenameService
TIHan May 8, 2019
39d88b5
We are now simply using export on the diagnostic analyzers
TIHan May 8, 2019
5924f70
Using shim for document highlights service
TIHan May 8, 2019
acbe40a
GoToDefinition implemented with shims
TIHan May 26, 2019
471e4d3
NavigableSymbolsService shimmed
TIHan May 26, 2019
40b8b2d
GoToDefinitionService shimmed
TIHan May 26, 2019
53c0461
NavigationBarItemService shimmmed
TIHan May 26, 2019
78663ae
Shimmed NavigateToSearchService
TIHan May 26, 2019
540d30d
Quick cast fix
TIHan May 26, 2019
f45d179
Using FSharpGlyphTags
TIHan May 26, 2019
0d24cab
Removed CommentSelectionService as it is ExternalAccess now
TIHan May 26, 2019
f07a689
Shimmed BlockStructureService
TIHan May 26, 2019
8a30a1d
Trying to finish shim
TIHan May 26, 2019
eb0b351
Merge branch 'release/dev16.2' into roslyn-shim-v2
TIHan May 26, 2019
b338bd7
Removed folder from FSharp.Editor
TIHan May 28, 2019
53aa912
Update package
TIHan Jun 12, 2019
cf35794
merging latest
TIHan Jun 12, 2019
1104891
fixing build
TIHan Jun 12, 2019
2fef9b5
Trying to fix build
TIHan Jun 12, 2019
55953d2
match roslyn package version
brettfo Jun 13, 2019
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
Prev Previous commit
Next Next commit
GoToDefinition implemented with shims
  • Loading branch information
@TIHan
TIHan committed May 26, 2019
commit acbe40aa17dbe39f35a5b467e4a444ae418aed43
26 changes: 8 additions & 18 deletions vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ open Microsoft.CodeAnalysis
open Microsoft.CodeAnalysis.FindSymbols
open Microsoft.CodeAnalysis.Text
open Microsoft.CodeAnalysis.Navigation
open Microsoft.CodeAnalysis.ExternalAccess.FSharp.Navigation

open Microsoft.VisualStudio.Shell.Interop

Expand Down Expand Up @@ -105,16 +106,6 @@ module private ExternalSymbol =

| _ -> []

type internal FSharpNavigableItem(document: Document, textSpan: TextSpan) =
interface INavigableItem with
member __.Glyph = Glyph.BasicFile
member __.DisplayFileLocation = true
member __.IsImplicitlyDeclared = false
member __.Document = document
member __.SourceSpan = textSpan
member __.DisplayTaggedParts = ImmutableArray<TaggedText>.Empty
member __.ChildItems = ImmutableArray<INavigableItem>.Empty

// TODO: Uncomment code when VS has a fix for updating the status bar.
type internal StatusBar(statusBar: IVsStatusbar) =
let mutable _searchIcon = int16 Microsoft.VisualStudio.Shell.Interop.Constants.SBAI_Find :> obj
Expand Down Expand Up @@ -335,7 +326,7 @@ type internal GoToDefinition(checker: FSharpChecker, projectInfoManager: FSharpP
member this.FindDefinitionsForPeekTask(originDocument: Document, position: int, cancellationToken: CancellationToken) =
this.FindDefinitionAtPosition(originDocument, position)
|> Async.map (
Option.map (fun (navItem, _) -> (navItem :> INavigableItem))
Option.map (fun (navItem, _) -> navItem)
>> Option.toArray
>> Array.toSeq)
|> RoslynHelpers.StartAsyncAsTask cancellationToken
Expand All @@ -344,31 +335,30 @@ type internal GoToDefinition(checker: FSharpChecker, projectInfoManager: FSharpP
/// at the provided position in the document.
member this.FindDefinitionTask(originDocument: Document, position: int, cancellationToken: CancellationToken) =
this.FindDefinitionAtPosition(originDocument, position)
|> Async.map (Option.map (fun (navItem, range) -> (navItem :> INavigableItem, range)))
|> RoslynHelpers.StartAsyncAsTask cancellationToken

/// Navigate to the positon of the textSpan in the provided document
/// used by quickinfo link navigation when the tooltip contains the correct destination range.
member __.TryNavigateToTextSpan(document: Document, textSpan: TextSpan, statusBar: StatusBar) =
let navigableItem = FSharpNavigableItem(document, textSpan) :> INavigableItem
let navigableItem = FSharpNavigableItem(document, textSpan)
let workspace = document.Project.Solution.Workspace
let navigationService = workspace.Services.GetService<IDocumentNavigationService>()
let options = workspace.Options.WithChangedOption(NavigationOptions.PreferProvisionalTab, true)
let navigationService = workspace.Services.GetService<IFSharpDocumentNavigationService>()
let options = workspace.Options.WithChangedOption(FSharpNavigationOptions.PreferProvisionalTab, true)
let navigationSucceeded = navigationService.TryNavigateToSpan(workspace, navigableItem.Document.Id, navigableItem.SourceSpan, options)

if not navigationSucceeded then
statusBar.TempMessage (SR.CannotNavigateUnknown())

member __.NavigateToItem(navigableItem: #INavigableItem, statusBar: StatusBar) =
member __.NavigateToItem(navigableItem: FSharpNavigableItem, statusBar: StatusBar) =
use __ = statusBar.Animate()

statusBar.Message (SR.NavigatingTo())

let workspace = navigableItem.Document.Project.Solution.Workspace
let navigationService = workspace.Services.GetService<IDocumentNavigationService>()
let navigationService = workspace.Services.GetService<IFSharpDocumentNavigationService>()

// Prefer open documents in the preview tab.
let options = workspace.Options.WithChangedOption(NavigationOptions.PreferProvisionalTab, true)
let options = workspace.Options.WithChangedOption(FSharpNavigationOptions.PreferProvisionalTab, true)
let result = navigationService.TryNavigateToSpan(workspace, navigableItem.Document.Id, navigableItem.SourceSpan, options)

if result then
Expand Down