Skip to content

Better record and value formatting in tools #7021

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 25 commits into from
Jul 12, 2019
Merged

Better record and value formatting in tools #7021

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f4a8989
Remove semicolons from record tooltips
cartermp Jun 19, 2019
287ec1b
Update to put a space between braces
cartermp Jun 19, 2019
d3da171
Update formatting as best I can, plus some tests I guess
cartermp Jun 21, 2019
e2301d1
More baseline updates
cartermp Jun 21, 2019
cf27d2d
Anonymous records
cartermp Jun 21, 2019
ba29759
Merge branch 'no-semicolons' of https://github.com/cartermp/visualfsh…
cartermp Jun 21, 2019
af6bfc9
Update anon records tests
cartermp Jun 21, 2019
72503b9
Add vsbsl lol
cartermp Jul 5, 2019
e5cb6f8
Update baselines and reduce a simple filter
cartermp Jul 5, 2019
c5c9911
Update baselines maybe last time
cartermp Jul 5, 2019
0d593af
Update fsharpqa test
cartermp Jul 5, 2019
de91701
make tests pass
cartermp Jul 8, 2019
09207bd
Add formatting for values
cartermp Jul 10, 2019
77f2236
Update tests
cartermp Jul 10, 2019
b7532e1
Update test
cartermp Jul 10, 2019
391ec6d
Update fsharpqa tests
cartermp Jul 10, 2019
6f72f04
tryit
cartermp Jul 10, 2019
4bb4475
lol
cartermp Jul 11, 2019
b10a070
get yote
cartermp Jul 11, 2019
f2eb0f1
shlerp
cartermp Jul 11, 2019
a81a4b5
Merge branch 'master' into no-semicolons
cartermp Jul 11, 2019
1f55588
Update tests again I guess
cartermp Jul 11, 2019
ff5fd13
more update
cartermp Jul 11, 2019
e17b855
mother of pearl
cartermp Jul 11, 2019
43c1cd1
this is a real turd
cartermp Jul 11, 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
Update tests
  • Loading branch information
@cartermp
cartermp committed Jul 10, 2019
commit 77f223610b35decde8196334a9fe0806d6fec5f6
4 changes: 2 additions & 2 deletions tests/fsharp/core/anon/lib.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ module KindB1 =
check "coijoiwcnkwle1" {| a = 1 |} {| a = 1 |}
check "coijoiwcnkwle2" {| a = 2 |} {| a = 2 |}

check "coijoiwcnkwle3" (sprintf "%A" {| X = 10 |}) "{X = 10;}"
check "coijoiwcnkwle4" (sprintf "%A" {| X = 10; Y = 1 |} |> fun s -> s.Replace("\n","").Replace("\r","")) ("{X = 10; Y = 1;}".Replace("\n","").Replace("\r",""))
check "coijoiwcnkwle3" (sprintf "%A" {| X = 10 |}) "{ X = 10 }"
check "coijoiwcnkwle4" (sprintf "%A" {| X = 10; Y = 1 |} |> fun s -> s.Replace("\n","").Replace("\r","")) ("{ X = 10 Y = 1}".Replace("\n","").Replace("\r",""))
check "clekoiew09" (f2 {| X = {| X = 10 |} |}) 10
check "cewkew0oijew" (f2 {| X = {| X = 20 |} |}) 20

Expand Down
2 changes: 1 addition & 1 deletion tests/fsharp/core/anon/test.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ module CrossAssemblyTest =
check "vrknvio1" (SampleAPI.SampleFunction {| A=1; B = "abc" |}) 4 // note, this is creating an instance of an anonymous record from another assembly.
check "vrknvio2" (SampleAPI.SampleFunctionAcceptingList [ {| A=1; B = "abc" |}; {| A=2; B = "def" |} ]) [4; 5] // note, this is creating an instance of an anonymous record from another assembly.
check "vrknvio3" (let d = SampleAPI.SampleFunctionReturningAnonRecd() in d.A + d.B.Length) 4
check "vrknvio4" (let d = SampleAPIStruct.SampleFunctionReturningAnonRecd() in d.ToString().Replace("\n","").Replace("\r","")) """{A = 1; B = "abc";}"""
check "vrknvio4" (let d = SampleAPIStruct.SampleFunctionReturningAnonRecd() in d.ToString().Replace("\n","").Replace("\r","")) """{ A = 1 B = "abc" }"""
tests()

