Skip to content
This repository was archived by the owner on Sep 21, 2021. It is now read-only.

Commit 555effa

Browse files
nchevobbenchevobbe
committed
Remove extra space after object delimiter in ObjectInspector nodes.
Fixes #675 This is more consistent with the way we already render objects in Reps.
1 parent 6483ac5 commit 555effa

File tree

9 files changed

+82
-78
lines changed

9 files changed

+82
-78
lines changed

‎packages/devtools-reps/src/object-inspector/index.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@
1717
.tree.object-inspector .lessen .object-label * {
1818
color: var(--theme-comment);
1919
}
20+
21+
.object-inspector .object-delimiter {
22+
color: var(--theme-comment);
23+
}

‎packages/devtools-reps/src/object-inspector/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ class ObjectInspector extends Component {
456456
)
457457
: null,
458458
hasLabel && hasValue
459-
? dom.span({ className: "object-delimiter" }, " : ")
459+
? dom.span({ className: "object-delimiter" }, ": ")
460460
: null,
461461
hasValue
462462
? objectValue

‎packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/basic.js.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ exports[`ObjectInspector - renders renders as expected 4`] = `"▶︎ {…}"`;
1010

1111
exports[`ObjectInspector - renders renders as expected when not provided a name 1`] = `"▶︎ Object { p0: \\"0\\", p1: \\"1\\", p2: \\"2\\", … }"`;
1212

13-
exports[`ObjectInspector - renders renders objects as expected when provided a name 1`] = `"▶︎ myproperty : Object { p0: \\"0\\", p1: \\"1\\", p2: \\"2\\", … }"`;
13+
exports[`ObjectInspector - renders renders objects as expected when provided a name 1`] = `"▶︎ myproperty: Object { p0: \\"0\\", p1: \\"1\\", p2: \\"2\\", … }"`;
1414

15-
exports[`ObjectInspector - renders renders primitives as expected when provided a name 1`] = `" myproperty : 42"`;
15+
exports[`ObjectInspector - renders renders primitives as expected when provided a name 1`] = `" myproperty: 42"`;

