Skip to content

Commit 42c125e

Browse files
author
dotnet-automerge-bot
authored
Merge pull request #6878 from dotnet/merges/master-to-release/dev16.2
Merge master to release/dev16.2
2 parents 6b02b74 + cb51737 commit 42c125e

File tree

19 files changed

+83
-208
lines changed

19 files changed

+83
-208
lines changed

‎src/fsharp/service/ServiceNavigation.fs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,10 +441,12 @@ module NavigationImpl =
441441
items |> Array.sortInPlaceWith (fun a b -> compare a.Declaration.Name b.Declaration.Name)
442442
new FSharpNavigationItems(items)
443443

444+
[<RequireQualifiedAccess>]
445+
module FSharpNavigation =
444446
let getNavigation (parsedInput: ParsedInput) =
445447
match parsedInput with
446-
| ParsedInput.SigFile (ParsedSigFileInput (modules = modules)) -> getNavigationFromSigFile modules
447-
| ParsedInput.ImplFile (ParsedImplFileInput (modules = modules)) -> getNavigationFromImplFile modules
448+
| ParsedInput.SigFile (ParsedSigFileInput (modules = modules)) -> NavigationImpl.getNavigationFromSigFile modules
449+
| ParsedInput.ImplFile (ParsedImplFileInput (modules = modules)) -> NavigationImpl.getNavigationFromImplFile modules
448450

449451
let empty = FSharpNavigationItems([||])
450452

‎src/fsharp/service/ServiceNavigation.fsi‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,10 @@ type public FSharpNavigationTopLevelDeclaration =
6060
type public FSharpNavigationItems =
6161
member Declarations : FSharpNavigationTopLevelDeclaration[]
6262

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

7068
module public NavigateTo =
7169
[<RequireQualifiedAccess>]

‎src/fsharp/service/ServiceUntypedParse.fs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,15 @@ type FSharpParseFileResults(errors: FSharpErrorInfo[], input: Ast.ParsedInput op
111111
ErrorScope.Protect Range.range0
112112
(fun () ->
113113
match input with
114-
| Some (ParsedInput.ImplFile (ParsedImplFileInput (modules = modules))) ->
115-
NavigationImpl.getNavigationFromImplFile modules
116-
| Some (ParsedInput.SigFile (ParsedSigFileInput _)) ->
117-
NavigationImpl.empty
114+
| Some (ParsedInput.ImplFile _ as p) ->
115+
FSharpNavigation.getNavigation p
116+
| Some (ParsedInput.SigFile _) ->
117+
FSharpNavigation.empty
118118
| _ ->
119-
NavigationImpl.empty )
119+
FSharpNavigation.empty)
120120
(fun err ->
121121
Trace.TraceInformation(sprintf "FCS: recovering from error in GetNavigationItemsImpl: '%s'" err)
122-
NavigationImpl.empty)
122+
FSharpNavigation.empty)
123123

124124
member private scope.ValidateBreakpointLocationImpl pos =
125125
let isMatchRange m = rangeContainsPos m pos || m.StartLine = pos.Line

‎tests/fsharpqa/Source/CompilerOptions/fsc/gccerrors/comparer.fsx‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎tests/fsharpqa/Source/CompilerOptions/fsc/gccerrors/env.lst‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
ReqENU SOURCE=gccerrors01.fs COMPILE_ONLY=1 SCFLAGS="--gccerrors --nologo gccerrors01.fs >gccerrors01.txt" POSTCMD="\$FSI_PIPE --nologo --quiet --exec comparer.fsx gccerrors01.txt gccerrors01.bsl"
2-
3-
1+
ReqENU SOURCE=gccerrors01.fs COMPILE_ONLY=1 SCFLAGS="--gccerrors --nologo gccerrors01.fs >gccerrors01.txt" POSTCMD="\$FSI_PIPE --nologo --quiet --exec ..\\..\\..\\comparer.fsx gccerrors01.txt gccerrors01.bsl"