module CrossAssemblyTestStruct =
Expand Down
214 changes: 107 additions & 107 deletions tests/fsharp/core/printing/z.output.test.1000.stdout.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ type T =
end
val f_as_method : x:int -> int
val f_as_thunk : (int -> int)
val refCell : string ref = {contents = "value";}
val refCell : string ref = { contents = "value" }
module D1 = begin
val words : System.Collections.Generic.IDictionary<string,int>
val words2000 : System.Collections.Generic.IDictionary<int,string>
Expand Down Expand Up @@ -1243,111 +1243,111 @@ type 'a T1Pre with
f7: int
f8: int
f9: int }
val r10 : r = {f0 = 0;
f1 = 1;
f2 = 2;
f3 = 3;
f4 = 4;
f5 = 5;
f6 = 6;
f7 = 7;
f8 = 8;
f9 = 9;}
val r10 : r = { f0 = 0
f1 = 1
f2 = 2
f3 = 3
f4 = 4
f5 = 5
f6 = 6
f7 = 7
f8 = 8
f9 = 9 }
val r10s : r [] =
[|{f0 = 0;
f1 = 1;
f2 = 2;
f3 = 3;
f4 = 4;
f5 = 5;
f6 = 6;
f7 = 7;
f8 = 8;
f9 = 9;}; {f0 = 0;
f1 = 1;
f2 = 2;
f3 = 3;
f4 = 4;
f5 = 5;
f6 = 6;
f7 = 7;
f8 = 8;
f9 = 9;}; {f0 = 0;
f1 = 1;
f2 = 2;
f3 = 3;
f4 = 4;
f5 = 5;
f6 = 6;
f7 = 7;
f8 = 8;
f9 = 9;}; {f0 = 0;
f1 = 1;
f2 = 2;
f3 = 3;
f4 = 4;
f5 = 5;
f6 = 6;
f7 = 7;
f8 = 8;
f9 = 9;}; {f0 = 0;
f1 = 1;
f2 = 2;
f3 = 3;
f4 = 4;
f5 = 5;
f6 = 6;
f7 = 7;
f8 = 8;
f9 = 9;}; ...|]
[|{ f0 = 0
f1 = 1
f2 = 2
f3 = 3
f4 = 4
f5 = 5
f6 = 6
f7 = 7
f8 = 8
f9 = 9 }; { f0 = 0
f1 = 1
f2 = 2
f3 = 3
f4 = 4
f5 = 5
f6 = 6
f7 = 7
f8 = 8
f9 = 9 }; { f0 = 0
f1 = 1
f2 = 2
f3 = 3
f4 = 4
f5 = 5
f6 = 6
f7 = 7
f8 = 8
f9 = 9 }; { f0 = 0
f1 = 1
f2 = 2
f3 = 3
f4 = 4
f5 = 5
f6 = 6
f7 = 7
f8 = 8
f9 = 9 }; { f0 = 0
f1 = 1
f2 = 2
f3 = 3
f4 = 4
f5 = 5
f6 = 6
f7 = 7
f8 = 8
f9 = 9 }; ...|]
val r10s' : string * r [] =
("one extra node",
[|{f0 = 0;
f1 = 1;
f2 = 2;
f3 = 3;
f4 = 4;
f5 = 5;
f6 = 6;
f7 = 7;
f8 = 8;
f9 = 9;}; {f0 = 0;
f1 = 1;
f2 = 2;
f3 = 3;
f4 = 4;
f5 = 5;
f6 = 6;
f7 = 7;
f8 = 8;
f9 = 9;}; {f0 = 0;
f1 = 1;
f2 = 2;
f3 = 3;
f4 = 4;
f5 = 5;
f6 = 6;
f7 = 7;
f8 = 8;
f9 = 9;}; {f0 = 0;
f1 = 1;
f2 = 2;
f3 = 3;
f4 = 4;
f5 = 5;
f6 = 6;
f7 = 7;
f8 = 8;
f9 = 9;}; {f0 = 0;
f1 = 1;
f2 = 2;
f3 = 3;
f4 = 4;
f5 = 5;
f6 = 6;
f7 = 7;
f8 = 8;
f9 = ...;}; ...|])
[|{ f0 = 0
f1 = 1
f2 = 2
f3 = 3
f4 = 4
f5 = 5
f6 = 6
f7 = 7
f8 = 8
f9 = 9 }; { f0 = 0
f1 = 1
f2 = 2
f3 = 3
f4 = 4
f5 = 5
f6 = 6
f7 = 7
f8 = 8
f9 = 9 }; { f0 = 0
f1 = 1
f2 = 2
f3 = 3
f4 = 4
f5 = 5
f6 = 6
f7 = 7
f8 = 8
f9 = 9 }; { f0 = 0
f1 = 1
f2 = 2
f3 = 3
f4 = 4
f5 = 5
f6 = 6
f7 = 7
f8 = 8
f9 = 9 }; { f0 = 0
f1 = 1
f2 = 2
f3 = 3
f4 = 4
f5 = 5
f6 = 6
f7 = 7
f8 = 8
f9 = ... }; ...|])

