Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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 formatting as best I can, plus some tests I guess
  • Loading branch information
cartermp committed Jun 21, 2019
commit d3da17189b1cb1c160d0582c8ae11c6f61997126
9 changes: 8 additions & 1 deletion src/fsharp/NicePrint.fs
Original file line number Diff line number Diff line change
Expand Up @@ -1727,7 +1727,14 @@ module private TastDefinitionPrinting =
match repr with
| TRecdRepr _ ->
let recdFieldRefL fld = layoutRecdField false denv fld
let recdL = tycon.TrueFieldsAsList |> List.map recdFieldRefL |> applyMaxMembers denv.maxMembers |> aboveListIndentOneL |> braceL

let recdL =
tycon.TrueFieldsAsList
|> List.map recdFieldRefL
|> applyMaxMembers denv.maxMembers
|> aboveListL
|> braceL

Some (addMembersAsWithEnd (addReprAccessL recdL))

| TFSharpObjectRepr r ->
Expand Down
5 changes: 0 additions & 5 deletions src/fsharp/layout.fs
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,6 @@ let aboveListL = function
| [x] -> x
| x :: ys -> List.fold (fun pre y -> pre @@ y) x ys

let aboveListIndentOneL = function
| [] -> emptyL
| [x] -> x
| x :: xs -> (x, xs) ||> List.fold (fun pre y -> pre @@- y)

let optionL xL = function
| None -> wordL (tagUnionCase "None")
| Some x -> wordL (tagUnionCase "Some") -- (xL x)
Expand Down
1 change: 0 additions & 1 deletion src/fsharp/layout.fsi
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ val bracketL : Layout -> Layout
val tupleL : Layout list -> Layout
val aboveL : Layout -> Layout -> Layout
val aboveListL : Layout list -> Layout
val aboveListIndentOneL : Layout list -> Layout

