Skip to content

Only process EmptyModuleOrNamespaces when showHeader is true. #13883

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 3 commits into from
Sep 14, 2022
Merged

Only process EmptyModuleOrNamespaces when showHeader is true. #13883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b99897a
Only process EmptyModuleOrNamespaces when showHeader is true.
nojaf Sep 12, 2022
cca1887
Update failing Cambridge tests.
nojaf Sep 13, 2022
20dec9f
Merge branch 'main' into empty-module-signature
dsyme Sep 14, 2022
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
2 changes: 1 addition & 1 deletion src/Compiler/Checking/NicePrint.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2433,7 +2433,7 @@ module InferredSigPrinting =
wordL (tagKeyword keyword) ^^ sepListL SepL.dot pathL

match expr with
| EmptyModuleOrNamespaces mspecs ->
| EmptyModuleOrNamespaces mspecs when showHeader ->
List.map emptyModuleOrNamespace mspecs
|> aboveListL
| expr -> imdefL denv expr
Expand Down
4 changes: 1 addition & 3 deletions tests/fsharp/core/load-script/out.stdout.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ World
-the end
Test 3=================================================

> module FSI_0001

[Loading D:\staging\staging\src\tests\fsharp\core\load-script\1.fsx
> [Loading D:\staging\staging\src\tests\fsharp\core\load-script\1.fsx
Loading D:\staging\staging\src\tests\fsharp\core\load-script\2.fsx
Loading D:\staging\staging\src\tests\fsharp\core\load-script\3.fsx]
Hello
Expand Down
6 changes: 1 addition & 5 deletions tests/fsharp/core/printing/output.1000.stdout.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@

module FSI_0001

> val it: unit = ()

> val repeatId: string = "A"
Expand Down Expand Up @@ -236,9 +234,7 @@ module D1 =
val words: System.Collections.Generic.IDictionary<string,int>
val words2000: System.Collections.Generic.IDictionary<int,string>

> module FSI_0020

> module D2 =
> > module D2 =
val words: IDictionary<string,int>
val words2000: IDictionary<int,string>
val opt1: 'a option
Expand Down
6 changes: 1 addition & 5 deletions tests/fsharp/core/printing/output.200.stdout.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@

module FSI_0001

> val it: unit = ()

> val repeatId: string = "A"
Expand Down Expand Up @@ -131,9 +129,7 @@ module D1 =
val words: System.Collections.Generic.IDictionary<string,int>
val words2000: System.Collections.Generic.IDictionary<int,string>

> module FSI_0020

> module D2 =
> > module D2 =
val words: IDictionary<string,int>
val words2000: IDictionary<int,string>
val opt1: 'a option
Expand Down
8 changes: 2 additions & 6 deletions tests/fsharp/core/printing/output.47.stdout.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@

> module FSI_0001

val repeatId: string = "A"
> val repeatId: string = "A"

> val repeatId: string = "B"

Expand Down Expand Up @@ -251,9 +249,7 @@ module D1 =
val words: System.Collections.Generic.IDictionary<string,int>
val words2000: System.Collections.Generic.IDictionary<int,string>

> module FSI_0019

> module D2 =
> > module D2 =
val words: IDictionary<string,int>
val words2000: IDictionary<int,string>
val opt1: 'a option
Expand Down
8 changes: 2 additions & 6 deletions tests/fsharp/core/printing/output.multiemit.stdout.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@

> module FSI_0001

val repeatId: string = "A"
> val repeatId: string = "A"

> val repeatId: string = "B"

Expand Down Expand Up @@ -251,9 +249,7 @@ module D1 =
val words: System.Collections.Generic.IDictionary<string,int>
val words2000: System.Collections.Generic.IDictionary<int,string>

> module FSI_0019

> module D2 =
> > module D2 =
val words: IDictionary<string,int>
val words2000: IDictionary<int,string>
val opt1: 'a option
Expand Down
6 changes: 1 addition & 5 deletions tests/fsharp/core/printing/output.off.stdout.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@

module FSI_0001

> val it: unit = ()

> val repeatId: string
Expand Down Expand Up @@ -96,9 +94,7 @@ module D1 =
val words: System.Collections.Generic.IDictionary<string,int>
val words2000: System.Collections.Generic.IDictionary<int,string>

> module FSI_0020

> module D2 =
> > module D2 =
val words: IDictionary<string,int>
val words2000: IDictionary<int,string>
val opt1: 'a option
Expand Down
8 changes: 2 additions & 6 deletions tests/fsharp/core/printing/output.stdout.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@

> module FSI_0001

val repeatId: string = "A"
> val repeatId: string = "A"

> val repeatId: string = "B"

Expand Down Expand Up @@ -251,9 +249,7 @@ module D1 =
val words: System.Collections.Generic.IDictionary<string,int>
val words2000: System.Collections.Generic.IDictionary<int,string>

> module FSI_0019

> module D2 =
> > module D2 =
val words: IDictionary<string,int>
val words2000: IDictionary<int,string>
val opt1: 'a option
Expand Down