Skip to content

Commit 2c3d9fd

Browse files
AndreasArvidssonAndreasArvidsson
authored
Add more facets to interior scope (#2996)
1 parent 7ac3d44 commit 2c3d9fd

69 files changed

Lines changed: 1389 additions & 317 deletions

File tree

Some content is hidden

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

data/fixtures/scopes/c/interior.loop3.scope renamed to data/fixtures/scopes/c/interior.doWhile.scope

File renamed without changes.

data/fixtures/scopes/c/interior.loop.scope renamed to data/fixtures/scopes/c/interior.for.scope

File renamed without changes.

‎data/fixtures/scopes/c/interior.switch.scope‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
switch (value) { }
2+
---
3+
4+
[#1 Content] =
5+
[#1 Removal] = 0:16-0:17
6+
>-<
7+
0| switch (value) { }
8+
9+
[#1 Domain] = 0:0-0:18
10+
>------------------<
11+
0| switch (value) { }
12+
13+
[#1 Insertion delimiter] = " "
14+
15+
16+
[#2 Content] =
17+
[#2 Removal] = 0:8-0:13
18+
>-----<
19+
0| switch (value) { }
20+
21+
[#2 Domain] = 0:7-0:14
22+
>-------<
23+
0| switch (value) { }
24+
25+
[#2 Insertion delimiter] = " "
26+
27+
28+
[#3 Content] =
29+
[#3 Removal] = 0:16-0:17
30+
>-<
31+
0| switch (value) { }
32+
33+
[#3 Domain] = 0:15-0:18
34+
>---<
35+
0| switch (value) { }
36+
37+
[#3 Insertion delimiter] = " "

‎data/fixtures/scopes/c/interior.switchCase.scope‎

Lines changed: 96 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,54 @@
11
switch (value) {
22
case 0:
3-
break;
4-
case 1:
53
foo;
64
break;
7-
case 2: {
5+
case 1: {
86
break;
97
}
108
default:
119
break;
1210
}
1311
---
1412

15-
[#1 Content] = 1:4-10:14
13+
[#1 Content] = 1:4-8:14
1614
>-------
1715
1| case 0:
18-
2| break;
19-
3| case 1:
20-
4| foo;
16+
2| foo;
17+
3| break;
18+
4| case 1: {
2119
5| break;
22-
6| case 2: {
23-
7| break;
24-
8| }
25-
9| default:
26-
10| break;
27-
--------------<
28-
29-
[#1 Removal] = 0:16-11:0
20+
6| }
21+
7| default:
22+
8| break;
23+
--------------<
24+
25+
[#1 Removal] = 0:16-9:0
3026
>
3127
0| switch (value) {
3228
1| case 0:
33-
2| break;
34-
3| case 1:
35-
4| foo;
29+
2| foo;
30+
3| break;
31+
4| case 1: {
3632
5| break;
37-
6| case 2: {
38-
7| break;
39-
8| }
40-
9| default:
41-
10| break;
42-
11| }
43-
<
44-
45-
[#1 Domain] = 0:0-11:1
33+
6| }
34+
7| default:
35+
8| break;
36+
9| }
37+
<
38+
39+
[#1 Domain] = 0:0-9:1
4640
>----------------
4741
0| switch (value) {
4842
1| case 0:
49-
2| break;
50-
3| case 1:
51-
4| foo;
43+
2| foo;
44+
3| break;
45+
4| case 1: {
5246
5| break;
53-
6| case 2: {
54-
7| break;
55-
8| }
56-
9| default:
57-
10| break;
58-
11| }
59-
-<
47+
6| }
48+
7| default:
49+
8| break;
50+
9| }
51+
-<
6052

6153
[#1 Insertion delimiter] = " "
6254

@@ -73,137 +65,117 @@ switch (value) {
7365
[#2 Insertion delimiter] = " "
7466

7567

76-
[#3 Content] = 1:4-10:14
68+
[#3 Content] = 1:4-8:14
7769
>-------
7870
1| case 0:
79-
2| break;
80-
3| case 1:
81-
4| foo;
71+
2| foo;
72+
3| break;
73+
4| case 1: {
8274
5| break;
83-
6| case 2: {
84-
7| break;
85-
8| }
86-
9| default:
87-
10| break;
88-
--------------<
89-
90-
[#3 Removal] = 0:16-11:0
75+
6| }
76+
7| default:
77+
8| break;
78+
--------------<
79+
80+
[#3 Removal] = 0:16-9:0
9181
>
9282
0| switch (value) {
9383
1| case 0:
94-
2| break;
95-
3| case 1:
96-
4| foo;
84+
2| foo;
85+
3| break;
86+
4| case 1: {
9787
5| break;
98-
6| case 2: {
99-
7| break;
100-
8| }
101-
9| default:
102-
10| break;
103-
11| }
104-
<
105-
106-
[#3 Domain] = 0:15-11:1
88+
6| }
89+
7| default:
90+
8| break;
91+
9| }
92+
<
93+
94+
[#3 Domain] = 0:15-9:1
10795
>-
10896
0| switch (value) {
10997
1| case 0:
110-
2| break;
111-
3| case 1:
112-
4| foo;
98+
2| foo;
99+
3| break;
100+
4| case 1: {
113101
5| break;
114-
6| case 2: {
115-
7| break;
116-
8| }
117-
9| default:
118-
10| break;
119-
11| }
120-
-<
102+
6| }
103+
7| default:
104+
8| break;
105+
9| }
106+
-<
121107

122108
[#3 Insertion delimiter] = " "
123109

124110

125111
[#4 Content] =
126-
[#4 Removal] = 2:8-2:14
127-
>------<
128-
2| break;
129-
130-
[#4 Domain] = 1:4-2:14
131-
>-------
132-
1| case 0:
133-
2| break;
134-
--------------<
135-
136-
[#4 Insertion delimiter] = " "
137-
138-
139-
[#5 Content] =
140-
[#5 Removal] = 4:8-5:14
112+
[#4 Removal] = 2:8-3:14
141113
>----
142-
4| foo;
143-
5| break;
114+
2| foo;
115+
3| break;
144116
--------------<
145117

146-
[#5 Domain] = 3:4-5:14
118+
[#4 Domain] = 1:4-3:14
147119
>-------
148-
3| case 1:
149-
4| foo;
150-
5| break;
120+
1| case 0:
121+
2| foo;
122+
3| break;
151123
--------------<
152124

153-
[#5 Insertion delimiter] = " "
125+
[#4 Insertion delimiter] = " "
154126

155127

156-
[#6 Content] = 7:8-7:14
128+
[#5 Content] = 5:8-5:14
157129
>------<
158-
7| break;
130+
5| break;
159131

160-
[#6 Removal] = 6:13-8:4
132+
[#5 Removal] = 4:13-6:4
161133
>
162-
6| case 2: {
163-
7| break;
164-
8| }
134+
4| case 1: {
135+
5| break;
136+
6| }
165137
----<
166138

167-
[#6 Domain] = 6:4-8:5
139+
[#5 Domain] = 4:4-6:5
168140
>---------
169-
6| case 2: {
170-
7| break;
171-
8| }
141+
4| case 1: {
142+
5| break;
143+
6| }
172144
-----<
173145

174-
[#6 Insertion delimiter] = " "
146+
[#5 Insertion delimiter] = " "
175147

176148

177-
[#7 Content] = 7:8-7:14
149+
[#6 Content] = 5:8-5:14
178150
>------<
179-
7| break;
151+
5| break;
180152

181-
[#7 Removal] = 6:13-8:4
153+
[#6 Removal] = 4:13-6:4
182154
>
183-
6| case 2: {
184-
7| break;
185-
8| }
155+
4| case 1: {
156+
5| break;
157+
6| }
186158
----<
187159

188-
[#7 Domain] = 6:12-8:5
160+
[#6 Domain] = 4:12-6:5
189161
>-
190-
6| case 2: {
191-
7| break;
192-
8| }
162+
4| case 1: {
163+
5| break;
164+
6| }
193165
-----<
194166

195-
[#7 Insertion delimiter] = " "
167+
[#6 Insertion delimiter] = " "
196168

197169

198-
[#8 Content] =
199-
[#8 Removal] = 10:8-10:14
200-
>------<
201-
10| break;
170+
[#7 Content] =
171+
[#7 Removal] = 8:8-8:14
172+
>------<
173+
8| break;
202174

203-
[#8 Domain] = 9:4-10:14
175+
[#7 Domain] = 7:4-8:14
204176
>--------
205-
9| default:
206-
10| break;
207-
--------------<
177+
7| default:
178+
8| break;
179+
--------------<
208180

209-
[#8 Insertion delimiter] = " "
181+
[#7 Insertion delimiter] = " "

data/fixtures/scopes/c/interior.loop2.scope renamed to data/fixtures/scopes/c/interior.while.scope

File renamed without changes.

‎data/fixtures/scopes/cpp/interior.class.scope‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
class MyClass { }
2+
---
3+
4+
[#1 Content] =
5+
[#1 Removal] = 0:15-0:16
6+
>-<
7+
0| class MyClass { }
8+
9+
[#1 Domain] = 0:0-0:17
10+
>-----------------<
11+
0| class MyClass { }
12+
13+
[#1 Insertion delimiter] = " "
14+
15+
16+
[#2 Content] =
17+
[#2 Removal] = 0:15-0:16
18+
>-<
19+
0| class MyClass { }
20+
21+
[#2 Domain] = 0:14-0:17
22+
>---<
23+
0| class MyClass { }
24+
25+
[#2 Insertion delimiter] = " "

0 commit comments

Comments
 (0)