val optionL : ('a -> Layout) -> 'a option -> Layout
val listL : ('a -> Layout) -> 'a list -> Layout
Expand Down
30 changes: 15 additions & 15 deletions tests/fsharp/core/printing/z.output.test.1000.stdout.bsl
Original file line number Diff line number Diff line change
Expand Up @@ -1134,7 +1134,7 @@ end
| B

> type internal T2 =
{x: int;}
{ x: int }

> type internal T3

Expand All @@ -1148,28 +1148,28 @@ end
| B

> type T2 =
internal {x: int;}
internal { x: int }

> type private T1 =
| A
| B

> type private T2 =
{x: int;}
{ x: int }

> type T1 =
private | A
| B

> type T2 =
private {x: int;}
private { x: int }

> type internal T1 =
private | A
| B

> type internal T2 =
private {x: int;}
private { x: int }

> type private T3

Expand Down Expand Up @@ -1398,7 +1398,7 @@ val x1564_A3 : int = 3
| A
| B
type T2 =
{x: int;}
{ x: int }
type T3
type T4 =
class
Expand All @@ -1408,22 +1408,22 @@ val x1564_A3 : int = 3
| A
| B
type T6 =
{x: int;}
{ x: int }
type private T7 =
| A
| B
type private T8 =
{x: int;}
{ x: int }
type T9 =
private | A
| B
type T10 =
private {x: int;}
private { x: int }
type T11 =
private | A
| B
type T12 =
private {x: int;}
private { x: int }
type private T13
type private T14 =
class
Expand All @@ -1446,7 +1446,7 @@ module internal PrivateM = begin
| A
| B
type T2 =
{x: int;}
{ x: int }
type T3
type T4 =
class
Expand All @@ -1456,22 +1456,22 @@ module internal PrivateM = begin
| A
| B
type T6 =
{x: int;}
{ x: int }
type private T7 =
| A
| B
type private T8 =
{x: int;}
{ x: int }
type T9 =
private | A
| B
type T10 =
private {x: int;}
private { x: int }
type T11 =
private | A
| B
type T12 =
private {x: int;}
private { x: int }
type private T13
type private T14 =
class
Expand Down
30 changes: 15 additions & 15 deletions tests/fsharp/core/printing/z.output.test.200.stdout.bsl
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ end
| B

> type internal T2 =
{x: int;}
{ x: int }

> type internal T3

Expand All @@ -472,28 +472,28 @@ end
| B

> type T2 =
internal {x: int;}
internal { x: int }

> type private T1 =
| A
| B

> type private T2 =
{x: int;}
{ x: int }

> type T1 =
private | A
| B

> type T2 =
private {x: int;}
private { x: int }

> type internal T1 =
private | A
| B

> type internal T2 =
private {x: int;}
private { x: int }

> type private T3

Expand Down Expand Up @@ -647,7 +647,7 @@ val x1564_A3 : int = 3
| A
| B
type T2 =
{x: int;}
{ x: int }
type T3
type T4 =
class
Expand All @@ -657,22 +657,22 @@ val x1564_A3 : int = 3
| A
| B
type T6 =
{x: int;}
{ x: int }
type private T7 =
| A
| B
type private T8 =
{x: int;}
{ x: int }
type T9 =
private | A
| B
type T10 =
private {x: int;}
private { x: int }
type T11 =
private | A
| B
type T12 =
private {x: int;}
private { x: int }
type private T13
type private T14 =
class
Expand All @@ -695,7 +695,7 @@ module internal PrivateM = begin
| A
| B
type T2 =
{x: int;}
{ x: int }
type T3
type T4 =
class
Expand All @@ -705,22 +705,22 @@ module internal PrivateM = begin
| A
| B
type T6 =
{x: int;}
{ x: int }
type private T7 =
| A
| B
type private T8 =
{x: int;}
{ x: int }
type T9 =
private | A
| B
type T10 =
private {x: int;}
private { x: int }
type T11 =
private | A
| B
type T12 =
private {x: int;}
private { x: int }
type private T13
type private T14 =
class
Expand Down
30 changes: 15 additions & 15 deletions tests/fsharp/core/printing/z.output.test.default.stdout.bsl
Original file line number Diff line number Diff line change
Expand Up @@ -4072,7 +4072,7 @@ end
| B

> type internal T2 =
{x: int;}
{ x: int }

> type internal T3

Expand All @@ -4086,28 +4086,28 @@ end
| B

> type T2 =
internal {x: int;}
internal { x: int }

> type private T1 =
| A
| B

> type private T2 =
{x: int;}
{ x: int }

> type T1 =
private | A
| B

> type T2 =
private {x: int;}
private { x: int }

> type internal T1 =
private | A
| B

> type internal T2 =
private {x: int;}
private { x: int }

> type private T3

Expand Down Expand Up @@ -4924,7 +4924,7 @@ val x1564_A3 : int = 3
| A
| B
type T2 =
{x: int;}
{ x: int }
type T3
type T4 =
class
Expand All @@ -4934,22 +4934,22 @@ val x1564_A3 : int = 3
| A
| B
type T6 =
{x: int;}
{ x: int }
type private T7 =
| A
| B
type private T8 =
{x: int;}
{ x: int }
type T9 =
private | A
| B
type T10 =
private {x: int;}
private { x: int }
type T11 =
private | A
| B
type T12 =
private {x: int;}
private { x: int }
type private T13
type private T14 =
class
Expand All @@ -4972,7 +4972,7 @@ module internal PrivateM = begin
| A
| B
type T2 =
{x: int;}
{ x: int }
type T3
type T4 =
class
Expand All @@ -4982,22 +4982,22 @@ module internal PrivateM = begin
| A
| B
type T6 =
{x: int;}
{ x: int }
type private T7 =
| A
| B
type private T8 =
{x: int;}
{ x: int }
type T9 =
private | A
| B
type T10 =
private {x: int;}
private { x: int }
type T11 =
private | A
| B
type T12 =
private {x: int;}
private { x: int }
type private T13
type private T14 =
class
Expand Down
Loading