> val x1564_A1 : int = 1

Expand Down Expand Up @@ -1806,9 +1806,9 @@ module Regression1019_long = begin
val single_infinity : float32 = infinityf
end

> val it : int ref = {contents = 1;}
> val it : int ref = { contents = 1 }

> val x : int ref = {contents = 1;}
> val x : int ref = { contents = 1 }
val f : (unit -> int)

> val it : int = 1
Expand Down Expand Up @@ -2733,10 +2733,10 @@ val namedEx2 : exn = MyNamedException7 25

> type optionRecord =
{ x: int option }
val x : optionRecord = {x = None;}
val x : optionRecord = { x = None }

> type optionRecord =
{ x: obj }
val x : optionRecord = {x = null;}
val x : optionRecord = { x = null }

> > >
70 changes: 35 additions & 35 deletions tests/fsharp/core/printing/z.output.test.200.stdout.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ type T =
end
val f_as_method : x:int -> int
val f_as_thunk : (int -> int)
val refCell : string ref = {contents = "value";}
val refCell : string ref = { contents = "value" }
module D1 = begin
val words : System.Collections.Generic.IDictionary<string,int>
val words2000 : System.Collections.Generic.IDictionary<int,string>
Expand Down Expand Up @@ -567,36 +567,36 @@ type 'a T1Pre with
f7: int
f8: int
f9: int }
val r10 : r = {f0 = 0;
f1 = 1;
f2 = 2;
f3 = 3;
f4 = 4;
f5 = 5;
f6 = 6;
f7 = 7;
f8 = 8;
f9 = 9;}
val r10s : r [] = [|{f0 = 0;
f1 = 1;
f2 = 2;
f3 = 3;
f4 = 4;
f5 = 5;
f6 = 6;
f7 = 7;
f8 = 8;
f9 = 9;}; ...|]
val r10s' : string * r [] = ("one extra node", [|{f0 = 0;
f1 = 1;
f2 = 2;
f3 = 3;
f4 = 4;
f5 = 5;
f6 = 6;
f7 = 7;
f8 = 8;
f9 = ...;}; ...|])
val r10 : r = { f0 = 0
f1 = 1
f2 = 2
f3 = 3
f4 = 4
f5 = 5
f6 = 6
f7 = 7
f8 = 8
f9 = 9 }
val r10s : r [] = [|{ f0 = 0
f1 = 1
f2 = 2
f3 = 3
f4 = 4
f5 = 5
f6 = 6
f7 = 7
f8 = 8
f9 = 9 }; ...|]
val r10s' : string * r [] = ("one extra node", [|{ f0 = 0
f1 = 1
f2 = 2
f3 = 3
f4 = 4
f5 = 5
f6 = 6
f7 = 7
f8 = 8
f9 = ... }; ...|])

> val x1564_A1 : int = 1

Expand Down Expand Up @@ -1055,9 +1055,9 @@ module Regression1019_long = begin
val single_infinity : float32 = infinityf
end

> val it : int ref = {contents = 1;}
> val it : int ref = { contents = 1 }

> val x : int ref = {contents = 1;}
> val x : int ref = { contents = 1 }
val f : (unit -> int)

> val it : int = 1
Expand Down Expand Up @@ -1982,10 +1982,10 @@ val namedEx2 : exn = MyNamedException7 25

> type optionRecord =
{ x: int option }
val x : optionRecord = {x = None;}
val x : optionRecord = { x = None }

> type optionRecord =
{ x: obj }
val x : optionRecord = {x = null;}
val x : optionRecord = { x = null }

> > >
Loading