Skip to content

Commit 08fb4ef

Browse files
AndreasArvidssonAndreasArvidsson
authored
Added interior scopes to javascript (#2992)
1 parent 8e0214f commit 08fb4ef

22 files changed

+934
-102
lines changed

‎.vscode/settings.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
// Place your settings in this file to overwrite default and user settings.
21
{
2+
"[lua]": {
3+
"editor.defaultFormatter": "JohnnyMorganz.stylua"
4+
},
35
"[python]": {
46
"editor.defaultFormatter": "charliermarsh.ruff"
57
},
68
"[scm]": {
7-
"editor.defaultFormatter": "AndreasArvidsson.andreas-talon"
9+
"editor.defaultFormatter": "AndreasArvidsson.andreas-talon",
10+
"editor.tabSize": 2
811
},
912
"[talon]": {
1013
"editor.defaultFormatter": "wenkokke.talonfmt-vscode"
1114
},
12-
"editor.defaultFormatter": "esbenp.prettier-vscode",
13-
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
14-
"typescript.tsc.autoDetect": "off",
1515
"cSpell.words": [
1616
"Autoformatting",
1717
"camelize",
@@ -22,14 +22,14 @@
2222
"pojo",
2323
"subword"
2424
],
25-
"files.eol": "\n",
26-
"typescript.enablePromptUseWorkspaceTsdk": true,
27-
"typescript.tsdk": "node_modules/typescript/lib",
25+
"editor.defaultFormatter": "esbenp.prettier-vscode",
2826
"eslint.workingDirectories": [{ "pattern": "packages/*/" }],
29-
"[lua]": {
30-
"editor.defaultFormatter": "JohnnyMorganz.stylua"
31-
},
3227
"files.associations": {
3328
".busted": "lua"
34-
}
29+
},
30+
"files.eol": "\n",
31+
"typescript.enablePromptUseWorkspaceTsdk": true,
32+
"typescript.tsdk": "node_modules/typescript/lib",
33+
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
34+
"typescript.tsc.autoDetect": "off"
3535
}

‎data/fixtures/scopes/javascript.core/interior.class.scope‎

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

‎data/fixtures/scopes/javascript.core/interior.function.scope‎

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

‎data/fixtures/scopes/javascript.core/interior.function2.scope‎

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

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

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
if (true) { }
2+
else if (false) { }
3+
else { }
4+
---
5+
6+
[#1 Content] =
7+
[#1 Removal] = 0:11-0:12
8+
>-<
9+
0| if (true) { }
10+
11+
[#1 Domain] = 0:0-0:13
12+
>-------------<
13+
0| if (true) { }
14+
15+
[#1 Insertion delimiter] = " "
16+
17+
18+
[#2 Content] =
19+
[#2 Removal] = 0:4-0:8
20+
>----<
21+
0| if (true) { }
22+
23+
[#2 Domain] = 0:3-0:9
24+
>------<
25+
0| if (true) { }
26+
27+
[#2 Insertion delimiter] = " "
28+
29+
30+
[#3 Content] =
31+
[#3 Removal] = 0:11-0:12
32+
>-<
33+
0| if (true) { }
34+
35+
[#3 Domain] = 0:10-0:13
36+
>---<
37+
0| if (true) { }
38+
39+
[#3 Insertion delimiter] = " "
40+
41+
42+
[#4 Content] =
43+
[#4 Removal] = 1:17-1:18
44+
>-<
45+
1| else if (false) { }
46+
47+
[#4 Domain] = 1:0-1:19
48+
>-------------------<
49+
1| else if (false) { }
50+
51+
[#4 Insertion delimiter] = " "
52+
53+
54+
[#5 Content] =
55+
[#5 Removal] = 1:9-1:14
56+
>-----<
57+
1| else if (false) { }
58+
59+
[#5 Domain] = 1:8-1:15
60+
>-------<
61+
1| else if (false) { }
62+
63+
[#5 Insertion delimiter] = " "
64+
65+
66+
[#6 Content] =
67+
[#6 Removal] = 1:17-1:18
68+
>-<
69+
1| else if (false) { }
70+
71+
[#6 Domain] = 1:16-1:19
72+
>---<
73+
1| else if (false) { }
74+
75+
[#6 Insertion delimiter] = " "
76+
77+
78+
[#7 Content] =
79+
[#7 Removal] = 2:6-2:7
80+
>-<
81+
2| else { }
82+
83+
[#7 Domain] = 2:0-2:8
84+
>--------<
85+
2| else { }
86+
87+
[#7 Insertion delimiter] = " "
88+
89+
90+
[#8 Content] =
91+
[#8 Removal] = 2:6-2:7
92+
>-<
93+
2| else { }
94+
95+
[#8 Domain] = 2:5-2:8
96+
>---<
97+
2| else { }
98+
99+
[#8 Insertion delimiter] = " "

‎data/fixtures/scopes/javascript.core/interior.lambda.scope‎

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

‎data/fixtures/scopes/javascript.core/interior.lambda2.scope‎

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

‎data/fixtures/scopes/javascript.core/interior.loop.scope‎

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

0 commit comments

Comments
 (0)