Skip to content

Commit f8a9222

Browse files
BlueDrink9BlueDrink9
committed
r: Update tests to include assignment operators
1 parent 84600ff commit f8a9222

File tree

7 files changed

+51
-149
lines changed

7 files changed

+51
-149
lines changed

‎data/fixtures/scopes/r/functionName.scope‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,16 @@ abc <- function(arg){
88
>---<
99
0| abc <- function(arg){
1010

11-
[Removal] = 0:0-0:4
12-
>----<
11+
[Removal] = 0:0-0:7
12+
>-------<
1313
0| abc <- function(arg){
14+
1| TRUE
15+
2| }
1416

15-
[Trailing delimiter] = 0:3-0:4
16-
>-<
17+
[Trailing delimiter] = 0:3-0:7
18+
>----<
1719
0| abc <- function(arg){
20+
1| TRUE
21+
2| }
1822

19-
[Insertion delimiter] = " "
23+
[Insertion delimiter] = " <- "

‎data/fixtures/scopes/r/name.assignment.scope‎

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,17 @@
1-
hello <- "world"
21
hello = "world"
32
---
43

5-
[#1 Content] =
6-
[#1 Domain] = 0:0-0:5
4+
[Content] =
5+
[Domain] = 0:0-0:5
76
>-----<
8-
0| hello <- "world"
7+
0| hello = "world"
98

10-
[#1 Removal] = 0:0-0:6
11-
>------<
12-
0| hello <- "world"
9+
[Removal] = 0:0-0:8
10+
>--------<
11+
0| hello = "world"
1312

14-
[#1 Trailing delimiter] = 0:5-0:6
15-
>-<
16-
0| hello <- "world"
13+
[Trailing delimiter] = 0:5-0:8
14+
>---<
15+
0| hello = "world"
1716

18-
[#1 Insertion delimiter] = " "
19-
20-
21-
[#2 Content] =
22-
[#2 Domain] = 1:0-1:5
23-
>-----<
24-
1| hello = "world"
25-
26-
[#2 Removal] = 1:0-1:6
27-
>------<
28-
1| hello = "world"
29-
30-
[#2 Trailing delimiter] = 1:5-1:6
31-
>-<
32-
1| hello = "world"
33-
34-
[#2 Insertion delimiter] = " "
17+
[Insertion delimiter] = " = "

‎data/fixtures/scopes/r/name.variable.scope‎

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,17 @@
11
hello <- "world"
2-
hello = "world"
32
---
43

5-
[#1 Content] =
6-
[#1 Domain] = 0:0-0:5
4+
[Content] =
5+
[Domain] = 0:0-0:5
76
>-----<
87
0| hello <- "world"
98

10-
[#1 Removal] = 0:0-0:6
11-
>------<
9+
[Removal] = 0:0-0:9
10+
>---------<
1211
0| hello <- "world"
1312

14-
[#1 Trailing delimiter] = 0:5-0:6
15-
>-<
13+
[Trailing delimiter] = 0:5-0:9
14+
>----<
1615
0| hello <- "world"
1716

18-
[#1 Insertion delimiter] = " "
19-
20-
21-
[#2 Content] =
22-
[#2 Domain] = 1:0-1:5
23-
>-----<
24-
1| hello = "world"
25-
26-
[#2 Removal] = 1:0-1:6
27-
>------<
28-
1| hello = "world"
29-
30-
[#2 Trailing delimiter] = 1:5-1:6
31-
>-<
32-
1| hello = "world"
33-
34-
[#2 Insertion delimiter] = " "
17+
[Insertion delimiter] = " <- "

‎data/fixtures/scopes/r/namedFunction.scope‎

Lines changed: 7 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,10 @@
1-
abc <- function(arg){
2-
TRUE
3-
}
4-
abc = function(arg){
5-
TRUE
6-
}
1+
foo <- function(bar){}
72
---
83

9-
[#1 Content] =
10-
[#1 Domain] = 0:0-2:1
11-
>---------------------
12-
0| abc <- function(arg){
13-
1| TRUE
14-
2| }
15-
-<
4+
[Content] =
5+
[Removal] =
6+
[Domain] = 0:0-0:22
7+
>----------------------<
8+
0| foo <- function(bar){}
169

17-
[#1 Removal] = 0:0-3:0
18-
>---------------------
19-
0| abc <- function(arg){
20-
1| TRUE
21-
2| }
22-
3| abc = function(arg){
23-
<
24-
25-
[#1 Insertion delimiter] = "\n\n"
26-
27-
28-
[#2 Content] =
29-
[#2 Domain] = 3:0-5:1
30-
>--------------------
31-
3| abc = function(arg){
32-
4| TRUE
33-
5| }
34-
-<
35-
36-
[#2 Removal] = 2:1-5:1
37-
>
38-
2| }
39-
3| abc = function(arg){
40-
4| TRUE
41-
5| }
42-
-<
43-
44-
[#2 Insertion delimiter] = "\n\n"
10+
[Insertion delimiter] = "\n\n"

‎data/fixtures/scopes/r/value.assignment.scope‎

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,17 @@
11
hello <- "world"
2-
hello = "world"
32
---
43

5-
[#1 Content] =
6-
[#1 Domain] = 0:9-0:16
4+
[Content] =
5+
[Domain] = 0:9-0:16
76
>-------<
87
0| hello <- "world"
98

10-
[#1 Removal] = 0:8-0:16
11-
>--------<
9+
[Removal] = 0:5-0:16
10+
>-----------<
1211
0| hello <- "world"
1312

14-
[#1 Leading delimiter] = 0:8-0:9
15-
>-<
13+
[Leading delimiter] = 0:5-0:9
14+
>----<
1615
0| hello <- "world"
1716

18-
[#1 Insertion delimiter] = " "
19-
20-
21-
[#2 Content] =
22-
[#2 Domain] = 1:8-1:15
23-
>-------<
24-
1| hello = "world"
25-
26-
[#2 Removal] = 1:7-1:15
27-
>--------<
28-
1| hello = "world"
29-
30-
[#2 Leading delimiter] = 1:7-1:8
31-
>-<
32-
1| hello = "world"
33-
34-
[#2 Insertion delimiter] = " "
17+
[Insertion delimiter] = " <- "

‎data/fixtures/scopes/r/value.variable.scope‎

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,17 @@
1-
hello <- "world"
21
hello = "world"
32
---
43

5-
[#1 Content] =
6-
[#1 Domain] = 0:9-0:16
7-
>-------<
8-
0| hello <- "world"
9-
10-
[#1 Removal] = 0:8-0:16
11-
>--------<
12-
0| hello <- "world"
13-
14-
[#1 Leading delimiter] = 0:8-0:9
15-
>-<
16-
0| hello <- "world"
17-
18-
[#1 Insertion delimiter] = " "
19-
20-
21-
[#2 Content] =
22-
[#2 Domain] = 1:8-1:15
4+
[Content] =
5+
[Domain] = 0:8-0:15
236
>-------<
24-
1| hello = "world"
7+
0| hello = "world"
258

26-
[#2 Removal] = 1:7-1:15
27-
>--------<
28-
1| hello = "world"
9+
[Removal] = 0:5-0:15
10+
>----------<
11+
0| hello = "world"
2912

30-
[#2 Leading delimiter] = 1:7-1:8
31-
>-<
32-
1| hello = "world"
13+
[Leading delimiter] = 0:5-0:8
14+
>---<
15+
0| hello = "world"
3316

34-
[#2 Insertion delimiter] = " "
17+
[Insertion delimiter] = " "

‎packages/common/src/scopeSupportFacets/r.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ export const rScopeSupport: LanguageScopeSupportFacetMap = {
99
"argument.actual": supported,
1010
"argumentList.formal": supported,
1111
"comment.line": supported,
12-
"condition.if": supported,
1312
"functionCall": supported,
1413
"functionCallee": supported,
1514
"functionName": supported,
@@ -29,6 +28,7 @@ export const rScopeSupport: LanguageScopeSupportFacetMap = {
2928
"branch.try": unsupported,
3029
"branch.try.iteration": unsupported,
3130
"condition.for": unsupported,
31+
"condition.if": unsupported,
3232
"condition.ternary": unsupported,
3333
"condition.while": unsupported,
3434
"interior.class": unsupported,

0 commit comments

Comments
 (0)