‎tests/fsharpqa/Source/CompilerOptions/fsc/help/comparer.fsx‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎tests/fsharpqa/Source/CompilerOptions/fsc/help/env.lst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ReqENU means that the test is non-localized
22

3-
ReqENU SOURCE=dummy.fsx COMPILE_ONLY=1 PRECMD="\$FSC_PIPE >help40.txt -? 2>&1" POSTCMD="\$FSI_PIPE --nologo --quiet --exec comparer.fsx help40.txt help40.437.1033.bsl" # -?
4-
ReqENU SOURCE=dummy.fsx COMPILE_ONLY=1 PRECMD="\$FSC_PIPE >help40.txt --help 2>&1" POSTCMD="\$FSI_PIPE --nologo --quiet --exec comparer.fsx help40.txt help40.437.1033.bsl" # --help
5-
ReqENU SOURCE=dummy.fsx COMPILE_ONLY=1 PRECMD="\$FSC_PIPE >help40.txt /? 2>&1" POSTCMD="\$FSI_PIPE --nologo --quiet --exec comparer.fsx help40.txt help40.437.1033.bsl" # /?
3+
ReqENU SOURCE=dummy.fsx COMPILE_ONLY=1 PRECMD="\$FSC_PIPE >help40.txt -? 2>&1" POSTCMD="\$FSI_PIPE --nologo --quiet --exec ..\\..\\..\\comparer.fsx help40.txt help40.437.1033.bsl" # -?
4+
ReqENU SOURCE=dummy.fsx COMPILE_ONLY=1 PRECMD="\$FSC_PIPE >help40.txt --help 2>&1" POSTCMD="\$FSI_PIPE --nologo --quiet --exec ..\\..\\..\\comparer.fsx help40.txt help40.437.1033.bsl" # --help
5+
ReqENU SOURCE=dummy.fsx COMPILE_ONLY=1 PRECMD="\$FSC_PIPE >help40.txt /? 2>&1" POSTCMD="\$FSI_PIPE --nologo --quiet --exec ..\\..\\..\\comparer.fsx help40.txt help40.437.1033.bsl" # /?
66

‎tests/fsharpqa/Source/CompilerOptions/fsc/nologo/comparer.fsx‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎tests/fsharpqa/Source/CompilerOptions/fsc/nologo/env.lst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Not really related to the --nologo option
22

3-
ReqENU SOURCE=dummy.fsx COMPILE_ONLY=1 PRECMD="\$FSC_PIPE >logo.txt 2>&1 || time /t" POSTCMD="\$FSI_PIPE --nologo --quiet --exec comparer.fsx logo.txt logo.437.1033.bsl" # fsc
4-
ReqENU SOURCE=dummy.fsx COMPILE_ONLY=1 PRECMD="\$FSC_PIPE >nologo.txt --nologo 2>&1 || time /t" POSTCMD="\$FSI_PIPE --nologo --quiet --exec comparer.fsx nologo.txt nologo.437.1033.bsl" # fsc --nologo
3+
ReqENU SOURCE=dummy.fsx COMPILE_ONLY=1 PRECMD="\$FSC_PIPE >logo.txt 2>&1 || time /t" POSTCMD="\$FSI_PIPE --nologo --quiet --exec ..\\..\\..\\comparer.fsx logo.txt logo.437.1033.bsl" # fsc
4+
ReqENU SOURCE=dummy.fsx COMPILE_ONLY=1 PRECMD="\$FSC_PIPE >nologo.txt --nologo 2>&1 || time /t" POSTCMD="\$FSI_PIPE --nologo --quiet --exec ..\\..\\..\\comparer.fsx nologo.txt nologo.437.1033.bsl" # fsc --nologo
55

66

77

‎tests/fsharpqa/Source/CompilerOptions/fsi/exename/comparer.fsx‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)