‎packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/classnames.js.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ exports[`ObjectInspector - classnames has the expected class 1`] = `
1111
root
1212
</span>
1313
<span className=\\"object-delimiter\\">
14-
:
14+
:
1515
</span>
1616
<span className=\\"objectBox objectBox-number\\">
1717
42
@@ -35,7 +35,7 @@ exports[`ObjectInspector - classnames has the inline class when inline prop is t
3535
root
3636
</span>
3737
<span className=\\"object-delimiter\\">
38-
:
38+
:
3939
</span>
4040
<span className=\\"objectBox objectBox-number\\">
4141
42
@@ -59,7 +59,7 @@ exports[`ObjectInspector - classnames has the nowrap class when disableWrap prop
5959
root
6060
</span>
6161
<span className=\\"object-delimiter\\">
62-
:
62+
:
6363
</span>
6464
<span className=\\"objectBox objectBox-number\\">
6565
42

‎packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/entries.js.snap‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -12,53 +12,53 @@ exports[`ObjectInspector - entries calls ObjectClient.enumEntries when an <entri
1212
1313
exports[`ObjectInspector - entries does not call enumEntries if entries are already loaded 1`] = `
1414
"▼ Map
15-
| size : 2
15+
| size: 2
1616
| ▼ <entries>
17-
| | ▼ 0 : \\"key-0\\" → \\"value-0\\"
18-
| | | <key> : \\"key-0\\"
19-
| | | <value> : \\"value-0\\"
20-
| | ▼ 1 : \\"key-1\\" → \\"value-1\\"
21-
| | | <key> : \\"key-1\\"
22-
| | | <value> : \\"value-1\\"
23-
| | ▼ 2 : \\"key-2\\" → \\"value-2\\"
24-
| | | <key> : \\"key-2\\"
25-
| | | <value> : \\"value-2\\"
26-
| | ▼ 3 : \\"key-3\\" → \\"value-3\\"
27-
| | | <key> : \\"key-3\\"
28-
| | | <value> : \\"value-3\\"
29-
| | ▼ 4 : \\"key-4\\" → \\"value-4\\"
30-
| | | <key> : \\"key-4\\"
31-
| | | <value> : \\"value-4\\"
32-
| | ▼ 5 : \\"key-5\\" → \\"value-5\\"
33-
| | | <key> : \\"key-5\\"
34-
| | | <value> : \\"value-5\\"
35-
| | ▼ 6 : \\"key-6\\" → \\"value-6\\"
36-
| | | <key> : \\"key-6\\"
37-
| | | <value> : \\"value-6\\"
38-
| | ▼ 7 : \\"key-7\\" → \\"value-7\\"
39-
| | | <key> : \\"key-7\\"
40-
| | | <value> : \\"value-7\\"
41-
| | ▼ 8 : \\"key-8\\" → \\"value-8\\"
42-
| | | <key> : \\"key-8\\"
43-
| | | <value> : \\"value-8\\"
44-
| | ▼ 9 : \\"key-9\\" → \\"value-9\\"
45-
| | | <key> : \\"key-9\\"
46-
| | | <value> : \\"value-9\\"
47-
| | ▼ 10 : \\"key-10\\" → \\"value-10\\"
48-
| | | <key> : \\"key-10\\"
49-
| | | <value> : \\"value-10\\"
50-
| ▼ __proto__ : {…}"
17+
| | ▼ 0: \\"key-0\\" → \\"value-0\\"
18+
| | | <key>: \\"key-0\\"
19+
| | | <value>: \\"value-0\\"
20+
| | ▼ 1: \\"key-1\\" → \\"value-1\\"
21+
| | | <key>: \\"key-1\\"
22+
| | | <value>: \\"value-1\\"
23+
| | ▼ 2: \\"key-2\\" → \\"value-2\\"
24+
| | | <key>: \\"key-2\\"
25+
| | | <value>: \\"value-2\\"
26+
| | ▼ 3: \\"key-3\\" → \\"value-3\\"
27+
| | | <key>: \\"key-3\\"
28+
| | | <value>: \\"value-3\\"
29+
| | ▼ 4: \\"key-4\\" → \\"value-4\\"
30+
| | | <key>: \\"key-4\\"
31+
| | | <value>: \\"value-4\\"
32+
| | ▼ 5: \\"key-5\\" → \\"value-5\\"
33+
| | | <key>: \\"key-5\\"
34+
| | | <value>: \\"value-5\\"
35+
| | ▼ 6: \\"key-6\\" → \\"value-6\\"
36+
| | | <key>: \\"key-6\\"
37+
| | | <value>: \\"value-6\\"
38+
| | ▼ 7: \\"key-7\\" → \\"value-7\\"
39+
| | | <key>: \\"key-7\\"
40+
| | | <value>: \\"value-7\\"
41+
| | ▼ 8: \\"key-8\\" → \\"value-8\\"
42+
| | | <key>: \\"key-8\\"
43+
| | | <value>: \\"value-8\\"
44+
| | ▼ 9: \\"key-9\\" → \\"value-9\\"
45+
| | | <key>: \\"key-9\\"
46+
| | | <value>: \\"value-9\\"
47+
| | ▼ 10: \\"key-10\\" → \\"value-10\\"
48+
| | | <key>: \\"key-10\\"
49+
| | | <value>: \\"value-10\\"
50+
| ▼ __proto__: {…}"
5151
`;
5252
5353
exports[`ObjectInspector - entries renders Object with entries as expected 1`] = `
5454
"▼ Map
55-
| size : 2
55+
| size: 2
5656
| ▼ <entries>
57-
| | ▼ 0 : Symbol(a) → \\"value-a\\"
58-
| | | <key> : Symbol(a)
59-
| | | <value> : \\"value-a\\"
60-
| | ▼ 1 : Symbol(b) → \\"value-b\\"
61-
| | | <key> : Symbol(b)
62-
| | | <value> : \\"value-b\\"
63-
| ▼ __proto__ : {…}"
57+
| | ▼ 0: Symbol(a) → \\"value-a\\"
58+
| | | <key>: Symbol(a)
59+
| | | <value>: \\"value-a\\"
60+
| | ▼ 1: Symbol(b) → \\"value-b\\"
61+
| | | <key>: Symbol(b)
62+
| | | <value>: \\"value-b\\"
63+
| ▼ __proto__: {…}"
6464
`;

‎packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/getter-setter.js.snap‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`ObjectInspector - getters & setters renders getters and setters as expected 1`] = `
4-
"▼ x : Getter & Setter
5-
| ▶︎ <get> : function get x()
6-
| ▶︎ <set> : function set x()"
4+
"▼ x: Getter & Setter
5+
| ▶︎ <get>: function get x()
6+
| ▶︎ <set>: function set x()"
77
`;
88
99
exports[`ObjectInspector - getters & setters renders getters as expected 1`] = `
10-
"▼ x : Getter
11-
| ▶︎ <get> : function get x()"
10+
"▼ x: Getter
11+
| ▶︎ <get>: function get x()"
1212
`;
1313
1414
exports[`ObjectInspector - getters & setters renders setters as expected 1`] = `
15-
"▼ x : Setter
16-
| ▶︎ <set> : function set x()"
15+
"▼ x: Setter
16+
| ▶︎ <set>: function set x()"
1717
`;

