Skip to content

Commit f219fba

Browse files
Add more scope facets (#3184)
1 parent 1b02c7e commit f219fba

142 files changed

Lines changed: 2109 additions & 1445 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/recorded/queryBasedMatchers/clearCoreEveryClass.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ initialState:
3232
def fff():
3333
pass
3434
selections:
35-
- anchor: {line: 8, character: 19}
36-
active: {line: 8, character: 19}
35+
- anchor: {line: 0, character: 0}
36+
active: {line: 0, character: 0}
3737
marks: {}
3838
finalState:
3939
documentContents: |

data/fixtures/recorded/queryBasedMatchers/clearEveryClass.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ initialState:
3131
def fff():
3232
pass
3333
selections:
34-
- anchor: {line: 8, character: 13}
35-
active: {line: 8, character: 13}
34+
- anchor: {line: 0, character: 0}
35+
active: {line: 0, character: 0}
3636
marks: {}
3737
finalState:
3838
documentContents: |+

data/fixtures/recorded/queryBasedMatchers/clearEveryClass2.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ initialState:
3131
def fff():
3232
pass
3333
selections:
34-
- anchor: {line: 10, character: 16}
35-
active: {line: 10, character: 16}
34+
- anchor: {line: 0, character: 0}
35+
active: {line: 0, character: 0}
3636
marks: {}
3737
finalState:
3838
documentContents: |+

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

Lines changed: 20 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,33 @@ switch (foo) {
22
case 0:
33
bar;
44
break;
5-
case 1: {
6-
break;
7-
}
85
default:
6+
bar;
97
break;
108
}
119
---
1210

13-
[#1 Content] = 1:4-8:14
11+
[#1 Content] = 1:4-6:14
1412
>-------
1513
1| case 0:
1614
2| bar;
1715
3| break;
18-
4| case 1: {
19-
5| break;
20-
6| }
21-
7| default:
22-
8| break;
16+
4| default:
17+
5| bar;
18+
6| break;
2319
--------------<
2420

2521
[#1 Removal] =
26-
[#1 Domain] = 0:14-9:0
22+
[#1 Domain] = 0:14-7:0
2723
>
2824
0| switch (foo) {
2925
1| case 0:
3026
2| bar;
3127
3| break;
32-
4| case 1: {
33-
5| break;
34-
6| }
35-
7| default:
36-
8| break;
37-
9| }
28+
4| default:
29+
5| bar;
30+
6| break;
31+
7| }
3832
<
3933

4034
[#1 Insertion delimiter] = " "
@@ -57,30 +51,18 @@ switch (foo) {
5751
[#2 Insertion delimiter] = " "
5852

5953

60-
[#3 Content] = 5:8-5:14
61-
>------<
62-
5| break;
54+
[#3 Content] = 5:8-6:14
55+
>----
56+
5| bar;
57+
6| break;
58+
--------------<
6359

6460
[#3 Removal] =
65-
[#3 Domain] = 4:13-6:4
66-
>
67-
4| case 1: {
68-
5| break;
69-
6| }
70-
----<
71-
72-
[#3 Insertion delimiter] = " "
73-
74-
75-
[#4 Content] = 8:8-8:14
76-
>------<
77-
8| break;
78-
79-
[#4 Removal] =
80-
[#4 Domain] = 7:12-8:14
61+
[#3 Domain] = 4:12-6:14
8162
>
82-
7| default:
83-
8| break;
63+
4| default:
64+
5| bar;
65+
6| break;
8466
--------------<
8567

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

44
[#1 Content] =
5-
[#1 Domain] = 0:0-0:37
6-
>-------------------------------------<
7-
0| void foo(int aaa = 0, int bbb = 1) {}
5+
[#1 Domain] = 0:0-0:33
6+
>---------------------------------<
7+
0| void foo(int aaa, int bbb = 1) {}
88

99

1010
[#2 Content] =
11-
[#2 Domain] = 0:9-0:33
12-
>------------------------<
13-
0| void foo(int aaa = 0, int bbb = 1) {}
11+
[#2 Domain] = 0:9-0:29
12+
>--------------------<
13+
0| void foo(int aaa, int bbb = 1) {}
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
[](int aaa, int bbb) {}
1+
[](int aaa, int bbb = 0) {}
22
---
33

44
[#1 Content] =
5-
[#1 Domain] = 0:0-0:23
6-
>-----------------------<
7-
0| [](int aaa, int bbb) {}
5+
[#1 Domain] = 0:0-0:27
6+
>---------------------------<
7+
0| [](int aaa, int bbb = 0) {}
88

99

1010
[#2 Content] =
11-
[#2 Domain] = 0:3-0:19
12-
>----------------<
13-
0| [](int aaa, int bbb) {}
11+
[#2 Domain] = 0:3-0:23
12+
>--------------------<
13+
0| [](int aaa, int bbb = 0) {}
Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,43 @@
1-
[](int aaa, int bbb) {}
1+
[](int aaa, int bbb = 0) {}
22
---
33

44
[#1 Content] = 0:7-0:10
55
>---<
6-
0| [](int aaa, int bbb) {}
6+
0| [](int aaa, int bbb = 0) {}
77

88
[#1 Removal] = 0:6-0:10
99
>----<
10-
0| [](int aaa, int bbb) {}
10+
0| [](int aaa, int bbb = 0) {}
1111

1212
[#1 Leading delimiter] = 0:6-0:7
1313
>-<
14-
0| [](int aaa, int bbb) {}
14+
0| [](int aaa, int bbb = 0) {}
1515

1616
[#1 Domain] = 0:3-0:10
1717
>-------<
18-
0| [](int aaa, int bbb) {}
18+
0| [](int aaa, int bbb = 0) {}
1919

2020
[#1 Insertion delimiter] = " "
2121

2222

2323
[#2 Content] = 0:16-0:19
2424
>---<
25-
0| [](int aaa, int bbb) {}
25+
0| [](int aaa, int bbb = 0) {}
2626

27-
[#2 Removal] = 0:15-0:19
28-
>----<
29-
0| [](int aaa, int bbb) {}
27+
[#2 Removal] = 0:16-0:20
28+
>----<
29+
0| [](int aaa, int bbb = 0) {}
3030

3131
[#2 Leading delimiter] = 0:15-0:16
3232
>-<
33-
0| [](int aaa, int bbb) {}
33+
0| [](int aaa, int bbb = 0) {}
3434

35-
[#2 Domain] = 0:12-0:19
36-
>-------<
37-
0| [](int aaa, int bbb) {}
35+
[#2 Trailing delimiter] = 0:19-0:20
36+
>-<
37+
0| [](int aaa, int bbb = 0) {}
38+
39+
[#2 Domain] = 0:12-0:23
40+
>-----------<
41+
0| [](int aaa, int bbb = 0) {}
3842

3943
[#2 Insertion delimiter] = " "
Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,59 @@
1-
void foo(int aaa = 0, int bbb = 1) {}
1+
void foo(int aaa, int bbb = 0) {}
22
---
33

44
[#1 Content] =
55
[#1 Removal] = 0:5-0:8
66
>---<
7-
0| void foo(int aaa = 0, int bbb = 1) {}
7+
0| void foo(int aaa, int bbb = 0) {}
88

99
[#1 Leading delimiter] = 0:4-0:5
1010
>-<
11-
0| void foo(int aaa = 0, int bbb = 1) {}
11+
0| void foo(int aaa, int bbb = 0) {}
1212

13-
[#1 Domain] = 0:0-0:37
14-
>-------------------------------------<
15-
0| void foo(int aaa = 0, int bbb = 1) {}
13+
[#1 Domain] = 0:0-0:33
14+
>---------------------------------<
15+
0| void foo(int aaa, int bbb = 0) {}
1616

1717
[#1 Insertion delimiter] = " "
1818

1919

2020
[#2 Content] = 0:13-0:16
2121
>---<
22-
0| void foo(int aaa = 0, int bbb = 1) {}
22+
0| void foo(int aaa, int bbb = 0) {}
2323

24-
[#2 Removal] = 0:13-0:17
25-
>----<
26-
0| void foo(int aaa = 0, int bbb = 1) {}
24+
[#2 Removal] = 0:12-0:16
25+
>----<
26+
0| void foo(int aaa, int bbb = 0) {}
2727

2828
[#2 Leading delimiter] = 0:12-0:13
2929
>-<
30-
0| void foo(int aaa = 0, int bbb = 1) {}
30+
0| void foo(int aaa, int bbb = 0) {}
3131

32-
[#2 Trailing delimiter] = 0:16-0:17
33-
>-<
34-
0| void foo(int aaa = 0, int bbb = 1) {}
35-
36-
[#2 Domain] = 0:9-0:20
37-
>-----------<
38-
0| void foo(int aaa = 0, int bbb = 1) {}
32+
[#2 Domain] = 0:9-0:16
33+
>-------<
34+
0| void foo(int aaa, int bbb = 0) {}
3935

4036
[#2 Insertion delimiter] = " "
4137

4238

43-
[#3 Content] = 0:26-0:29
44-
>---<
45-
0| void foo(int aaa = 0, int bbb = 1) {}
39+
[#3 Content] = 0:22-0:25
40+
>---<
41+
0| void foo(int aaa, int bbb = 0) {}
4642

47-
[#3 Removal] = 0:26-0:30
48-
>----<
49-
0| void foo(int aaa = 0, int bbb = 1) {}
43+
[#3 Removal] = 0:22-0:26
44+
>----<
45+
0| void foo(int aaa, int bbb = 0) {}
5046

51-
[#3 Leading delimiter] = 0:25-0:26
52-
>-<
53-
0| void foo(int aaa = 0, int bbb = 1) {}
47+
[#3 Leading delimiter] = 0:21-0:22
48+
>-<
49+
0| void foo(int aaa, int bbb = 0) {}
5450

55-
[#3 Trailing delimiter] = 0:29-0:30
56-
>-<
57-
0| void foo(int aaa = 0, int bbb = 1) {}
51+
[#3 Trailing delimiter] = 0:25-0:26
52+
>-<
53+
0| void foo(int aaa, int bbb = 0) {}
5854

59-
[#3 Domain] = 0:22-0:33
60-
>-----------<
61-
0| void foo(int aaa = 0, int bbb = 1) {}
55+
[#3 Domain] = 0:18-0:29
56+
>-----------<
57+
0| void foo(int aaa, int bbb = 0) {}
6258

6359
[#3 Insertion delimiter] = " "
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[](int aaa = 0, int bbb = 1) {}
2+
---
3+
4+
[#1 Content] =
5+
[#1 Domain] = 0:0-0:31
6+
>-------------------------------<
7+
0| [](int aaa = 0, int bbb = 1) {}
8+
9+
10+
[#2 Content] =
11+
[#2 Domain] = 0:3-0:27
12+
>------------------------<
13+
0| [](int aaa = 0, int bbb = 1) {}

0 commit comments

Comments
 (0)