Skip to content

Commit b9191ee

Browse files
Added facet for multiline unenclosed collection item (#3051)
1 parent 5911851 commit b9191ee

File tree

48 files changed

+959
-117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+959
-117
lines changed
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
int foo,
2+
bar;
3+
---
4+
5+
[#1 Content] =
6+
[#1 Domain] = 0:0-0:7
7+
>-------<
8+
0| int foo,
9+
10+
[#1 Removal] = 0:0-0:8
11+
>--------<
12+
0| int foo,
13+
14+
[#1 Trailing delimiter] = 0:7-0:8
15+
>-<
16+
0| int foo,
17+
18+
[#1 Insertion delimiter] = ", "
19+
20+
21+
[#2 Content] =
22+
[#2 Domain] = 0:4-0:7
23+
>---<
24+
0| int foo,
25+
26+
[#2 Removal] = 0:4-1:4
27+
>----
28+
0| int foo,
29+
1| bar;
30+
----<
31+
32+
[#2 Trailing delimiter] = 0:7-1:4
33+
>-
34+
0| int foo,
35+
1| bar;
36+
----<
37+
38+
[#2 Insertion delimiter] = ",\n"
39+
40+
41+
[#3 Content] =
42+
[#3 Domain] = 1:4-1:7
43+
>---<
44+
1| bar;
45+
46+
[#3 Removal] = 0:7-1:7
47+
>-
48+
0| int foo,
49+
1| bar;
50+
-------<
51+
52+
[#3 Leading delimiter] = 0:7-1:4
53+
>-
54+
0| int foo,
55+
1| bar;
56+
----<
57+
58+
[#3 Insertion delimiter] = ",\n"

data/fixtures/scopes/c/collectionItem.unenclosed.scope renamed to data/fixtures/scopes/c/collectionItem.unenclosed.singleLine.scope

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,31 @@ int foo, bar;
2222
>---<
2323
0| int foo, bar;
2424

25-
[#2 Removal] = 0:3-0:7
26-
>----<
25+
[#2 Removal] = 0:4-0:9
26+
>-----<
2727
0| int foo, bar;
2828

29-
[#2 Leading delimiter] = 0:3-0:4
30-
>-<
29+
[#2 Trailing delimiter] = 0:7-0:9
30+
>--<
3131
0| int foo, bar;
3232

33-
[#2 Insertion delimiter] = "\n"
33+
[#2 Insertion delimiter] = ", "
3434

3535

3636
[#3 Content] =
3737
[#3 Domain] = 0:9-0:12
3838
>---<
3939
0| int foo, bar;
4040

41-
[#3 Removal] = 0:8-0:12
42-
>----<
41+
[#3 Removal] = 0:7-0:12
42+
>-----<
4343
0| int foo, bar;
4444

45-
[#3 Leading delimiter] = 0:8-0:9
46-
>-<
45+
[#3 Leading delimiter] = 0:7-0:9
46+
>--<
4747
0| int foo, bar;
4848

49-
[#3 Insertion delimiter] = "\n"
49+
[#3 Insertion delimiter] = ", "
5050

5151

5252
[#4 Content] =
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
int foo, bar;
2+
---
3+
4+
[Content] = 0:4-0:12
5+
>--------<
6+
0| int foo, bar;
7+
8+
[Domain] = 0:0-0:13
9+
>-------------<
10+
0| int foo, bar;
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
class Foo {
2+
private int bar, baz;
3+
}
4+
---
5+
6+
[#1 Content] = 1:4-1:25
7+
>---------------------<
8+
1| private int bar, baz;
9+
10+
[#1 Domain] = 0:11-2:0
11+
>
12+
0| class Foo {
13+
1| private int bar, baz;
14+
2| }
15+
<
16+
17+
18+
[#2 Content] = 1:4-1:25
19+
>---------------------<
20+
1| private int bar, baz;
21+
22+
[#2 Domain] = 1:0-1:25
23+
>-------------------------<
24+
1| private int bar, baz;
25+
26+
27+
[#3 Content] = 1:16-1:24
28+
>--------<
29+
1| private int bar, baz;
30+
31+
[#3 Domain] = 1:4-1:25
32+
>---------------------<
33+
1| private int bar, baz;
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
int foo,
2+
bar;
3+
---
4+
5+
[#1 Content] =
6+
[#1 Domain] = 0:0-0:7
7+
>-------<
8+
0| int foo,
9+
10+
[#1 Removal] = 0:0-0:8
11+
>--------<
12+
0| int foo,
13+
14+
[#1 Trailing delimiter] = 0:7-0:8
15+
>-<
16+
0| int foo,
17+
18+
[#1 Insertion delimiter] = ", "
19+
20+
21+
[#2 Content] =
22+
[#2 Domain] = 0:4-0:7
23+
>---<
24+
0| int foo,
25+
26+
[#2 Removal] = 0:4-1:4
27+
>----
28+
0| int foo,
29+
1| bar;
30+
----<
31+
32+
[#2 Trailing delimiter] = 0:7-1:4
33+
>-
34+
0| int foo,
35+
1| bar;
36+
----<
37+
38+
[#2 Insertion delimiter] = ",\n"
39+
40+
41+
[#3 Content] =
42+
[#3 Domain] = 1:4-1:7
43+
>---<
44+
1| bar;
45+
46+
[#3 Removal] = 0:7-1:7
47+
>-
48+
0| int foo,
49+
1| bar;
50+
-------<
51+
52+
[#3 Leading delimiter] = 0:7-1:4
53+
>-
54+
0| int foo,
55+
1| bar;
56+
----<
57+
58+
[#3 Insertion delimiter] = ",\n"
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
class Foo {
2+
private int bar,
3+
baz;
4+
}
5+
---
6+
7+
[#1 Content] =
8+
[#1 Domain] = 1:4-1:19
9+
>---------------<
10+
1| private int bar,
11+
12+
[#1 Removal] = 1:4-2:8
13+
>----------------
14+
1| private int bar,
15+
2| baz;
16+
--------<
17+
18+
[#1 Trailing delimiter] = 1:19-2:8
19+
>-
20+
1| private int bar,
21+
2| baz;
22+
--------<
23+
24+
[#1 Insertion delimiter] = ",\n"
25+
26+
27+
[#2 Content] =
28+
[#2 Domain] = 1:16-1:19
29+
>---<
30+
1| private int bar,
31+
32+
[#2 Removal] = 1:16-2:8
33+
>----
34+
1| private int bar,
35+
2| baz;
36+
--------<
37+
38+
[#2 Trailing delimiter] = 1:19-2:8
39+
>-
40+
1| private int bar,
41+
2| baz;
42+
--------<
43+
44+
[#2 Insertion delimiter] = ",\n"
45+
46+
47+
[#3 Content] =
48+
[#3 Domain] = 2:8-2:11
49+
>---<
50+
2| baz;
51+
52+
[#3 Removal] = 1:19-2:11
53+
>-
54+
1| private int bar,
55+
2| baz;
56+
-----------<
57+
58+
[#3 Leading delimiter] = 1:19-2:8
59+
>-
60+
1| private int bar,
61+
2| baz;
62+
--------<
63+
64+
[#3 Insertion delimiter] = ",\n"
65+
66+
67+
[#4 Content] =
68+
[#4 Domain] = 2:8-2:12
69+
>----<
70+
2| baz;
71+
72+
[#4 Removal] = 1:19-2:12
73+
>-
74+
1| private int bar,
75+
2| baz;
76+
------------<
77+
78+
[#4 Leading delimiter] = 1:19-2:8
79+
>-
80+
1| private int bar,
81+
2| baz;
82+
--------<
83+
84+
[#4 Insertion delimiter] = ",\n"
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
int foo, bar;
2+
---
3+
4+
[#1 Content] =
5+
[#1 Domain] = 0:0-0:7
6+
>-------<
7+
0| int foo, bar;
8+
9+
[#1 Removal] = 0:0-0:9
10+
>---------<
11+
0| int foo, bar;
12+
13+
[#1 Trailing delimiter] = 0:7-0:9
14+
>--<
15+
0| int foo, bar;
16+
17+
[#1 Insertion delimiter] = ", "
18+
19+
20+
[#2 Content] =
21+
[#2 Domain] = 0:4-0:7
22+
>---<
23+
0| int foo, bar;
24+
25+
[#2 Removal] = 0:4-0:9
26+
>-----<
27+
0| int foo, bar;
28+
29+
[#2 Trailing delimiter] = 0:7-0:9
30+
>--<
31+
0| int foo, bar;
32+
33+
[#2 Insertion delimiter] = ", "
34+
35+
36+
[#3 Content] =
37+
[#3 Domain] = 0:9-0:12
38+
>---<
39+
0| int foo, bar;
40+
41+
[#3 Removal] = 0:7-0:12
42+
>-----<
43+
0| int foo, bar;
44+
45+
[#3 Leading delimiter] = 0:7-0:9
46+
>--<
47+
0| int foo, bar;
48+
49+
[#3 Insertion delimiter] = ", "
50+
51+
52+
[#4 Content] =
53+
[#4 Domain] = 0:9-0:13
54+
>----<
55+
0| int foo, bar;
56+
57+
[#4 Removal] = 0:7-0:13
58+
>------<
59+
0| int foo, bar;
60+
61+
[#4 Leading delimiter] = 0:7-0:9
62+
>--<
63+
0| int foo, bar;
64+
65+
[#4 Insertion delimiter] = ", "

0 commit comments

Comments
 (0)