Skip to content

Commit ed95668

Browse files
nojafnojaf
authored
Indent next argument in function signature if previous was tupled. (#13359)
* Indent next argument in function signature if previous was tupled. * Always indent first parameter in function type.
1 parent 03a4329 commit ed95668

File tree

9 files changed

+204
-105
lines changed

9 files changed

+204
-105
lines changed

‎src/Compiler/Checking/NicePrint.fs‎

Lines changed: 42 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -72,46 +72,61 @@ module internal PrintUtilities =
7272
//
7373
// val SampleFunctionTupledAllBreakA:
7474
// longLongLongArgName1: string * longLongLongArgName2: TType *
75-
// longLongLongArgName3: TType * longLongLongArgName4: TType
76-
// -> TType list
75+
// longLongLongArgName3: TType * longLongLongArgName4: TType ->
76+
// TType list
7777
//
7878
// val SampleFunctionTupledAllBreakA:
7979
// longLongLongArgName1: string *
8080
// longLongLongArgName2: TType *
8181
// longLongLongArgName3: TType *
82-
// longLongLongArgName4: TType
83-
// -> TType list
82+
// longLongLongArgName4: TType ->
83+
// TType list
8484
//
8585
// val SampleFunctionCurriedOneBreakA:
86-
// arg1: string -> arg2: TType -> arg3: TType
87-
// -> arg4: TType -> TType list
86+
// arg1: string -> arg2: TType -> arg3: TType ->
87+
// arg4: TType -> TType list
8888
//
8989
// val SampleFunctionCurriedAllBreaksA:
90-
// longLongLongArgName1: string
91-
// -> longLongLongArgName2: TType
92-
// -> longLongLongArgName3: TType
93-
// -> longLongLongArgName4: TType
94-
// -> TType list
90+
// longLongLongArgName1: string ->
91+
// longLongLongArgName2: TType ->
92+
// longLongLongArgName3: TType ->
93+
// longLongLongArgName4: TType ->
94+
// TType list
9595
//
9696
// val SampleFunctionMixedA:
9797
// longLongLongArgName1: string *
98-
// longLongLongArgName2: string
99-
// -> longLongLongArgName3: string *
100-
// longLongLongArgName4: string *
101-
// longLongLongArgName5: TType
102-
// -> longLongLongArgName6: TType *
103-
// longLongLongArgName7: TType *
104-
// -> longLongLongArgName8: TType *
105-
// longLongLongArgName9: TType *
106-
// longLongLongArgName10: TType
107-
// -> TType list
98+
// longLongLongArgName2: string ->
99+
// longLongLongArgName3: string *
100+
// longLongLongArgName4: string *
101+
// longLongLongArgName5: TType ->
102+
// longLongLongArgName6: TType *
103+
// longLongLongArgName7: TType ->
104+
// longLongLongArgName8: TType *
105+
// longLongLongArgName9: TType *
106+
// longLongLongArgName10: TType ->
107+
// TType list
108108
let curriedLayoutsL retTyDelim (argTysL: Layout list) (retTyL: Layout) =
109-
let arrowAndRetyL = wordL (tagPunctuation retTyDelim) ^^ retTyL
110-
let argTysL =
111-
argTysL
112-
|> List.mapi (fun i argTyL -> if i = 0 then argTyL else wordL (tagPunctuation "->") ^^ argTyL)
113-
|> List.reduce (++)
114-
argTysL --- arrowAndRetyL
109+
let lastIndex = List.length argTysL - 1
110+
111+
argTysL
112+
|> List.mapi (fun idx argTyL ->
113+
let isTupled =
114+
idx = 0 ||
115+
match argTyL with
116+
| Node(leftLayout = Node(rightLayout = Leaf (text = starText))) -> starText.Text = "*"
117+
| _ -> false
118+
119+
let layout =
120+
argTyL
121+
^^ (if idx = lastIndex then
122+
wordL (tagPunctuation retTyDelim)
123+
else
124+
wordL (tagPunctuation "->"))
125+
126+
isTupled, layout)
127+
|> List.rev
128+
|> fun reversedArgs -> (true, retTyL) :: reversedArgs
129+
|> List.fold (fun acc (shouldBreak, layout) -> (if shouldBreak then (---) else (++)) layout acc) emptyL
115130

116131
let tagNavArbValRef (valRefOpt: ValRef option) tag =
117132
match valRefOpt with

‎tests/fsharp/core/mixCurriedTupled/test.fsx‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
module Foo
2+
3+
type Context = { Name: string }
4+
5+
let veryLongFunctionNameWithATupleAsArgumentThatWillReallyUseALotOfSpaceInTheGeneratedSignatureFile
6+
(justAString: string,
7+
suuuuuuuuuuuuuuuperLoooooooooooooooooooooooooooooooooooooooooooooooooongIntegerNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaame: int)
8+
(ctx: Context)
9+
: Context -> Context =
10+
id
11+
12+
type TType = obj
13+
14+
let SampleFunctionTupledAllBreakA
15+
(
16+
longLongLongArgName1: string,
17+
longLongLongArgName2: TType,
18+
longLongLongArgName3: TType,
19+
longLongLongArgName4: TType
20+
) : TType list =
21+
[]
22+
23+
let SampleFunctionCurriedAllBreaksA
24+
(longLongLongArgName1: string)
25+
(longLongLongArgName2: TType)
26+
(longLongLongArgName3: TType)
27+
(longLongLongArgName4: TType)
28+
: TType list =
29+
[]
30+
31+
let SampleFunctionMixedA
32+
(longLongLongArgName1: string, longLongLongArgName2: string)
33+
(longLongLongArgName3: string, longLongLongArgName4: string, longLongLongArgName5: TType)
34+
(longLongLongArgName6: TType, longLongLongArgName7: TType)
35+
(longLongLongArgName8: TType, longLongLongArgName9: TType, longLongLongArgName10: TType)
36+
: TType list =
37+
[]
38+
39+
type Meh =
40+
abstract member ResolveDependencies:
41+
scriptDirectory1: string *
42+
scriptDirectory2: string *
43+
scriptDirectory3: string *
44+
scriptDirectory4: string *
45+
scriptName: string *
46+
scriptExt: string *
47+
timeout: int ->
48+
obj
49+
50+
abstract member SomethingElse:
51+
int ->
52+
string ->
53+
string ->
54+
System.DateTime ->
55+
System.Action ->
56+
int array ->
57+
obj ->
58+
System.Collections.Generic.Comparer<int>
59+
60+
type AlternativeMeh() =
61+
member this.ResolveDependencies
62+
(scriptDirectory: string, scriptName: string)
63+
(otherDirectory1: string, otherDirectory2: string, otherDirectory3: string, otherDirectory4: string)
64+
(nicerScriptName: string, scriptExt: string, timeout: int)
65+
: obj =
66+
null
67+
68+
let somethingTupledReturingSomethingTupled
69+
(
70+
a: int,
71+
b: int,
72+
c: int,
73+
d: int,
74+
e: int,
75+
f: int,
76+
g: int,
77+
h: int,
78+
j: int,
79+
k: int
80+
) =
81+
(a, b, c)

‎tests/fsharp/core/printing/output.1000.stdout.bsl‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2630,28 +2630,28 @@ type System.Int32 with
26302630

26312631
> val functionWhichTakesLongNameMixedParameters:
26322632
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int *
2633-
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int
2634-
-> ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int *
2635-
dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int
2636-
-> int
2633+
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int ->
2634+
ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int *
2635+
dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int ->
2636+
int
26372637

26382638
> val functionWhichTakesLongNameTupledParameters:
26392639
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int *
26402640
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int *
26412641
ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int *
2642-
ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int
2643-
-> int
2642+
ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int ->
2643+
int
26442644

26452645
> val functionWhichTakesLongNameCurriedParameters:
2646-
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int
2647-
-> bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int
2648-
-> cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int
2649-
-> dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int
2650-
-> int
2646+
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int ->
2647+
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int ->
2648+
cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int ->
2649+
dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int ->
2650+
int
26512651

26522652
> val functionWhichTakesMixedLengthCurriedParametersA:
2653-
a: 'a -> b: 'b -> c: 'c -> ddddddddddddddddddddddddddddddddddddddddddddd: 'd
2654-
-> int
2653+
a: 'a ->
2654+
b: 'b -> c: 'c -> ddddddddddddddddddddddddddddddddddddddddddddd: 'd -> int
26552655

26562656
> val functionWhichTakesMixedLengthCurriedParametersB:
26572657
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: 'a -> b: 'b -> c: 'c -> d: 'd -> int

‎tests/fsharp/core/printing/output.200.stdout.bsl‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1875,28 +1875,28 @@ type System.Int32 with
18751875

18761876
> val functionWhichTakesLongNameMixedParameters:
18771877
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int *
1878-
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int
1879-
-> ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int *
1880-
dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int
1881-
-> int
1878+
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int ->
1879+
ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int *
1880+
dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int ->
1881+
int
18821882

18831883
> val functionWhichTakesLongNameTupledParameters:
18841884
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int *
18851885
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int *
18861886
ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int *
1887-
ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int
1888-
-> int
1887+
ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int ->
1888+
int
18891889

18901890
> val functionWhichTakesLongNameCurriedParameters:
1891-
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int
1892-
-> bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int
1893-
-> cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int
1894-
-> dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int
1895-
-> int
1891+
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int ->
1892+
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int ->
1893+
cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int ->
1894+
dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int ->
1895+
int
18961896

18971897
> val functionWhichTakesMixedLengthCurriedParametersA:
1898-
a: 'a -> b: 'b -> c: 'c -> ddddddddddddddddddddddddddddddddddddddddddddd: 'd
1899-
-> int
1898+
a: 'a ->
1899+
b: 'b -> c: 'c -> ddddddddddddddddddddddddddddddddddddddddddddd: 'd -> int
19001900

19011901
> val functionWhichTakesMixedLengthCurriedParametersB:
19021902
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: 'a -> b: 'b -> c: 'c -> d: 'd -> int

‎tests/fsharp/core/printing/output.47.stdout.bsl‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6175,28 +6175,28 @@ type System.Int32 with
61756175

61766176
> val functionWhichTakesLongNameMixedParameters:
61776177
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int *
6178-
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int
6179-
-> ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int *
6180-
dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int
6181-
-> int
6178+
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int ->
6179+
ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int *
6180+
dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int ->
6181+
int
61826182

61836183
> val functionWhichTakesLongNameTupledParameters:
61846184
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int *
61856185
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int *
61866186
ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int *
6187-
ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int
6188-
-> int
6187+
ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int ->
6188+
int
61896189

61906190
> val functionWhichTakesLongNameCurriedParameters:
6191-
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int
6192-
-> bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int
6193-
-> cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int
6194-
-> dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int
6195-
-> int
6191+
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int ->
6192+
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int ->
6193+
cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int ->
6194+
dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int ->
6195+
int
61966196

61976197
> val functionWhichTakesMixedLengthCurriedParametersA:
6198-
a: 'a -> b: 'b -> c: 'c -> ddddddddddddddddddddddddddddddddddddddddddddd: 'd
6199-
-> int
6198+
a: 'a ->
6199+
b: 'b -> c: 'c -> ddddddddddddddddddddddddddddddddddddddddddddd: 'd -> int
62006200

62016201
> val functionWhichTakesMixedLengthCurriedParametersB:
62026202
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: 'a -> b: 'b -> c: 'c -> d: 'd -> int

‎tests/fsharp/core/printing/output.multiemit.stdout.bsl‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6177,28 +6177,28 @@ type System.Int32 with
61776177

61786178
> val functionWhichTakesLongNameMixedParameters:
61796179
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int *
6180-
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int
6181-
-> ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int *
6182-
dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int
6183-
-> int
6180+
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int ->
6181+
ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int *
6182+
dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int ->
6183+
int
61846184

61856185
> val functionWhichTakesLongNameTupledParameters:
61866186
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int *
61876187
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int *
61886188
ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int *
6189-
ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int
6190-
-> int
6189+
ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int ->
6190+
int
61916191

61926192
> val functionWhichTakesLongNameCurriedParameters:
6193-
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int
6194-
-> bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int
6195-
-> cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int
6196-
-> dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int
6197-
-> int
6193+
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int ->
6194+
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int ->
6195+
cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int ->
6196+
dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int ->
6197+
int
61986198

61996199
> val functionWhichTakesMixedLengthCurriedParametersA:
6200-
a: 'a -> b: 'b -> c: 'c -> ddddddddddddddddddddddddddddddddddddddddddddd: 'd
6201-
-> int
6200+
a: 'a ->
6201+
b: 'b -> c: 'c -> ddddddddddddddddddddddddddddddddddddddddddddd: 'd -> int
62026202

62036203
> val functionWhichTakesMixedLengthCurriedParametersB:
62046204
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: 'a -> b: 'b -> c: 'c -> d: 'd -> int

‎tests/fsharp/core/printing/output.off.stdout.bsl‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1645,28 +1645,28 @@ type System.Int32 with
16451645

16461646
> val functionWhichTakesLongNameMixedParameters:
16471647
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int *
1648-
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int
1649-
-> ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int *
1650-
dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int
1651-
-> int
1648+
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int ->
1649+
ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int *
1650+
dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int ->
1651+
int
16521652

16531653
> val functionWhichTakesLongNameTupledParameters:
16541654
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int *
16551655
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int *
16561656
ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int *
1657-
ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int
1658-
-> int
1657+
ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int ->
1658+
int
16591659

16601660
> val functionWhichTakesLongNameCurriedParameters:
1661-
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int
1662-
-> bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int
1663-
-> cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int
1664-
-> dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int
1665-
-> int
1661+
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int ->
1662+
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int ->
1663+
cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc: int ->
1664+
dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd: int ->
1665+
int
16661666

16671667
> val functionWhichTakesMixedLengthCurriedParametersA:
1668-
a: 'a -> b: 'b -> c: 'c -> ddddddddddddddddddddddddddddddddddddddddddddd: 'd
1669-
-> int
1668+
a: 'a ->
1669+
b: 'b -> c: 'c -> ddddddddddddddddddddddddddddddddddddddddddddd: 'd -> int
16701670

16711671
> val functionWhichTakesMixedLengthCurriedParametersB:
16721672
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: 'a -> b: 'b -> c: 'c -> d: 'd -> int

0 commit comments

Comments
 (0)