Skip to content

Commit 5d67e7f

Browse files
rinOfTheStarsrinOfTheStars
authored
Merge branch 'main' into main
2 parents 963c0e4 + 7ac3d44 commit 5d67e7f

Some content is hidden

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

57 files changed

+2392
-299
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/csharp/functionName.iteration.document.scope‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
void Foo() { }
3+
4+
---
5+
6+
[Range] =
7+
[Domain] = 0:0-2:0
8+
>
9+
0|
10+
1| void Foo() { }
11+
2|
12+
<

‎data/fixtures/scopes/csharp/functionName.method.iteration.class.scope‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
class MyClass { }
22
---
33

4-
[Range] =
5-
[Domain] = 0:15-0:16
4+
[#1 Range] =
5+
[#1 Domain] = 0:0-0:17
6+
>-----------------<
7+
0| class MyClass { }
8+
9+
10+
[#2 Range] =
11+
[#2 Domain] = 0:15-0:16
612
>-<
713
0| class MyClass { }

‎data/fixtures/scopes/csharp/namedFunction.iteration.document.scope‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
void Foo() { }
3+
4+
---
5+
6+
[Range] =
7+
[Domain] = 0:0-2:0
8+
>
9+
0|
10+
1| void Foo() { }
11+
2|
12+
<

‎data/fixtures/scopes/csharp/namedFunction.method.iteration.class.scope‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
class MyClass { }
22
---
33

4-
[Range] =
5-
[Domain] = 0:15-0:16
4+
[#1 Range] =
5+
[#1 Domain] = 0:0-0:17
6+
>-----------------<
7+
0| class MyClass { }
8+
9+
10+
[#2 Range] =
11+
[#2 Domain] = 0:15-0:16
612
>-<
713
0| class MyClass { }

‎data/fixtures/scopes/java/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/java/interior.class2.scope‎

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

‎data/fixtures/scopes/java/interior.function.scope‎

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

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

0 commit comments

Comments
 (0)