Skip to content

Commit b4ee6b1

Browse files
aozgaamhegazy
aozgaa
authored and
mhegazy
committed
Object literal formatting (#16007)
* consolidate object literal formatting * accept baselines
1 parent 2f65b2c commit b4ee6b1

File tree

34 files changed

+172
-173
lines changed

34 files changed

+172
-173
lines changed

‎src/compiler/emitter.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,7 +1064,7 @@ namespace ts {
10641064
}
10651065
else {
10661066
write("{");
1067-
emitList(node, elements, getEmitFlags(node) & EmitFlags.SingleLine ? ListFormat.ObjectBindingPatternElements : ListFormat.ObjectBindingPatternElementsWithSpaceBetweenBraces);
1067+
emitList(node, elements, ListFormat.ObjectBindingPatternElements);
10681068
write("}");
10691069
}
10701070
}
@@ -3019,8 +3019,7 @@ namespace ts {
30193019
TupleTypeElements = CommaDelimited | SpaceBetweenSiblings | SingleLine | Indented,
30203020
UnionTypeConstituents = BarDelimited | SpaceBetweenSiblings | SingleLine,
30213021
IntersectionTypeConstituents = AmpersandDelimited | SpaceBetweenSiblings | SingleLine,
3022-
ObjectBindingPatternElements = SingleLine | CommaDelimited | SpaceBetweenSiblings,
3023-
ObjectBindingPatternElementsWithSpaceBetweenBraces = SingleLine | AllowTrailingComma | SpaceBetweenBraces | CommaDelimited | SpaceBetweenSiblings,
3022+
ObjectBindingPatternElements = SingleLine | AllowTrailingComma | SpaceBetweenBraces | CommaDelimited | SpaceBetweenSiblings,
30243023
ArrayBindingPatternElements = SingleLine | AllowTrailingComma | CommaDelimited | SpaceBetweenSiblings,
30253024
ObjectLiteralExpressionProperties = PreserveLines | CommaDelimited | SpaceBetweenSiblings | SpaceBetweenBraces | Indented | Braces,
30263025
ArrayLiteralExpressionElements = PreserveLines | CommaDelimited | SpaceBetweenSiblings | AllowTrailingComma | Indented | SquareBrackets,

‎tests/baselines/reference/arrowFunctionExpressions.types

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,25 +83,25 @@ var p5 = ([a = 1]) => { };
8383
>1 : 1
8484

8585
var p6 = ({ a }) => { };
86-
>p6 : ({a}: { a: any; }) => void
87-
>({ a }) => { } : ({a}: { a: any; }) => void
86+
>p6 : ({ a }: { a: any; }) => void
87+
>({ a }) => { } : ({ a }: { a: any; }) => void
8888
>a : any
8989

9090
var p7 = ({ a: { b } }) => { };
91-
>p7 : ({a: {b}}: { a: { b: any; }; }) => void
92-
>({ a: { b } }) => { } : ({a: {b}}: { a: { b: any; }; }) => void
91+
>p7 : ({ a: { b } }: { a: { b: any; }; }) => void
92+
>({ a: { b } }) => { } : ({ a: { b } }: { a: { b: any; }; }) => void
9393
>a : any
9494
>b : any
9595

9696
var p8 = ({ a = 1 }) => { };
97-
>p8 : ({a}: { a?: number; }) => void
98-
>({ a = 1 }) => { } : ({a}: { a?: number; }) => void
97+
>p8 : ({ a }: { a?: number; }) => void
98+
>({ a = 1 }) => { } : ({ a }: { a?: number; }) => void
9999
>a : number
100100
>1 : 1
101101

102102
var p9 = ({ a: { b = 1 } = { b: 1 } }) => { };
103-
>p9 : ({a: {b}}: { a?: { b?: number; }; }) => void
104-
>({ a: { b = 1 } = { b: 1 } }) => { } : ({a: {b}}: { a?: { b?: number; }; }) => void
103+
>p9 : ({ a: { b } }: { a?: { b?: number; }; }) => void
104+
>({ a: { b = 1 } = { b: 1 } }) => { } : ({ a: { b } }: { a?: { b?: number; }; }) => void
105105
>a : any
106106
>b : number
107107
>1 : 1
@@ -110,8 +110,8 @@ var p9 = ({ a: { b = 1 } = { b: 1 } }) => { };
110110
>1 : 1
111111

112112
var p10 = ([{ value, done }]) => { };
113-
>p10 : ([{value, done}]: [{ value: any; done: any; }]) => void
114-
>([{ value, done }]) => { } : ([{value, done}]: [{ value: any; done: any; }]) => void
113+
>p10 : ([{ value, done }]: [{ value: any; done: any; }]) => void
114+
>([{ value, done }]) => { } : ([{ value, done }]: [{ value: any; done: any; }]) => void
115115
>value : any
116116
>done : any
117117

‎tests/baselines/reference/contextuallyTypedBindingInitializer.types

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ interface Show {
77
>x : number
88
}
99
function f({ show = v => v.toString() }: Show) {}
10-
>f : ({show}: Show) => void
10+
>f : ({ show }: Show) => void
1111
>show : (x: number) => string
1212
>v => v.toString() : (v: number) => string
1313
>v : number
@@ -18,7 +18,7 @@ function f({ show = v => v.toString() }: Show) {}
1818
>Show : Show
1919

2020
function f2({ "show": showRename = v => v.toString() }: Show) {}
21-
>f2 : ({"show": showRename}: Show) => void
21+
>f2 : ({ "show": showRename }: Show) => void
2222
>showRename : (x: number) => string
2323
>v => v.toString() : (v: number) => string
2424
>v : number
@@ -29,7 +29,7 @@ function f2({ "show": showRename = v => v.toString() }: Show) {}
2929
>Show : Show
3030

3131
function f3({ ["show"]: showRename = v => v.toString() }: Show) {}
32-
>f3 : ({["show"]: showRename}: Show) => void
32+
>f3 : ({ ["show"]: showRename }: Show) => void
3333
>"show" : "show"
3434
>showRename : (x: number) => string
3535
>v => v.toString() : (v: number) => string
@@ -48,7 +48,7 @@ interface Nested {
4848
>Show : Show
4949
}
5050
function ff({ nested = { show: v => v.toString() } }: Nested) {}
51-
>ff : ({nested}: Nested) => void
51+
>ff : ({ nested }: Nested) => void
5252
>nested : Show
5353
>{ show: v => v.toString() } : { show: (v: number) => string; }
5454
>show : (v: number) => string
@@ -67,7 +67,7 @@ interface Tuples {
6767
>prop : [string, number]
6868
}
6969
function g({ prop = ["hello", 1234] }: Tuples) {}
70-
>g : ({prop}: Tuples) => void
70+
>g : ({ prop }: Tuples) => void
7171
>prop : [string, number]
7272
>["hello", 1234] : [string, number]
7373
>"hello" : "hello"
@@ -81,7 +81,7 @@ interface StringUnion {
8181
>prop : "foo" | "bar"
8282
}
8383
function h({ prop = "foo" }: StringUnion) {}
84-
>h : ({prop}: StringUnion) => void
84+
>h : ({ prop }: StringUnion) => void
8585
>prop : "foo" | "bar"
8686
>"foo" : "foo"
8787
>StringUnion : StringUnion

‎tests/baselines/reference/contextuallyTypedBindingInitializerNegative.types

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ interface Show {
77
>x : number
88
}
99
function f({ show: showRename = v => v }: Show) {}
10-
>f : ({show: showRename}: Show) => void
10+
>f : ({ show: showRename }: Show) => void
1111
>show : any
1212
>showRename : ((x: number) => string) | ((v: number) => number)
1313
>v => v : (v: number) => number
@@ -16,15 +16,15 @@ function f({ show: showRename = v => v }: Show) {}
1616
>Show : Show
1717

1818
function f2({ "show": showRename = v => v }: Show) {}
19-
>f2 : ({"show": showRename}: Show) => void
19+
>f2 : ({ "show": showRename }: Show) => void
2020
>showRename : ((x: number) => string) | ((v: number) => number)
2121
>v => v : (v: number) => number
2222
>v : number
2323
>v : number
2424
>Show : Show
2525

2626
function f3({ ["show"]: showRename = v => v }: Show) {}
27-
>f3 : ({["show"]: showRename}: Show) => void
27+
>f3 : ({ ["show"]: showRename }: Show) => void
2828
>"show" : "show"
2929
>showRename : ((x: number) => string) | ((v: number) => number)
3030
>v => v : (v: number) => number
@@ -40,7 +40,7 @@ interface Nested {
4040
>Show : Show
4141
}
4242
function ff({ nested: nestedRename = { show: v => v } }: Nested) {}
43-
>ff : ({nested: nestedRename}: Nested) => void
43+
>ff : ({ nested: nestedRename }: Nested) => void
4444
>nested : any
4545
>nestedRename : Show | { show: (v: number) => number; }
4646
>{ show: v => v } : { show: (v: number) => number; }
@@ -79,7 +79,7 @@ interface Tuples {
7979
>prop : [string, number]
8080
}
8181
function g({ prop = [101, 1234] }: Tuples) {}
82-
>g : ({prop}: Tuples) => void
82+
>g : ({ prop }: Tuples) => void
8383
>prop : [string, number] | [number, number]
8484
>[101, 1234] : [number, number]
8585
>101 : 101
@@ -93,7 +93,7 @@ interface StringUnion {
9393
>prop : "foo" | "bar"
9494
}
9595
function h({ prop = "baz" }: StringUnion) {}
96-
>h : ({prop}: StringUnion) => void
96+
>h : ({ prop }: StringUnion) => void
9797
>prop : "foo" | "bar" | "baz"
9898
>"baz" : "baz"
9999
>StringUnion : StringUnion

‎tests/baselines/reference/contextuallyTypedIife.types

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@
175175
// destructuring parameters (with defaults too!)
176176
(({ q }) => q)({ q : 13 });
177177
>(({ q }) => q)({ q : 13 }) : number
178-
>(({ q }) => q) : ({q}: { q: number; }) => number
179-
>({ q }) => q : ({q}: { q: number; }) => number
178+
>(({ q }) => q) : ({ q }: { q: number; }) => number
179+
>({ q }) => q : ({ q }: { q: number; }) => number
180180
>q : number
181181
>q : number
182182
>{ q : 13 } : { q: number; }
@@ -185,8 +185,8 @@
185185

186186
(({ p = 14 }) => p)({ p : 15 });
187187
>(({ p = 14 }) => p)({ p : 15 }) : number
188-
>(({ p = 14 }) => p) : ({p}: { p: number; }) => number
189-
>({ p = 14 }) => p : ({p}: { p: number; }) => number
188+
>(({ p = 14 }) => p) : ({ p }: { p: number; }) => number
189+
>({ p = 14 }) => p : ({ p }: { p: number; }) => number
190190
>p : number
191191
>14 : 14
192192
>p : number
@@ -196,8 +196,8 @@
196196

197197
(({ r = 17 } = { r: 18 }) => r)({r : 19});
198198
>(({ r = 17 } = { r: 18 }) => r)({r : 19}) : number
199-
>(({ r = 17 } = { r: 18 }) => r) : ({r}?: { r: number; }) => number
200-
>({ r = 17 } = { r: 18 }) => r : ({r}?: { r: number; }) => number
199+
>(({ r = 17 } = { r: 18 }) => r) : ({ r }?: { r: number; }) => number
200+
>({ r = 17 } = { r: 18 }) => r : ({ r }?: { r: number; }) => number
201201
>r : number
202202
>17 : 17
203203
>{ r: 18 } : { r: number; }
@@ -210,8 +210,8 @@
210210

211211
(({ u = 22 } = { u: 23 }) => u)();
212212
>(({ u = 22 } = { u: 23 }) => u)() : number
213-
>(({ u = 22 } = { u: 23 }) => u) : ({u}?: { u?: number; }) => number
214-
>({ u = 22 } = { u: 23 }) => u : ({u}?: { u?: number; }) => number
213+
>(({ u = 22 } = { u: 23 }) => u) : ({ u }?: { u?: number; }) => number
214+
>({ u = 22 } = { u: 23 }) => u : ({ u }?: { u?: number; }) => number
215215
>u : number
216216
>22 : 22
217217
>{ u: 23 } : { u?: number; }

‎tests/baselines/reference/controlFlowDestructuringParameters.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
>map : { <U>(this: [{ x: number; }, { x: number; }, { x: number; }, { x: number; }, { x: number; }], callbackfn: (this: void, value: { x: number; }, index: number, array: { x: number; }[]) => U): [U, U, U, U, U]; <U>(this: [{ x: number; }, { x: number; }, { x: number; }, { x: number; }, { x: number; }], callbackfn: (this: void, value: { x: number; }, index: number, array: { x: number; }[]) => U, thisArg: undefined): [U, U, U, U, U]; <Z, U>(this: [{ x: number; }, { x: number; }, { x: number; }, { x: number; }, { x: number; }], callbackfn: (this: Z, value: { x: number; }, index: number, array: { x: number; }[]) => U, thisArg: Z): [U, U, U, U, U]; <U>(this: [{ x: number; }, { x: number; }, { x: number; }, { x: number; }], callbackfn: (this: void, value: { x: number; }, index: number, array: { x: number; }[]) => U): [U, U, U, U]; <U>(this: [{ x: number; }, { x: number; }, { x: number; }, { x: number; }], callbackfn: (this: void, value: { x: number; }, index: number, array: { x: number; }[]) => U, thisArg: undefined): [U, U, U, U]; <Z, U>(this: [{ x: number; }, { x: number; }, { x: number; }, { x: number; }], callbackfn: (this: Z, value: { x: number; }, index: number, array: { x: number; }[]) => U, thisArg: Z): [U, U, U, U]; <U>(this: [{ x: number; }, { x: number; }, { x: number; }], callbackfn: (this: void, value: { x: number; }, index: number, array: { x: number; }[]) => U): [U, U, U]; <U>(this: [{ x: number; }, { x: number; }, { x: number; }], callbackfn: (this: void, value: { x: number; }, index: number, array: { x: number; }[]) => U, thisArg: undefined): [U, U, U]; <Z, U>(this: [{ x: number; }, { x: number; }, { x: number; }], callbackfn: (this: Z, value: { x: number; }, index: number, array: { x: number; }[]) => U, thisArg: Z): [U, U, U]; <U>(this: [{ x: number; }, { x: number; }], callbackfn: (this: void, value: { x: number; }, index: number, array: { x: number; }[]) => U): [U, U]; <U>(this: [{ x: number; }, { x: number; }], callbackfn: (this: void, value: { x: number; }, index: number, array: { x: number; }[]) => U, thisArg: undefined): [U, U]; <Z, U>(this: [{ x: number; }, { x: number; }], callbackfn: (this: Z, value: { x: number; }, index: number, array: { x: number; }[]) => U, thisArg: Z): [U, U]; <U>(callbackfn: (this: void, value: { x: number; }, index: number, array: { x: number; }[]) => U): U[]; <U>(callbackfn: (this: void, value: { x: number; }, index: number, array: { x: number; }[]) => U, thisArg: undefined): U[]; <Z, U>(callbackfn: (this: Z, value: { x: number; }, index: number, array: { x: number; }[]) => U, thisArg: Z): U[]; }
1313

1414
({ x }) => x
15-
>({ x }) => x : (this: void, {x}: { x: number; }) => number
15+
>({ x }) => x : (this: void, { x }: { x: number; }) => number
1616
>x : number
1717
>x : number
1818

‎tests/baselines/reference/declarationEmitBindingPatterns.types

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=== tests/cases/compiler/declarationEmitBindingPatterns.ts ===
22
const k = ({x: z = 'y'}) => { }
3-
>k : ({x: z}: { x?: string; }) => void
4-
>({x: z = 'y'}) => { } : ({x: z}: { x?: string; }) => void
3+
>k : ({ x: z }: { x?: string; }) => void
4+
>({x: z = 'y'}) => { } : ({ x: z }: { x?: string; }) => void
55
>x : any
66
>z : string
77
>'y' : "y"
@@ -10,7 +10,7 @@ var a;
1010
>a : any
1111

1212
function f({} = a, [] = a, { p: {} = a} = a) {
13-
>f : ({}?: any, []?: any, {p: {}}?: any) => void
13+
>f : ({}?: any, []?: any, { p: {} }?: any) => void
1414
>a : any
1515
>a : any
1616
>p : any

‎tests/baselines/reference/declarationEmitDestructuring1.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function far([a, [b], [[c]]]: [number, boolean[], string[][]]): void { }
1212
>c : string
1313

1414
function bar({a1, b1, c1}: { a1: number, b1: boolean, c1: string }): void { }
15-
>bar : ({a1, b1, c1}: { a1: number; b1: boolean; c1: string; }) => void
15+
>bar : ({ a1, b1, c1 }: { a1: number; b1: boolean; c1: string; }) => void
1616
>a1 : number
1717
>b1 : boolean
1818
>c1 : string
@@ -21,7 +21,7 @@ function bar({a1, b1, c1}: { a1: number, b1: boolean, c1: string }): void { }
2121
>c1 : string
2222

2323
function baz({a2, b2: {b1, c1}}: { a2: number, b2: { b1: boolean, c1: string } }): void { }
24-
>baz : ({a2, b2: {b1, c1}}: { a2: number; b2: { b1: boolean; c1: string; }; }) => void
24+
>baz : ({ a2, b2: { b1, c1 } }: { a2: number; b2: { b1: boolean; c1: string; }; }) => void
2525
>a2 : number
2626
>b2 : any
2727
>b1 : boolean

‎tests/baselines/reference/declarationEmitDestructuringOptionalBindingParametersInOverloads.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function foo(...rest: any[]) {
1111
}
1212

1313
function foo2( { x, y, z }?: { x: string; y: number; z: boolean });
14-
>foo2 : ({x, y, z}?: { x: string; y: number; z: boolean; }) => any
14+
>foo2 : ({ x, y, z }?: { x: string; y: number; z: boolean; }) => any
1515
>x : string
1616
>y : number
1717
>z : boolean
@@ -20,7 +20,7 @@ function foo2( { x, y, z }?: { x: string; y: number; z: boolean });
2020
>z : boolean
2121

2222
function foo2(...rest: any[]) {
23-
>foo2 : ({x, y, z}?: { x: string; y: number; z: boolean; }) => any
23+
>foo2 : ({ x, y, z }?: { x: string; y: number; z: boolean; }) => any
2424
>rest : any[]
2525

2626
}

‎tests/baselines/reference/destructureOptionalParameter.types

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
=== tests/cases/compiler/destructureOptionalParameter.ts ===
22
declare function f1({ a, b }?: { a: number, b: string }): void;
3-
>f1 : ({a, b}?: { a: number; b: string; } | undefined) => void
3+
>f1 : ({ a, b }?: { a: number; b: string; } | undefined) => void
44
>a : number
55
>b : string
66
>a : number
77
>b : string
88

99
function f2({ a, b }: { a: number, b: number } = { a: 0, b: 0 }) {
10-
>f2 : ({a, b}?: { a: number; b: number; }) => void
10+
>f2 : ({ a, b }?: { a: number; b: number; }) => void
1111
>a : number
1212
>b : number
1313
>a : number

0 commit comments

Comments
 (0)