Skip to content

Clean navigation #6849

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
KevinRansom merged 2 commits into from
May 27, 2019
Merged

Clean navigation #6849

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
670d029
Remove need for IVT in ServiceNavigation
cartermp May 24, 2019
c0770c4
Apply Euguene's suggestions
cartermp May 24, 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
6 changes: 4 additions & 2 deletions src/fsharp/service/ServiceNavigation.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,10 +441,12 @@ module NavigationImpl =
items |> Array.sortInPlaceWith (fun a b -> compare a.Declaration.Name b.Declaration.Name)
new FSharpNavigationItems(items)

[<RequireQualifiedAccess>]
module FSharpNavigation =
let getNavigation (parsedInput: ParsedInput) =
match parsedInput with
| ParsedInput.SigFile (ParsedSigFileInput (modules = modules)) -> getNavigationFromSigFile modules
| ParsedInput.ImplFile (ParsedImplFileInput (modules = modules)) -> getNavigationFromImplFile modules
| ParsedInput.SigFile (ParsedSigFileInput (modules = modules)) -> NavigationImpl.getNavigationFromSigFile modules
| ParsedInput.ImplFile (ParsedImplFileInput (modules = modules)) -> NavigationImpl.getNavigationFromImplFile modules

let empty = FSharpNavigationItems([||])

Expand Down
8 changes: 3 additions & 5 deletions src/fsharp/service/ServiceNavigation.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,10 @@ type public FSharpNavigationTopLevelDeclaration =
type public FSharpNavigationItems =
member Declarations : FSharpNavigationTopLevelDeclaration[]

// implementation details used by other code in the compiler
module internal NavigationImpl =
val internal getNavigationFromImplFile : Ast.SynModuleOrNamespace list -> FSharpNavigationItems
val internal getNavigationFromSigFile : Ast.SynModuleOrNamespaceSig list -> FSharpNavigationItems
val internal getNavigation : Ast.ParsedInput -> FSharpNavigationItems
// Functionality to access navigable F# items.
module public FSharpNavigation =
val internal empty : FSharpNavigationItems
val getNavigation : Ast.ParsedInput -> FSharpNavigationItems

module public NavigateTo =
[<RequireQualifiedAccess>]
Expand Down
12 changes: 6 additions & 6 deletions src/fsharp/service/ServiceUntypedParse.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,15 @@ type FSharpParseFileResults(errors: FSharpErrorInfo[], input: Ast.ParsedInput op
ErrorScope.Protect Range.range0
(fun () ->
match input with
| Some (ParsedInput.ImplFile (ParsedImplFileInput (modules = modules))) ->
NavigationImpl.getNavigationFromImplFile modules
| Some (ParsedInput.SigFile (ParsedSigFileInput _)) ->
NavigationImpl.empty
| Some (ParsedInput.ImplFile _ as p) ->
FSharpNavigation.getNavigation p
| Some (ParsedInput.SigFile _) ->
FSharpNavigation.empty
| _ ->
NavigationImpl.empty )
FSharpNavigation.empty)
(fun err ->
Trace.TraceInformation(sprintf "FCS: recovering from error in GetNavigationItemsImpl: '%s'" err)
NavigationImpl.empty)
FSharpNavigation.empty)

member private scope.ValidateBreakpointLocationImpl pos =
let isMatchRange m = rangeContainsPos m pos || m.StartLine = pos.Line
Expand Down
6 changes: 2 additions & 4 deletions vsintegration/src/FSharp.Editor/Navigation/NavigationBarItemService.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@ open System.Composition
open System.Collections.Generic
open System.Threading.Tasks

open Microsoft.CodeAnalysis
open Microsoft.CodeAnalysis.Editor
open Microsoft.CodeAnalysis.Navigation
open Microsoft.CodeAnalysis.Host.Mef
open Microsoft.CodeAnalysis.Text
open Microsoft.CodeAnalysis.Notification

open FSharp.Compiler.SourceCodeServices
Expand All @@ -35,9 +33,9 @@ type internal FSharpNavigationBarItemService
let! parsingOptions, _options = projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document, cancellationToken)
let! sourceText = document.GetTextAsync(cancellationToken)
let! parsedInput = checkerProvider.Checker.ParseDocument(document, parsingOptions, sourceText=sourceText, userOpName=userOpName)
let navItems = NavigationImpl.getNavigation parsedInput
let navItems = FSharpNavigation.getNavigation parsedInput
let rangeToTextSpan range = RoslynHelpers.TryFSharpRangeToTextSpan(sourceText, range)
return
return
navItems.Declarations
|> Array.choose (fun topLevelDecl ->
rangeToTextSpan(topLevelDecl.Declaration.Range)
Expand Down