Skip to content

Commit 4aff72e

Browse files
AndreasArvidssonAndreasArvidsson
committed
Condition
1 parent 7ac3d44 commit 4aff72e

File tree

6 files changed

+142
-71
lines changed

6 files changed

+142
-71
lines changed

‎data/fixtures/scopes/csharp/condition.if.scope‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,30 @@
1-
if (1 < 5) { }
1+
if (true) {}
2+
else if (false) {}
3+
else {}
24
---
35

4-
[Content] =
5-
[Removal] = 0:4-0:9
6-
>-----<
7-
0| if (1 < 5) { }
6+
[#1 Content] =
7+
[#1 Removal] = 0:4-0:8
8+
>----<
9+
0| if (true) {}
810

9-
[Domain] = 0:0-0:14
10-
>--------------<
11-
0| if (1 < 5) { }
11+
[#1 Domain] = 0:0-2:7
12+
>------------
13+
0| if (true) {}
14+
1| else if (false) {}
15+
2| else {}
16+
-------<
1217

13-
[Insertion delimiter] = " "
18+
[#1 Insertion delimiter] = " "
19+
20+
21+
[#2 Content] =
22+
[#2 Removal] = 1:9-1:14
23+
>-----<
24+
1| else if (false) {}
25+
26+
[#2 Domain] = 1:0-1:18
27+
>------------------<
28+
1| else if (false) {}
29+
30+
[#2 Insertion delimiter] = " "

‎data/fixtures/scopes/java/condition.if.scope‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,30 @@
1-
if (value != null) { }
1+
if (true) {}
2+
else if (false) {}
3+
else {}
24
---
35

4-
[Content] =
5-
[Removal] = 0:4-0:17
6-
>-------------<
7-
0| if (value != null) { }
6+
[#1 Content] =
7+
[#1 Removal] = 0:4-0:8
8+
>----<
9+
0| if (true) {}
810

9-
[Domain] = 0:0-0:22
10-
>----------------------<
11-
0| if (value != null) { }
11+
[#1 Domain] = 0:0-2:7
12+
>------------
13+
0| if (true) {}
14+
1| else if (false) {}
15+
2| else {}
16+
-------<
1217

13-
[Insertion delimiter] = " "
18+
[#1 Insertion delimiter] = " "
19+
20+
21+
[#2 Content] =
22+
[#2 Removal] = 1:9-1:14
23+
>-----<
24+
1| else if (false) {}
25+
26+
[#2 Domain] = 1:0-1:18
27+
>------------------<
28+
1| else if (false) {}
29+
30+
[#2 Insertion delimiter] = " "

‎data/fixtures/scopes/javascript.core/condition.if.scope‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,30 @@
1-
if (true) {
2-
3-
}
1+
if (true) {}
2+
else if (false) {}
3+
else {}
44
---
55

6-
[Content] =
7-
[Removal] = 0:4-0:8
6+
[#1 Content] =
7+
[#1 Removal] = 0:4-0:8
88
>----<
9-
0| if (true) {
9+
0| if (true) {}
10+
11+
[#1 Domain] = 0:0-2:7
12+
>------------
13+
0| if (true) {}
14+
1| else if (false) {}
15+
2| else {}
16+
-------<
17+
18+
[#1 Insertion delimiter] = " "
19+
20+
21+
[#2 Content] =
22+
[#2 Removal] = 1:9-1:14
23+
>-----<
24+
1| else if (false) {}
1025

11-
[Domain] = 0:0-2:1
12-
>-----------
13-
0| if (true) {
14-
1|
15-
2| }
16-
-<
26+
[#2 Domain] = 1:0-1:18
27+
>------------------<
28+
1| else if (false) {}
1729

18-
[Insertion delimiter] = " "
30+
[#2 Insertion delimiter] = " "

‎data/fixtures/scopes/python/condition.if.scope‎

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,44 @@
1-
if value > 0:
2-
pass
1+
if True: pass
2+
elif False: pass
3+
else: pass
34
---
45

5-
[Content] = 0:3-0:12
6-
>---------<
7-
0| if value > 0:
6+
[#1 Content] = 0:3-0:7
7+
>----<
8+
0| if True: pass
89

9-
[Removal] = 0:2-0:12
10-
>----------<
11-
0| if value > 0:
10+
[#1 Removal] = 0:2-0:7
11+
>-----<
12+
0| if True: pass
1213

13-
[Leading delimiter] = 0:2-0:3
14+
[#1 Leading delimiter] = 0:2-0:3
1415
>-<
15-
0| if value > 0:
16+
0| if True: pass
1617

17-
[Domain] = 0:0-1:8
18+
[#1 Domain] = 0:0-2:10
1819
>-------------
19-
0| if value > 0:
20-
1| pass
21-
--------<
20+
0| if True: pass
21+
1| elif False: pass
22+
2| else: pass
23+
----------<
2224

23-
[Insertion delimiter] = " "
25+
[#1 Insertion delimiter] = " "
26+
27+
28+
[#2 Content] = 1:5-1:10
29+
>-----<
30+
1| elif False: pass
31+
32+
[#2 Removal] = 1:4-1:10
33+
>------<
34+
1| elif False: pass
35+
36+
[#2 Leading delimiter] = 1:4-1:5
37+
>-<
38+
1| elif False: pass
39+
40+
[#2 Domain] = 1:0-1:16
41+
>----------------<
42+
1| elif False: pass
43+
44+
[#2 Insertion delimiter] = " "

‎data/fixtures/scopes/scss/condition.if.scope‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
1-
@if true { }
2-
@else if false { }
3-
@else { }
1+
@if true {}
2+
@else if false {}
3+
@else {}
44
---
55

66
[#1 Content] = 0:4-0:8
77
>----<
8-
0| @if true { }
8+
0| @if true {}
99

1010
[#1 Removal] = 0:4-0:9
1111
>-----<
12-
0| @if true { }
12+
0| @if true {}
1313

1414
[#1 Leading delimiter] = 0:3-0:4
1515
>-<
16-
0| @if true { }
16+
0| @if true {}
1717

1818
[#1 Trailing delimiter] = 0:8-0:9
1919
>-<
20-
0| @if true { }
20+
0| @if true {}
2121

22-
[#1 Domain] = 0:0-2:9
23-
>------------
24-
0| @if true { }
25-
1| @else if false { }
26-
2| @else { }
27-
---------<
22+
[#1 Domain] = 0:0-2:8
23+
>-----------
24+
0| @if true {}
25+
1| @else if false {}
26+
2| @else {}
27+
--------<
2828

2929
[#1 Insertion delimiter] = " "
3030

3131

3232
[#2 Content] = 1:9-1:14
3333
>-----<
34-
1| @else if false { }
34+
1| @else if false {}
3535

3636
[#2 Removal] = 1:9-1:15
3737
>------<
38-
1| @else if false { }
38+
1| @else if false {}
3939

4040
[#2 Leading delimiter] = 1:8-1:9
4141
>-<
42-
1| @else if false { }
42+
1| @else if false {}
4343

4444
[#2 Trailing delimiter] = 1:14-1:15
4545
>-<
46-
1| @else if false { }
46+
1| @else if false {}
4747

48-
[#2 Domain] = 1:0-1:18
49-
>------------------<
50-
1| @else if false { }
48+
[#2 Domain] = 1:0-1:17
49+
>-----------------<
50+
1| @else if false {}
5151

5252
[#2 Insertion delimiter] = " "

‎queries/csharp.scm‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
(yield_statement)
4949
] @statement
5050

51-
(if_statement) @ifStatement
52-
5351
(
5452
(compilation_unit) @statement.iteration @class.iteration @className.iteration
5553
(#document-range! @statement.iteration @class.iteration @className.iteration)
@@ -67,6 +65,10 @@
6765
)
6866
)
6967

68+
;;!! if () {}
69+
;;! ^^^^^^^^
70+
(if_statement) @ifStatement
71+
7072
;;!! if () {}
7173
;;! ^^^^^^^^
7274
(
@@ -75,7 +77,7 @@
7577
consequence: (_) @branch.end.endOf @branch.removal.end.endOf
7678
alternative: (_)? @branch.removal.end.startOf
7779
) @branch.start.startOf @branch.removal.start.startOf @condition.domain
78-
(#not-parent-type? @condition.domain "if_statement")
80+
(#not-parent-type? @condition.domain if_statement)
7981
)
8082
(
8183
(if_statement
@@ -84,7 +86,7 @@
8486
"}" @interior.end.startOf
8587
) @interior.domain.end.endOf
8688
) @interior.domain.start.startOf
87-
(#not-parent-type? @interior.domain.start.startOf "if_statement")
89+
(#not-parent-type? @interior.domain.start.startOf if_statement)
8890
)
8991

9092
;;!! else if () {}
@@ -114,7 +116,7 @@
114116
;;! ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
115117
(
116118
(if_statement) @branch.iteration
117-
(#not-parent-type? @branch.iteration "if_statement")
119+
(#not-parent-type? @branch.iteration if_statement)
118120
)
119121

120122
;;!! try () {}
@@ -290,7 +292,9 @@
290292

291293
(_
292294
condition: (_) @condition
295+
(#not-parent-type? @condition if_statement)
293296
) @_.domain
297+
294298
(while_statement
295299
.
296300
(_) @condition

0 commit comments

Comments
 (0)