Skip to content

Commit bac39ff

Browse files
DaanV2DaanV2
committed
Prepared
1 parent 8f0dac5 commit bac39ff

36 files changed

+410
-223
lines changed

‎src/mcfunction/diagnostics/commands/ScoreboardDiagnostics.ts

Lines changed: 135 additions & 68 deletions
Large diffs are not rendered by default.

‎src/mcfunction/diagnostics/commands/giveDiagnostics.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as vscode from 'vscode';
2-
import { DiagnosticsManager,DiagnosticProvider } from '../DiagnosticsManager';
2+
import { DiagnosticsManager,DiagnosticProvider, Errors } from '../DiagnosticsManager';
33
import { SyntaxItem } from '../../../general/include';
44

55
export class giveDiagnosticProvider implements DiagnosticProvider {
@@ -9,13 +9,15 @@ export class giveDiagnosticProvider implements DiagnosticProvider {
99

1010
//<player: target>
1111
if (word == undefined) {
12-
//MISSING ERROR
12+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
13+
return;
1314
}
1415
dm.SelectorDiagnoser?.provideDiagnostic(word, lineIndex, collector, dm, document);
1516

1617
//<itemName: Item>
1718
if (word == undefined) {
18-
//MISSING ERROR
19+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
20+
return;
1921
}
2022
dm.ItemDiagnoser?.provideDiagnostic(word, lineIndex, collector, dm, document);
2123

@@ -56,7 +58,8 @@ export class giveDiagnosticProvider implements DiagnosticProvider {
5658

5759
//{ "minecraft:can_destroy": { "blocks": [ "grass" ]}, "minecraft:can_place_on": { "blocks": [ "grass" ]}}
5860
if (word == undefined) {
59-
//MISSING ERROR
61+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
62+
return;
6063
}
6164

6265
}

‎src/mcfunction/diagnostics/commands/killDiagnostics.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as vscode from 'vscode';
2-
import { DiagnosticsManager,DiagnosticProvider } from '../DiagnosticsManager';
2+
import { DiagnosticsManager,DiagnosticProvider, Errors } from '../DiagnosticsManager';
33
import { SyntaxItem } from '../../../general/include';
44

55
export class killDiagnosticProvider implements DiagnosticProvider {

‎src/mcfunction/diagnostics/commands/locateDiagnostics.ts

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as vscode from 'vscode';
2-
import { DiagnosticsManager,DiagnosticProvider } from '../DiagnosticsManager';
2+
import { DiagnosticsManager,DiagnosticProvider, Errors } from '../DiagnosticsManager';
33
import { SyntaxItem } from '../../../general/include';
44

55
export class locateDiagnosticProvider implements DiagnosticProvider {
@@ -67,95 +67,107 @@ export class locateDiagnosticProvider implements DiagnosticProvider {
6767

6868
//buriedtreasure
6969
if (word == undefined) {
70-
//MISSING ERROR
70+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
71+
return;
7172
}
7273

7374
}
7475
branchendcity(item: SyntaxItem, lineIndex: number, collector: vscode.Diagnostic[], dm: DiagnosticsManager, document: vscode.TextDocument) : void {
7576

7677
//endcity
7778
if (word == undefined) {
78-
//MISSING ERROR
79+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
80+
return;
7981
}
8082

8183
}
8284
branchfortress(item: SyntaxItem, lineIndex: number, collector: vscode.Diagnostic[], dm: DiagnosticsManager, document: vscode.TextDocument) : void {
8385

8486
//fortress
8587
if (word == undefined) {
86-
//MISSING ERROR
88+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
89+
return;
8790
}
8891

8992
}
9093
branchmansion(item: SyntaxItem, lineIndex: number, collector: vscode.Diagnostic[], dm: DiagnosticsManager, document: vscode.TextDocument) : void {
9194

9295
//mansion
9396
if (word == undefined) {
94-
//MISSING ERROR
97+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
98+
return;
9599
}
96100

97101
}
98102
branchmineshaft(item: SyntaxItem, lineIndex: number, collector: vscode.Diagnostic[], dm: DiagnosticsManager, document: vscode.TextDocument) : void {
99103

100104
//mineshaft
101105
if (word == undefined) {
102-
//MISSING ERROR
106+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
107+
return;
103108
}
104109

105110
}
106111
branchmonument(item: SyntaxItem, lineIndex: number, collector: vscode.Diagnostic[], dm: DiagnosticsManager, document: vscode.TextDocument) : void {
107112

108113
//monument
109114
if (word == undefined) {
110-
//MISSING ERROR
115+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
116+
return;
111117
}
112118

113119
}
114120
branchruins(item: SyntaxItem, lineIndex: number, collector: vscode.Diagnostic[], dm: DiagnosticsManager, document: vscode.TextDocument) : void {
115121

116122
//ruins
117123
if (word == undefined) {
118-
//MISSING ERROR
124+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
125+
return;
119126
}
120127

121128
}
122129
branchshipwreck(item: SyntaxItem, lineIndex: number, collector: vscode.Diagnostic[], dm: DiagnosticsManager, document: vscode.TextDocument) : void {
123130

124131
//shipwreck
125132
if (word == undefined) {
126-
//MISSING ERROR
133+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
134+
return;
127135
}
128136

129137
}
130138
branchstronghold(item: SyntaxItem, lineIndex: number, collector: vscode.Diagnostic[], dm: DiagnosticsManager, document: vscode.TextDocument) : void {
131139

132140
//stronghold
133141
if (word == undefined) {
134-
//MISSING ERROR
142+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
143+
return;
135144
}
136145

137146
}
138147
branchtemple(item: SyntaxItem, lineIndex: number, collector: vscode.Diagnostic[], dm: DiagnosticsManager, document: vscode.TextDocument) : void {
139148

140149
//temple
141150
if (word == undefined) {
142-
//MISSING ERROR
151+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
152+
return;
143153
}
144154

145155
}
146156
branchvillage(item: SyntaxItem, lineIndex: number, collector: vscode.Diagnostic[], dm: DiagnosticsManager, document: vscode.TextDocument) : void {
147157

148158
//village
149159
if (word == undefined) {
150-
//MISSING ERROR
160+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
161+
return;
151162
}
152163

153164
}
154165
branchpillageroutpost(item: SyntaxItem, lineIndex: number, collector: vscode.Diagnostic[], dm: DiagnosticsManager, document: vscode.TextDocument) : void {
155166

156167
//pillageroutpost
157168
if (word == undefined) {
158-
//MISSING ERROR
169+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
170+
return;
159171
}
160172

161173
}

‎src/mcfunction/diagnostics/commands/meDiagnostics.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as vscode from 'vscode';
2-
import { DiagnosticsManager,DiagnosticProvider } from '../DiagnosticsManager';
2+
import { DiagnosticsManager,DiagnosticProvider, Errors } from '../DiagnosticsManager';
33
import { SyntaxItem } from '../../../general/include';
44

55
export class meDiagnosticProvider implements DiagnosticProvider {
@@ -9,7 +9,8 @@ export class meDiagnosticProvider implements DiagnosticProvider {
99

1010
//<message: message>
1111
if (word == undefined) {
12-
//MISSING ERROR
12+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
13+
return;
1314
}
1415

1516
}

‎src/mcfunction/diagnostics/commands/mobeventDiagnostics.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as vscode from 'vscode';
2-
import { DiagnosticsManager,DiagnosticProvider } from '../DiagnosticsManager';
2+
import { DiagnosticsManager,DiagnosticProvider, Errors } from '../DiagnosticsManager';
33
import { SyntaxItem } from '../../../general/include';
44

55
export class mobeventDiagnosticProvider implements DiagnosticProvider {
@@ -31,7 +31,8 @@ export class mobeventDiagnosticProvider implements DiagnosticProvider {
3131

3232
//minecraft:pillager_patrols_event
3333
if (word == undefined) {
34-
//MISSING ERROR
34+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
35+
return;
3536
}
3637

3738
//[value: Boolean]
@@ -45,7 +46,8 @@ export class mobeventDiagnosticProvider implements DiagnosticProvider {
4546

4647
//wandering_trader_event
4748
if (word == undefined) {
48-
//MISSING ERROR
49+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
50+
return;
4951
}
5052

5153
//[value: Boolean]
@@ -59,7 +61,8 @@ export class mobeventDiagnosticProvider implements DiagnosticProvider {
5961

6062
//events_enabled
6163
if (word == undefined) {
62-
//MISSING ERROR
64+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
65+
return;
6366
}
6467

6568
//[value: Boolean]

‎src/mcfunction/diagnostics/commands/msgDiagnostics.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as vscode from 'vscode';
2-
import { DiagnosticsManager,DiagnosticProvider } from '../DiagnosticsManager';
2+
import { DiagnosticsManager,DiagnosticProvider, Errors } from '../DiagnosticsManager';
33
import { SyntaxItem } from '../../../general/include';
44

55
export class msgDiagnosticProvider implements DiagnosticProvider {
@@ -9,13 +9,15 @@ export class msgDiagnosticProvider implements DiagnosticProvider {
99

1010
//<target: target>
1111
if (word == undefined) {
12-
//MISSING ERROR
12+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
13+
return;
1314
}
1415
dm.SelectorDiagnoser?.provideDiagnostic(word, lineIndex, collector, dm, document);
1516

1617
//<message: message>
1718
if (word == undefined) {
18-
//MISSING ERROR
19+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
20+
return;
1921
}
2022

2123
}

‎src/mcfunction/diagnostics/commands/opDiagnostics.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as vscode from 'vscode';
2-
import { DiagnosticsManager,DiagnosticProvider } from '../DiagnosticsManager';
2+
import { DiagnosticsManager,DiagnosticProvider, Errors } from '../DiagnosticsManager';
33
import { SyntaxItem } from '../../../general/include';
44

55
export class opDiagnosticProvider implements DiagnosticProvider {
@@ -9,7 +9,8 @@ export class opDiagnosticProvider implements DiagnosticProvider {
99

1010
//<player: target>
1111
if (word == undefined) {
12-
//MISSING ERROR
12+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
13+
return;
1314
}
1415
dm.SelectorDiagnoser?.provideDiagnostic(word, lineIndex, collector, dm, document);
1516

‎src/mcfunction/diagnostics/commands/particleDiagnostics.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as vscode from 'vscode';
2-
import { DiagnosticsManager,DiagnosticProvider } from '../DiagnosticsManager';
2+
import { DiagnosticsManager,DiagnosticProvider, Errors } from '../DiagnosticsManager';
33
import { SyntaxItem } from '../../../general/include';
44

55
export class particleDiagnosticProvider implements DiagnosticProvider {
@@ -9,13 +9,15 @@ export class particleDiagnosticProvider implements DiagnosticProvider {
99

1010
//<effect: string>
1111
if (word == undefined) {
12-
//MISSING ERROR
12+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
13+
return;
1314
}
1415
dm.StringDiagnoser?.provideDiagnostic(word, lineIndex, collector, dm, document);
1516

1617
//<position: x y z>
1718
if (word == undefined) {
18-
//MISSING ERROR
19+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
20+
return;
1921
}
2022

2123
}

‎src/mcfunction/diagnostics/commands/playsoundDiagnostics.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as vscode from 'vscode';
2-
import { DiagnosticsManager,DiagnosticProvider } from '../DiagnosticsManager';
2+
import { DiagnosticsManager,DiagnosticProvider, Errors } from '../DiagnosticsManager';
33
import { SyntaxItem } from '../../../general/include';
44

55
export class playsoundDiagnosticProvider implements DiagnosticProvider {
@@ -9,7 +9,8 @@ export class playsoundDiagnosticProvider implements DiagnosticProvider {
99

1010
//<sound: string>
1111
if (word == undefined) {
12-
//MISSING ERROR
12+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
13+
return;
1314
}
1415
dm.StringDiagnoser?.provideDiagnostic(word, lineIndex, collector, dm, document);
1516

‎src/mcfunction/diagnostics/commands/reloadDiagnostics.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as vscode from 'vscode';
2-
import { DiagnosticsManager,DiagnosticProvider } from '../DiagnosticsManager';
2+
import { DiagnosticsManager,DiagnosticProvider, Errors } from '../DiagnosticsManager';
33
import { SyntaxItem } from '../../../general/include';
44

55
export class reloadDiagnosticProvider implements DiagnosticProvider {

‎src/mcfunction/diagnostics/commands/replaceitemDiagnostics.ts

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as vscode from 'vscode';
2-
import { DiagnosticsManager,DiagnosticProvider } from '../DiagnosticsManager';
2+
import { DiagnosticsManager,DiagnosticProvider, Errors } from '../DiagnosticsManager';
33
import { SyntaxItem } from '../../../general/include';
44

55
export class replaceitemDiagnosticProvider implements DiagnosticProvider {
@@ -27,28 +27,33 @@ export class replaceitemDiagnosticProvider implements DiagnosticProvider {
2727

2828
//block
2929
if (word == undefined) {
30-
//MISSING ERROR
30+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
31+
return;
3132
}
3233

3334
//<position: x y z>
3435
if (word == undefined) {
35-
//MISSING ERROR
36+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
37+
return;
3638
}
3739

3840
//slot.container
3941
if (word == undefined) {
40-
//MISSING ERROR
42+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
43+
return;
4144
}
4245

4346
//<slotId: int>
4447
if (word == undefined) {
45-
//MISSING ERROR
48+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
49+
return;
4650
}
4751
dm.IntegerDiagnoser?.provideDiagnostic(word, lineIndex, collector, dm, document);
4852

4953
//<itemName: Item>
5054
if (word == undefined) {
51-
//MISSING ERROR
55+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
56+
return;
5257
}
5358
dm.ItemDiagnoser?.provideDiagnostic(word, lineIndex, collector, dm, document);
5459

@@ -74,29 +79,34 @@ export class replaceitemDiagnosticProvider implements DiagnosticProvider {
7479

7580
//entity
7681
if (word == undefined) {
77-
//MISSING ERROR
82+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
83+
return;
7884
}
7985

8086
//<target: target>
8187
if (word == undefined) {
82-
//MISSING ERROR
88+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
89+
return;
8390
}
8491
dm.SelectorDiagnoser?.provideDiagnostic(word, lineIndex, collector, dm, document);
8592

8693
//<slotType: EntityEquipmentSlot>
8794
if (word == undefined) {
88-
//MISSING ERROR
95+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
96+
return;
8997
}
9098

9199
//<slotId: int>
92100
if (word == undefined) {
93-
//MISSING ERROR
101+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
102+
return;
94103
}
95104
dm.IntegerDiagnoser?.provideDiagnostic(word, lineIndex, collector, dm, document);
96105

97106
//<itemName: Item>
98107
if (word == undefined) {
99-
//MISSING ERROR
108+
Errors.Missing('TODO Type', 'TODO Path', lineIndex, Out[0], collector);
109+
return;
100110
}
101111
dm.ItemDiagnoser?.provideDiagnostic(word, lineIndex, collector, dm, document);
102112

0 commit comments

Comments
 (0)