‎packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/proxy.js.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`ObjectInspector - Proxy renders Proxy as expected 1`] = `
44
"▼ Proxy
5-
| ▶︎ <target> : Object { … }
6-
| ▶︎ <handler> : Array [ … ]
7-
| __proto__ : Object { }"
5+
| ▶︎ <target>: Object { … }
6+
| ▶︎ <handler>: Array [ … ]
7+
| __proto__: Object { }"
88
`;

‎packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/state.js.snap‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ exports[`ObjectInspector - state has the expected expandedPaths state 1`] = `
77
88
exports[`ObjectInspector - state has the expected expandedPaths state 2`] = `
99
"▼ {…}
10-
| a : 1
11-
| Symbol() : \\"hello\\"
12-
| ▶︎ __proto__ : Object { … }
10+
| a: 1
11+
| Symbol(): \\"hello\\"
12+
| ▶︎ __proto__: Object { … }
1313
▶︎ Proxy { <target>: {…}, <handler>: […] }"
1414
`;
1515
@@ -21,18 +21,18 @@ exports[`ObjectInspector - state has the expected expandedPaths state 3`] = `
2121
exports[`ObjectInspector - state has the expected expandedPaths state 4`] = `
2222
"▶︎ Object { p0: \\"0\\", p1: \\"1\\", p2: \\"2\\", p3: \\"3\\", p4: \\"4\\", p5: \\"5\\", p6: \\"6\\", p7: \\"7\\", p8: \\"8\\", p9: \\"9\\", … }
2323
▼ Proxy
24-
| ▶︎ <target> : Object { … }
25-
| ▶︎ <handler> : Array [ … ]"
24+
| ▶︎ <target>: Object { … }
25+
| ▶︎ <handler>: Array [ … ]"
2626
`;
2727
2828
exports[`ObjectInspector - state has the expected expandedPaths state 5`] = `
2929
"▼ {…}
30-
| a : 1
31-
| Symbol() : \\"hello\\"
32-
| ▶︎ __proto__ : Object { … }
30+
| a: 1
31+
| Symbol(): \\"hello\\"
32+
| ▶︎ __proto__: Object { … }
3333
▼ Proxy
34-
| ▶︎ <target> : Object { … }
35-
| ▶︎ <handler> : Array [ … ]"
34+
| ▶︎ <target>: Object { … }
35+
| ▶︎ <handler>: Array [ … ]"
3636
`;
3737
3838
exports[`ObjectInspector - state has the expected state when expanding a node 1`] = `
@@ -42,7 +42,7 @@ exports[`ObjectInspector - state has the expected state when expanding a node 1`
4242
4343
exports[`ObjectInspector - state has the expected state when expanding a node 2`] = `
4444
"▼ {…}
45-
| __proto__ : Object { }
45+
| __proto__: Object { }
4646
▶︎ Proxy { <target>: {…}, <handler>: […] }"
4747
`;
4848
@@ -54,16 +54,16 @@ exports[`ObjectInspector - state has the expected state when expanding a proxy n
5454
exports[`ObjectInspector - state has the expected state when expanding a proxy node 2`] = `
5555
"▶︎ Object { p0: \\"0\\", p1: \\"1\\", p2: \\"2\\", p3: \\"3\\", p4: \\"4\\", p5: \\"5\\", p6: \\"6\\", p7: \\"7\\", p8: \\"8\\", p9: \\"9\\", … }
5656
▼ Proxy
57-
| ▶︎ <target> : Object { … }
58-
| ▶︎ <handler> : Array [ … ]
59-
| ▶︎ __proto__ : Object { }"
57+
| ▶︎ <target>: Object { … }
58+
| ▶︎ <handler>: Array [ … ]
59+
| ▶︎ __proto__: Object { }"
6060
`;
6161
6262
exports[`ObjectInspector - state has the expected state when expanding a proxy node 3`] = `
6363
"▶︎ Object { p0: \\"0\\", p1: \\"1\\", p2: \\"2\\", p3: \\"3\\", p4: \\"4\\", p5: \\"5\\", p6: \\"6\\", p7: \\"7\\", p8: \\"8\\", p9: \\"9\\", … }
6464
▼ Proxy
65-
| ▶︎ <target> : Object { … }
66-
| ▶︎ <handler> : Array [ … ]
67-
| ▼ __proto__ : {}
68-
| | ▶︎ __proto__ : Object { }"
65+
| ▶︎ <target>: Object { … }
66+
| ▶︎ <handler>: Array [ … ]
67+
| ▼ __proto__: {}
68+
| | ▶︎ __proto__: Object { }"
6969
`;

‎packages/devtools-reps/src/object-inspector/tests/component/function.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,6 @@ describe("ObjectInspector - functions", () => {
7676

7777
const functionNode = nodes.first();
7878
// It should have the name of the property.
79-
expect(functionNode.text()).toBe("x : function testName()");
79+
expect(functionNode.text()).toBe("x: function testName()");
8080
});
8181
});

0 commit comments

Comments
 (0)