brighterscript 0.54.1 → 0.55.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +27 -0
- package/dist/Program.js +13 -1
- package/dist/Program.js.map +1 -1
- package/dist/ProgramBuilder.js +2 -1
- package/dist/ProgramBuilder.js.map +1 -1
- package/dist/Scope.js +19 -4
- package/dist/Scope.js.map +1 -1
- package/dist/SymbolTable.d.ts +4 -0
- package/dist/SymbolTable.js +14 -0
- package/dist/SymbolTable.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.js +6 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.js.map +1 -1
- package/dist/bscPlugin/hover/HoverProcessor.spec.js +28 -0
- package/dist/bscPlugin/hover/HoverProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.d.ts +1 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js +19 -8
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js.map +1 -1
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.js +84 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/validation/BrsFileValidator.d.ts +10 -1
- package/dist/bscPlugin/validation/BrsFileValidator.js +76 -25
- package/dist/bscPlugin/validation/BrsFileValidator.js.map +1 -1
- package/dist/bscPlugin/validation/BrsFileValidator.spec.d.ts +1 -0
- package/dist/bscPlugin/validation/BrsFileValidator.spec.js +48 -0
- package/dist/bscPlugin/validation/BrsFileValidator.spec.js.map +1 -0
- package/dist/bscPlugin/validation/ScopeValidator.js +15 -4
- package/dist/bscPlugin/validation/ScopeValidator.js.map +1 -1
- package/dist/files/BrsFile.js +18 -2
- package/dist/files/BrsFile.js.map +1 -1
- package/dist/files/BrsFile.spec.js +18 -0
- package/dist/files/BrsFile.spec.js.map +1 -1
- package/dist/interfaces.d.ts +2 -1
- package/dist/parser/Expression.d.ts +10 -1
- package/dist/parser/Expression.js +11 -1
- package/dist/parser/Expression.js.map +1 -1
- package/dist/parser/Parser.js +5 -3
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/Parser.spec.js +4 -0
- package/dist/parser/Parser.spec.js.map +1 -1
- package/dist/parser/Statement.d.ts +12 -1
- package/dist/parser/Statement.js +15 -1
- package/dist/parser/Statement.js.map +1 -1
- package/dist/parser/tests/statement/ConstStatement.spec.js +19 -0
- package/dist/parser/tests/statement/ConstStatement.spec.js.map +1 -1
- package/dist/util.d.ts +1 -2
- package/dist/util.js +2 -18
- package/dist/util.js.map +1 -1
- package/package.json +3 -1
|
@@ -134,6 +134,34 @@ describe('HoverProcessor', () => {
|
|
|
134
134
|
(0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.range).to.eql(util_1.default.createRange(2, 26, 2, 36));
|
|
135
135
|
(0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.eql(fence('const SOME_VALUE = true'));
|
|
136
136
|
});
|
|
137
|
+
it('finds top-level constant in assignment expression', () => {
|
|
138
|
+
program.setFile('source/main.bs', `
|
|
139
|
+
sub main()
|
|
140
|
+
value = ""
|
|
141
|
+
value += SOME_VALUE
|
|
142
|
+
end sub
|
|
143
|
+
const SOME_VALUE = "value"
|
|
144
|
+
`);
|
|
145
|
+
// value += SOME|_VALUE
|
|
146
|
+
let hover = program.getHover('source/main.bs', util_1.default.createPosition(3, 33))[0];
|
|
147
|
+
(0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.range).to.eql(util_1.default.createRange(3, 29, 3, 39));
|
|
148
|
+
(0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.eql(fence('const SOME_VALUE = "value"'));
|
|
149
|
+
});
|
|
150
|
+
it('finds namespaced constant in assignment expression', () => {
|
|
151
|
+
program.setFile('source/main.bs', `
|
|
152
|
+
sub main()
|
|
153
|
+
value = ""
|
|
154
|
+
value += someNamespace.SOME_VALUE
|
|
155
|
+
end sub
|
|
156
|
+
namespace someNamespace
|
|
157
|
+
const SOME_VALUE = "value"
|
|
158
|
+
end namespace
|
|
159
|
+
`);
|
|
160
|
+
// value += SOME|_VALUE
|
|
161
|
+
let hover = program.getHover('source/main.bs', util_1.default.createPosition(3, 47))[0];
|
|
162
|
+
(0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.range).to.eql(util_1.default.createRange(3, 43, 3, 53));
|
|
163
|
+
(0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.eql(fence('const someNamespace.SOME_VALUE = "value"'));
|
|
164
|
+
});
|
|
137
165
|
it('finds namespaced constant value', () => {
|
|
138
166
|
program.setFile('source/main.bs', `
|
|
139
167
|
sub main()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HoverProcessor.spec.js","sourceRoot":"","sources":["../../../src/bscPlugin/hover/HoverProcessor.spec.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"HoverProcessor.spec.js","sourceRoot":"","sources":["../../../src/bscPlugin/hover/HoverProcessor.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ export declare class BrsFileSemanticTokensProcessor {
|
|
|
4
4
|
event: OnGetSemanticTokensEvent<BrsFile>;
|
|
5
5
|
constructor(event: OnGetSemanticTokensEvent<BrsFile>);
|
|
6
6
|
process(): void;
|
|
7
|
+
private handleConstDeclarations;
|
|
7
8
|
private handleClasses;
|
|
8
9
|
/**
|
|
9
10
|
* Add tokens for each locatable item in the list.
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BrsFileSemanticTokensProcessor = void 0;
|
|
4
4
|
const vscode_languageserver_protocol_1 = require("vscode-languageserver-protocol");
|
|
5
|
+
const vscode_languageserver_protocol_2 = require("vscode-languageserver-protocol");
|
|
5
6
|
const reflection_1 = require("../../astUtils/reflection");
|
|
6
7
|
const Parser_1 = require("../../parser/Parser");
|
|
7
8
|
const util_1 = require("../../util");
|
|
@@ -11,8 +12,14 @@ class BrsFileSemanticTokensProcessor {
|
|
|
11
12
|
}
|
|
12
13
|
process() {
|
|
13
14
|
this.handleClasses();
|
|
15
|
+
this.handleConstDeclarations();
|
|
14
16
|
this.iterateExpressions();
|
|
15
17
|
}
|
|
18
|
+
handleConstDeclarations() {
|
|
19
|
+
for (const stmt of this.event.file.parser.references.constStatements) {
|
|
20
|
+
this.addToken(stmt.tokens.name, vscode_languageserver_protocol_2.SemanticTokenTypes.variable, [vscode_languageserver_protocol_1.SemanticTokenModifiers.readonly, vscode_languageserver_protocol_1.SemanticTokenModifiers.static]);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
16
23
|
handleClasses() {
|
|
17
24
|
var _a;
|
|
18
25
|
const classes = [];
|
|
@@ -33,7 +40,7 @@ class BrsFileSemanticTokensProcessor {
|
|
|
33
40
|
//only highlight classes that are in scope
|
|
34
41
|
this.event.scopes.some(x => x.hasClass(cls.className, cls.namespaceName))) {
|
|
35
42
|
const tokens = util_1.default.splitGetRange('.', cls.className, cls.range);
|
|
36
|
-
this.addTokens(tokens.reverse(),
|
|
43
|
+
this.addTokens(tokens.reverse(), vscode_languageserver_protocol_2.SemanticTokenTypes.class, vscode_languageserver_protocol_2.SemanticTokenTypes.namespace);
|
|
37
44
|
}
|
|
38
45
|
}
|
|
39
46
|
}
|
|
@@ -53,10 +60,11 @@ class BrsFileSemanticTokensProcessor {
|
|
|
53
60
|
}
|
|
54
61
|
}
|
|
55
62
|
}
|
|
56
|
-
addToken(locatable, type) {
|
|
63
|
+
addToken(locatable, type, modifiers = []) {
|
|
57
64
|
this.event.semanticTokens.push({
|
|
58
65
|
range: locatable.range,
|
|
59
|
-
tokenType: type
|
|
66
|
+
tokenType: type,
|
|
67
|
+
tokenModifiers: modifiers
|
|
60
68
|
});
|
|
61
69
|
}
|
|
62
70
|
iterateExpressions() {
|
|
@@ -76,19 +84,22 @@ class BrsFileSemanticTokensProcessor {
|
|
|
76
84
|
processedNames.push((_a = token.text) === null || _a === void 0 ? void 0 : _a.toLowerCase());
|
|
77
85
|
const entityName = processedNames.join('.');
|
|
78
86
|
if (scope.getEnumMemberMap().has(entityName)) {
|
|
79
|
-
this.addToken(token,
|
|
87
|
+
this.addToken(token, vscode_languageserver_protocol_2.SemanticTokenTypes.enumMember);
|
|
80
88
|
}
|
|
81
89
|
else if (scope.getEnumMap().has(entityName)) {
|
|
82
|
-
this.addToken(token,
|
|
90
|
+
this.addToken(token, vscode_languageserver_protocol_2.SemanticTokenTypes.enum);
|
|
83
91
|
}
|
|
84
92
|
else if (scope.getClassMap().has(entityName)) {
|
|
85
|
-
this.addToken(token,
|
|
93
|
+
this.addToken(token, vscode_languageserver_protocol_2.SemanticTokenTypes.class);
|
|
86
94
|
}
|
|
87
95
|
else if (scope.getCallableByName(entityName)) {
|
|
88
|
-
this.addToken(token,
|
|
96
|
+
this.addToken(token, vscode_languageserver_protocol_2.SemanticTokenTypes.function);
|
|
89
97
|
}
|
|
90
98
|
else if (scope.namespaceLookup.has(entityName)) {
|
|
91
|
-
this.addToken(token,
|
|
99
|
+
this.addToken(token, vscode_languageserver_protocol_2.SemanticTokenTypes.namespace);
|
|
100
|
+
}
|
|
101
|
+
else if (scope.getConstFileLink(entityName)) {
|
|
102
|
+
this.addToken(token, vscode_languageserver_protocol_2.SemanticTokenTypes.variable, [vscode_languageserver_protocol_1.SemanticTokenModifiers.readonly, vscode_languageserver_protocol_1.SemanticTokenModifiers.static]);
|
|
92
103
|
}
|
|
93
104
|
}
|
|
94
105
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrsFileSemanticTokensProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.ts"],"names":[],"mappings":";;;AACA,mFAAoE;AACpE,0DAA4F;AAI5F,gDAAgD;AAChD,qCAA8B;AAE9B,MAAa,8BAA8B;IACvC,YACW,KAAwC;QAAxC,UAAK,GAAL,KAAK,CAAmC;IAGnD,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC9B,CAAC;IAEO,aAAa;;QAEjB,MAAM,OAAO,GAAG,EAAuE,CAAC;QAExF,sCAAsC;QACtC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,mBAAmB,EAAE;YACtE,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE;gBAChC,IAAI,IAAA,yBAAY,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACzB,OAAO,CAAC,IAAI,CAAC;wBACT,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI;wBAC9B,aAAa,EAAE,MAAA,IAAI,CAAC,aAAa,0CAAE,OAAO,CAAC,kBAAS,CAAC,cAAc,CAAC;wBACpE,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK;qBAC9B,CAAC,CAAC;iBACN;aACJ;SACJ;QAED,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;YACvB,IACI,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;gBACxB,0CAA0C;gBAC1C,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC,EAC3E;gBACE,MAAM,MAAM,GAAG,cAAI,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;gBACjE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,mDAAkB,CAAC,KAAK,EAAE,mDAAkB,CAAC,SAAS,CAAC,CAAC;aAC5F;SACJ;IACL,CAAC;IAED;;;OAGG;IACK,SAAS,CAAC,UAAuB,EAAE,GAAG,kBAAwC;;QAClF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACxC,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAChC,uCAAuC;YACvC,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,EAAE;gBAClB,IAAI,CAAC,QAAQ,CACT,UAAU,CAAC,CAAC,CAAC;gBACb,wDAAwD;gBACxD,MAAA,kBAAkB,CAAC,CAAC,CAAC,mCAAI,kBAAkB,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC,CAC7E,CAAC;aACL;SACJ;IACL,CAAC;IAEO,QAAQ,CAAC,SAAoB,EAAE,IAAwB;
|
|
1
|
+
{"version":3,"file":"BrsFileSemanticTokensProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,9 +17,17 @@ describe('BrsFileSemanticTokensProcessor', () => {
|
|
|
17
17
|
program.dispose();
|
|
18
18
|
});
|
|
19
19
|
function expectSemanticTokens(file, tokens) {
|
|
20
|
+
var _a;
|
|
20
21
|
program.validate();
|
|
21
22
|
(0, testHelpers_spec_1.expectZeroDiagnostics)(program);
|
|
22
23
|
const result = util_1.util.sortByRange(program.getSemanticTokens(file.srcPath));
|
|
24
|
+
//sort modifiers
|
|
25
|
+
for (const collection of [result, tokens]) {
|
|
26
|
+
for (const token of collection) {
|
|
27
|
+
(_a = token.tokenModifiers) !== null && _a !== void 0 ? _a : (token.tokenModifiers = []);
|
|
28
|
+
token.tokenModifiers.sort();
|
|
29
|
+
}
|
|
30
|
+
}
|
|
23
31
|
(0, chai_1.expect)(result).to.eql(util_1.util.sortByRange(tokens));
|
|
24
32
|
return result;
|
|
25
33
|
}
|
|
@@ -257,5 +265,81 @@ describe('BrsFileSemanticTokensProcessor', () => {
|
|
|
257
265
|
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.class
|
|
258
266
|
}]);
|
|
259
267
|
});
|
|
268
|
+
it('matches consts', () => {
|
|
269
|
+
const file = program.setFile('source/main.bs', `
|
|
270
|
+
sub init()
|
|
271
|
+
print API_URL
|
|
272
|
+
print info.FIRST_NAME
|
|
273
|
+
end sub
|
|
274
|
+
const API_URL = "some_url"
|
|
275
|
+
namespace info
|
|
276
|
+
const FIRST_NAME = "bob"
|
|
277
|
+
end namespace
|
|
278
|
+
`);
|
|
279
|
+
expectSemanticTokens(file, [{
|
|
280
|
+
range: util_1.util.createRange(2, 22, 2, 29),
|
|
281
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.variable,
|
|
282
|
+
tokenModifiers: [vscode_languageserver_protocol_1.SemanticTokenModifiers.readonly, vscode_languageserver_protocol_1.SemanticTokenModifiers.static]
|
|
283
|
+
}, {
|
|
284
|
+
range: util_1.util.createRange(3, 22, 3, 26),
|
|
285
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
286
|
+
}, {
|
|
287
|
+
range: util_1.util.createRange(3, 27, 3, 37),
|
|
288
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.variable,
|
|
289
|
+
tokenModifiers: [vscode_languageserver_protocol_1.SemanticTokenModifiers.readonly, vscode_languageserver_protocol_1.SemanticTokenModifiers.static]
|
|
290
|
+
}, {
|
|
291
|
+
range: util_1.util.createRange(5, 18, 5, 25),
|
|
292
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.variable,
|
|
293
|
+
tokenModifiers: [vscode_languageserver_protocol_1.SemanticTokenModifiers.readonly, vscode_languageserver_protocol_1.SemanticTokenModifiers.static]
|
|
294
|
+
}, {
|
|
295
|
+
range: util_1.util.createRange(7, 22, 7, 32),
|
|
296
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.variable,
|
|
297
|
+
tokenModifiers: [vscode_languageserver_protocol_1.SemanticTokenModifiers.readonly, vscode_languageserver_protocol_1.SemanticTokenModifiers.static]
|
|
298
|
+
}]);
|
|
299
|
+
});
|
|
300
|
+
it('matches consts in assignment expressions', () => {
|
|
301
|
+
const file = program.setFile('source/main.bs', `
|
|
302
|
+
sub main()
|
|
303
|
+
value = ""
|
|
304
|
+
value += constants.API_KEY
|
|
305
|
+
value += API_URL
|
|
306
|
+
end sub
|
|
307
|
+
namespace constants
|
|
308
|
+
const API_KEY = "test"
|
|
309
|
+
end namespace
|
|
310
|
+
const API_URL = "url"
|
|
311
|
+
`);
|
|
312
|
+
expectSemanticTokens(file, [
|
|
313
|
+
// value += |constants|.API_KEY
|
|
314
|
+
{
|
|
315
|
+
range: util_1.util.createRange(3, 25, 3, 34),
|
|
316
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
317
|
+
},
|
|
318
|
+
// value += constants.|API_KEY|
|
|
319
|
+
{
|
|
320
|
+
range: util_1.util.createRange(3, 35, 3, 42),
|
|
321
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.variable,
|
|
322
|
+
tokenModifiers: [vscode_languageserver_protocol_1.SemanticTokenModifiers.readonly, vscode_languageserver_protocol_1.SemanticTokenModifiers.static]
|
|
323
|
+
},
|
|
324
|
+
// value += |API_URL|
|
|
325
|
+
{
|
|
326
|
+
range: util_1.util.createRange(4, 25, 4, 32),
|
|
327
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.variable,
|
|
328
|
+
tokenModifiers: [vscode_languageserver_protocol_1.SemanticTokenModifiers.readonly, vscode_languageserver_protocol_1.SemanticTokenModifiers.static]
|
|
329
|
+
},
|
|
330
|
+
// const |API_KEY| = "test"
|
|
331
|
+
{
|
|
332
|
+
range: util_1.util.createRange(7, 22, 7, 29),
|
|
333
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.variable,
|
|
334
|
+
tokenModifiers: [vscode_languageserver_protocol_1.SemanticTokenModifiers.readonly, vscode_languageserver_protocol_1.SemanticTokenModifiers.static]
|
|
335
|
+
},
|
|
336
|
+
//const |API_URL| = "url"
|
|
337
|
+
{
|
|
338
|
+
range: util_1.util.createRange(9, 18, 9, 25),
|
|
339
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.variable,
|
|
340
|
+
tokenModifiers: [vscode_languageserver_protocol_1.SemanticTokenModifiers.readonly, vscode_languageserver_protocol_1.SemanticTokenModifiers.static]
|
|
341
|
+
}
|
|
342
|
+
]);
|
|
343
|
+
});
|
|
260
344
|
});
|
|
261
345
|
//# sourceMappingURL=BrsFileSemanticTokensProcessor.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrsFileSemanticTokensProcessor.spec.js","sourceRoot":"","sources":["../../../src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,
|
|
1
|
+
{"version":3,"file":"BrsFileSemanticTokensProcessor.spec.js","sourceRoot":"","sources":["../../../src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,mFAA4F;AAG5F,2CAAwC;AACxC,6DAA+D;AAC/D,qCAAwD;AAExD,MAAM,OAAO,GAAG,IAAA,sBAAC,EAAA,GAAG,OAAO,CAAC,GAAG,EAAE,eAAe,CAAC;AAEjD,QAAQ,CAAC,gCAAgC,EAAE,GAAG,EAAE;IAC5C,IAAI,OAAgB,CAAC;IACrB,UAAU,CAAC,GAAG,EAAE;QACZ,OAAO,GAAG,IAAI,iBAAO,CAAC;YAClB,OAAO,EAAE,OAAO;SACnB,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IACH,SAAS,CAAC,GAAG,EAAE;QACX,OAAO,CAAC,OAAO,EAAE,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,SAAS,oBAAoB,CAAC,IAAa,EAAE,MAAuB;;QAChE,OAAO,CAAC,QAAQ,EAAE,CAAC;QACnB,IAAA,wCAAqB,EAAC,OAAO,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,WAAI,CAAC,WAAW,CAC3B,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAC1C,CAAC;QAEF,gBAAgB;QAChB,KAAK,MAAM,UAAU,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;YACvC,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE;gBAC5B,MAAA,KAAK,CAAC,cAAc,oCAApB,KAAK,CAAC,cAAc,GAAK,EAAE,EAAC;gBAC5B,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;aAC/B;SACJ;QAED,IAAA,aAAM,EACF,MAAM,CACT,CAAC,EAAE,CAAC,GAAG,CACJ,WAAI,CAAC,WAAW,CACZ,MAAM,CACT,CACJ,CAAC;QACF,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAChD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;;;;;SAWvD,CAAC,CAAC;QACH,oBAAoB,CAAC,IAAI,EAAE,CAAC;gBACxB,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,KAAK;aACtC,CAAC,CAAC,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACpE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;;SAQvD,CAAC,CAAC;QACH,oBAAoB,CAAC,IAAI,EAAE,CAAC;gBACxB,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,QAAQ;aACzC,CAAC,CAAC,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QACzE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;;SAQvD,CAAC,CAAC;QACH,oBAAoB,CAAC,IAAI,EAAE,CAAC;gBACxB,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,QAAQ;aACzC,CAAC,CAAC,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8EAA8E,EAAE,GAAG,EAAE;QACpF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;;SAQvD,CAAC,CAAC;QACH,oBAAoB,CAAC,IAAI,EAAE,CAAC;gBACxB,sBAAsB;gBACtB,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,QAAQ;aACzC,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,QAAQ;aACzC,CAAC,CAAC,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2EAA2E,EAAE,GAAG,EAAE;QACjF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;;SAQvD,CAAC,CAAC;QACH,oBAAoB,CAAC,IAAI,EAAE,CAAC;gBACxB,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,QAAQ;aACzC,CAAC,CAAC,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAChD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;;;;SAUvD,CAAC,CAAC;QACH,oBAAoB,CAAC,IAAI,EAAE,CAAC;gBACxB,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,IAAI;aACrC,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,UAAU;aAC3C,CAAC,CAAC,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QAC/C,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;;;;;SAWvD,CAAC,CAAC;QACH,oBAAoB,CAAC,IAAI,EAAE,CAAC;gBACxB,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,IAAI;aACrC,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,UAAU;aAC3C,CAAC,CAAC,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;;;;;;;SAavD,CAAC,CAAC;QACH,oBAAoB,CAAC,IAAI,EAAE,CAAC;gBACxB,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,IAAI;aACrC,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,UAAU;aAC3C,CAAC,CAAC,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC7C,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;;;;;SAWvD,CAAC,CAAC;QACH,oBAAoB,CAAC,IAAI,EAAE,CAAC;gBACxB,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,IAAI;aACrC,CAAC,CAAC,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACjD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;;;SASvD,CAAC,CAAC;QACH,oBAAoB,CAAC,IAAI,EAAE,CAAC;gBACxB,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,KAAK;aACtC,CAAC,CAAC,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gBAAgB,EAAE,GAAG,EAAE;QACtB,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;;;SASvD,CAAC,CAAC;QACH,oBAAoB,CAAC,IAAI,EAAE,CAAC;gBACxB,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,QAAQ;gBACtC,cAAc,EAAE,CAAC,uDAAsB,CAAC,QAAQ,EAAE,uDAAsB,CAAC,MAAM,CAAC;aACnF,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,QAAQ;gBACtC,cAAc,EAAE,CAAC,uDAAsB,CAAC,QAAQ,EAAE,uDAAsB,CAAC,MAAM,CAAC;aACnF,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,QAAQ;gBACtC,cAAc,EAAE,CAAC,uDAAsB,CAAC,QAAQ,EAAE,uDAAsB,CAAC,MAAM,CAAC;aACnF,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,QAAQ;gBACtC,cAAc,EAAE,CAAC,uDAAsB,CAAC,QAAQ,EAAE,uDAAsB,CAAC,MAAM,CAAC;aACnF,CAAC,CAAC,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAChD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;;;;SAUvD,CAAC,CAAC;QACH,oBAAoB,CAAC,IAAI,EAAE;YACvB,+BAA+B;YAC/B;gBACI,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C;YACD,+BAA+B;YAC/B;gBACI,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,QAAQ;gBACtC,cAAc,EAAE,CAAC,uDAAsB,CAAC,QAAQ,EAAE,uDAAsB,CAAC,MAAM,CAAC;aACnF;YACD,qBAAqB;YACrB;gBACI,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,QAAQ;gBACtC,cAAc,EAAE,CAAC,uDAAsB,CAAC,QAAQ,EAAE,uDAAsB,CAAC,MAAM,CAAC;aACnF;YACD,2BAA2B;YAC3B;gBACI,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,QAAQ;gBACtC,cAAc,EAAE,CAAC,uDAAsB,CAAC,QAAQ,EAAE,uDAAsB,CAAC,MAAM,CAAC;aACnF;YACD,yBAAyB;YACzB;gBACI,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,QAAQ;gBACtC,cAAc,EAAE,CAAC,uDAAsB,CAAC,QAAQ,EAAE,uDAAsB,CAAC,MAAM,CAAC;aACnF;SACJ,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -4,7 +4,16 @@ export declare class BrsFileValidator {
|
|
|
4
4
|
event: OnFileValidateEvent<BrsFile>;
|
|
5
5
|
constructor(event: OnFileValidateEvent<BrsFile>);
|
|
6
6
|
process(): void;
|
|
7
|
-
|
|
7
|
+
/**
|
|
8
|
+
* Set the parent node on a given AstNode. This handles some edge cases where not every expression is iterated normally,
|
|
9
|
+
* so it will also reach into nested objects to set their parent values as well
|
|
10
|
+
*/
|
|
11
|
+
private setParent;
|
|
12
|
+
/**
|
|
13
|
+
* Walk the full AST
|
|
14
|
+
*/
|
|
15
|
+
private walk;
|
|
16
|
+
private validateEnumDeclaration;
|
|
8
17
|
private validateEnumValueTypes;
|
|
9
18
|
/**
|
|
10
19
|
* Find statements defined at the top level (or inside a namespace body) that are not allowed to be there
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BrsFileValidator = void 0;
|
|
4
4
|
const reflection_1 = require("../../astUtils/reflection");
|
|
5
|
+
const visitors_1 = require("../../astUtils/visitors");
|
|
5
6
|
const DiagnosticMessages_1 = require("../../DiagnosticMessages");
|
|
6
7
|
const TokenKind_1 = require("../../lexer/TokenKind");
|
|
7
8
|
class BrsFileValidator {
|
|
@@ -9,35 +10,85 @@ class BrsFileValidator {
|
|
|
9
10
|
this.event = event;
|
|
10
11
|
}
|
|
11
12
|
process() {
|
|
12
|
-
this.
|
|
13
|
+
this.walk();
|
|
13
14
|
this.flagTopLevelStatements();
|
|
14
15
|
}
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
if (
|
|
29
|
-
|
|
16
|
+
/**
|
|
17
|
+
* Set the parent node on a given AstNode. This handles some edge cases where not every expression is iterated normally,
|
|
18
|
+
* so it will also reach into nested objects to set their parent values as well
|
|
19
|
+
*/
|
|
20
|
+
setParent(node1, parent) {
|
|
21
|
+
const pairs = [[node1, parent]];
|
|
22
|
+
while (pairs.length > 0) {
|
|
23
|
+
const [childNode, parentNode] = pairs.pop();
|
|
24
|
+
//skip this entry if there's already a parent
|
|
25
|
+
if (childNode === null || childNode === void 0 ? void 0 : childNode.parent) {
|
|
26
|
+
continue;
|
|
27
|
+
}
|
|
28
|
+
if ((0, reflection_1.isDottedGetExpression)(childNode)) {
|
|
29
|
+
if (!childNode.obj.parent) {
|
|
30
|
+
pairs.push([childNode.obj, childNode]);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
else if ((0, reflection_1.isNamespaceStatement)(childNode)) {
|
|
34
|
+
//namespace names shouldn't be walked, but it needs its parent assigned
|
|
35
|
+
pairs.push([childNode.nameExpression, childNode]);
|
|
36
|
+
}
|
|
37
|
+
else if ((0, reflection_1.isClassStatement)(childNode)) {
|
|
38
|
+
//class extends names don't get walked, but it needs its parent
|
|
39
|
+
if (childNode.parentClassName) {
|
|
40
|
+
pairs.push([childNode.parentClassName, childNode]);
|
|
30
41
|
}
|
|
31
|
-
|
|
32
|
-
|
|
42
|
+
}
|
|
43
|
+
else if ((0, reflection_1.isInterfaceStatement)(childNode)) {
|
|
44
|
+
//class extends names don't get walked, but it needs its parent
|
|
45
|
+
if (childNode.parentInterfaceName) {
|
|
46
|
+
pairs.push([childNode.parentInterfaceName, childNode]);
|
|
33
47
|
}
|
|
34
|
-
//Enforce all member values are the same type
|
|
35
|
-
this.validateEnumValueTypes(diagnostics, member, enumValueKind);
|
|
36
48
|
}
|
|
49
|
+
else if ((0, reflection_1.isNamespacedVariableNameExpression)(childNode)) {
|
|
50
|
+
pairs.push([childNode.expression, childNode]);
|
|
51
|
+
}
|
|
52
|
+
childNode.parent = parentNode;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
/**
|
|
56
|
+
* Walk the full AST
|
|
57
|
+
*/
|
|
58
|
+
walk() {
|
|
59
|
+
this.event.file.ast.walk((node, parent) => {
|
|
60
|
+
// link every child with its parent
|
|
61
|
+
this.setParent(node, parent);
|
|
62
|
+
//do some file-based validations
|
|
63
|
+
if ((0, reflection_1.isEnumStatement)(node)) {
|
|
64
|
+
this.validateEnumDeclaration(node);
|
|
65
|
+
}
|
|
66
|
+
}, {
|
|
67
|
+
walkMode: visitors_1.WalkMode.visitAllRecursive
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
validateEnumDeclaration(stmt) {
|
|
71
|
+
var _a, _b, _c, _d, _e;
|
|
72
|
+
const members = stmt.getMembers();
|
|
73
|
+
//the enum data type is based on the first member value
|
|
74
|
+
const enumValueKind = (_d = (_c = (_b = (_a = members.find(x => x.value)) === null || _a === void 0 ? void 0 : _a.value) === null || _b === void 0 ? void 0 : _b.token) === null || _c === void 0 ? void 0 : _c.kind) !== null && _d !== void 0 ? _d : TokenKind_1.TokenKind.IntegerLiteral;
|
|
75
|
+
const memberNames = new Set();
|
|
76
|
+
for (const member of members) {
|
|
77
|
+
const memberNameLower = (_e = member.name) === null || _e === void 0 ? void 0 : _e.toLowerCase();
|
|
78
|
+
/**
|
|
79
|
+
* flag duplicate member names
|
|
80
|
+
*/
|
|
81
|
+
if (memberNames.has(memberNameLower)) {
|
|
82
|
+
this.event.file.addDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.duplicateIdentifier(member.name)), { range: member.range }));
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
memberNames.add(memberNameLower);
|
|
86
|
+
}
|
|
87
|
+
//Enforce all member values are the same type
|
|
88
|
+
this.validateEnumValueTypes(member, enumValueKind);
|
|
37
89
|
}
|
|
38
|
-
this.event.file.addDiagnostics(diagnostics);
|
|
39
90
|
}
|
|
40
|
-
validateEnumValueTypes(
|
|
91
|
+
validateEnumValueTypes(member, enumValueKind) {
|
|
41
92
|
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
42
93
|
const memberValueKind = (_b = (_a = member.value) === null || _a === void 0 ? void 0 : _a.token) === null || _b === void 0 ? void 0 : _b.kind;
|
|
43
94
|
if (
|
|
@@ -45,7 +96,7 @@ class BrsFileValidator {
|
|
|
45
96
|
(enumValueKind === TokenKind_1.TokenKind.IntegerLiteral && memberValueKind && memberValueKind !== enumValueKind) ||
|
|
46
97
|
//has value, that value is not a literal
|
|
47
98
|
(member.value && !(0, reflection_1.isLiteralExpression)(member.value))) {
|
|
48
|
-
|
|
99
|
+
this.event.file.addDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.enumValueMustBeType(enumValueKind.replace(/literal$/i, '').toLowerCase())), { range: (_d = ((_c = member.value) !== null && _c !== void 0 ? _c : member)) === null || _d === void 0 ? void 0 : _d.range }));
|
|
49
100
|
}
|
|
50
101
|
//is non integer value
|
|
51
102
|
if (enumValueKind !== TokenKind_1.TokenKind.IntegerLiteral) {
|
|
@@ -53,12 +104,12 @@ class BrsFileValidator {
|
|
|
53
104
|
if (memberValueKind) {
|
|
54
105
|
//member value is same as enum
|
|
55
106
|
if (memberValueKind !== enumValueKind) {
|
|
56
|
-
|
|
107
|
+
this.event.file.addDiagnostic(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.enumValueMustBeType(enumValueKind.replace(/literal$/i, '').toLowerCase())), { range: (_f = ((_e = member.value) !== null && _e !== void 0 ? _e : member)) === null || _f === void 0 ? void 0 : _f.range }));
|
|
57
108
|
}
|
|
58
109
|
//default value missing
|
|
59
110
|
}
|
|
60
111
|
else {
|
|
61
|
-
|
|
112
|
+
this.event.file.addDiagnostic(Object.assign(Object.assign({ file: this.event.file }, DiagnosticMessages_1.DiagnosticMessages.enumValueIsRequired(enumValueKind.replace(/literal$/i, '').toLowerCase())), { range: (_h = ((_g = member.value) !== null && _g !== void 0 ? _g : member)) === null || _h === void 0 ? void 0 : _h.range }));
|
|
62
113
|
}
|
|
63
114
|
}
|
|
64
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrsFileValidator.js","sourceRoot":"","sources":["../../../src/bscPlugin/validation/BrsFileValidator.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"BrsFileValidator.js","sourceRoot":"","sources":["../../../src/bscPlugin/validation/BrsFileValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const chai_1 = require("chai");
|
|
4
|
+
const Program_1 = require("../../Program");
|
|
5
|
+
describe('BrsFileValidator', () => {
|
|
6
|
+
let program;
|
|
7
|
+
beforeEach(() => {
|
|
8
|
+
program = new Program_1.Program({});
|
|
9
|
+
});
|
|
10
|
+
it('links dotted get expression parents', () => {
|
|
11
|
+
const file = program.setFile('source/main.bs', `
|
|
12
|
+
sub main()
|
|
13
|
+
print {}.beta.charlie
|
|
14
|
+
end sub
|
|
15
|
+
`);
|
|
16
|
+
program.validate();
|
|
17
|
+
const func = file.parser.ast.statements[0];
|
|
18
|
+
const print = func.func.body.statements[0];
|
|
19
|
+
(0, chai_1.expect)(print.parent).to.equal(func.func.body);
|
|
20
|
+
const charlie = print.expressions[0];
|
|
21
|
+
(0, chai_1.expect)(charlie.parent).to.equal(print);
|
|
22
|
+
const beta = charlie.obj;
|
|
23
|
+
(0, chai_1.expect)(beta.parent).to.equal(charlie);
|
|
24
|
+
const aaLiteral = beta.obj;
|
|
25
|
+
(0, chai_1.expect)(aaLiteral.parent).to.equal(beta);
|
|
26
|
+
});
|
|
27
|
+
it('links NamespacedVariableNameExpression dotted get parents', () => {
|
|
28
|
+
const file = program.setFile('source/main.bs', `
|
|
29
|
+
namespace alpha.bravo
|
|
30
|
+
class Delta extends alpha.bravo.Charlie
|
|
31
|
+
end class
|
|
32
|
+
class Charlie
|
|
33
|
+
end class
|
|
34
|
+
end namespace
|
|
35
|
+
`);
|
|
36
|
+
program.validate();
|
|
37
|
+
const namespace = file.parser.ast.statements[0];
|
|
38
|
+
const deltaClass = namespace.body.statements[0];
|
|
39
|
+
(0, chai_1.expect)(deltaClass.parent).to.equal(namespace.body);
|
|
40
|
+
const charlie = deltaClass.parentClassName.expression;
|
|
41
|
+
(0, chai_1.expect)(charlie.parent).to.equal(deltaClass.parentClassName);
|
|
42
|
+
const bravo = charlie.obj;
|
|
43
|
+
(0, chai_1.expect)(bravo.parent).to.equal(charlie);
|
|
44
|
+
const alpha = bravo.obj;
|
|
45
|
+
(0, chai_1.expect)(alpha.parent).to.equal(bravo);
|
|
46
|
+
});
|
|
47
|
+
});
|
|
48
|
+
//# sourceMappingURL=BrsFileValidator.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BrsFileValidator.spec.js","sourceRoot":"","sources":["../../../src/bscPlugin/validation/BrsFileValidator.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAI9B,2CAAwC;AAExC,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAC9B,IAAI,OAAgB,CAAC;IACrB,UAAU,CAAC,GAAG,EAAE;QACZ,OAAO,GAAG,IAAI,iBAAO,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;SAIvD,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,EAAE,CAAC;QACnB,MAAM,IAAI,GAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAuB,CAAC;QAClE,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAmB,CAAC;QAC7D,IAAA,aAAM,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE9C,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,CAAwB,CAAC;QAC5D,IAAA,aAAM,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAEvC,MAAM,IAAI,GAAG,OAAO,CAAC,GAA0B,CAAC;QAChD,IAAA,aAAM,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEtC,MAAM,SAAS,GAAG,IAAI,CAAC,GAA0B,CAAC;QAClD,IAAA,aAAM,EAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACjE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;SAOvD,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,EAAE,CAAC;QACnB,MAAM,SAAS,GAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAwB,CAAC;QACxE,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAmB,CAAC;QAClE,IAAA,aAAM,EAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAEnD,MAAM,OAAO,GAAI,UAAU,CAAC,eAAe,CAAC,UAAkC,CAAC;QAC/E,IAAA,aAAM,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAE5D,MAAM,KAAK,GAAG,OAAO,CAAC,GAA0B,CAAC;QACjD,IAAA,aAAM,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEvC,MAAM,KAAK,GAAG,KAAK,CAAC,GAA0B,CAAC;QAC/C,IAAA,aAAM,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -53,8 +53,8 @@ class ScopeValidator {
|
|
|
53
53
|
* Add a diagnostic (to the first scope) that will have `relatedInformation` for each affected scope
|
|
54
54
|
*/
|
|
55
55
|
addMultiScopeDiagnostic(event, diagnostic, message = 'Not defined in scope') {
|
|
56
|
-
var _a;
|
|
57
|
-
diagnostic = this.multiScopeCache.getOrAdd(`${diagnostic.code}-${diagnostic.message}-${util_1.default.rangeToString(diagnostic.range)}`, () => {
|
|
56
|
+
var _a, _b;
|
|
57
|
+
diagnostic = this.multiScopeCache.getOrAdd(`${(_a = diagnostic.file) === null || _a === void 0 ? void 0 : _a.srcPath}-${diagnostic.code}-${diagnostic.message}-${util_1.default.rangeToString(diagnostic.range)}`, () => {
|
|
58
58
|
if (!diagnostic.relatedInformation) {
|
|
59
59
|
diagnostic.relatedInformation = [];
|
|
60
60
|
}
|
|
@@ -64,7 +64,7 @@ class ScopeValidator {
|
|
|
64
64
|
const info = {
|
|
65
65
|
message: `${message} '${event.scope.name}'`
|
|
66
66
|
};
|
|
67
|
-
if ((0, reflection_1.isXmlScope)(event.scope) && ((
|
|
67
|
+
if ((0, reflection_1.isXmlScope)(event.scope) && ((_b = event.scope.xmlFile) === null || _b === void 0 ? void 0 : _b.srcPath)) {
|
|
68
68
|
info.location = util_1.default.createLocation(vscode_uri_1.URI.file(event.scope.xmlFile.srcPath).toString(), util_1.default.createRange(0, 0, 0, 10));
|
|
69
69
|
}
|
|
70
70
|
else {
|
|
@@ -204,7 +204,18 @@ class ScopeValidator {
|
|
|
204
204
|
//now that we've collected all enum declarations, flag duplicates
|
|
205
205
|
for (const enumLocations of enumLocationsByName.values()) {
|
|
206
206
|
//sort by srcPath to keep the primary enum location consistent
|
|
207
|
-
enumLocations.sort((a, b) => {
|
|
207
|
+
enumLocations.sort((a, b) => {
|
|
208
|
+
var _a, _b;
|
|
209
|
+
const pathA = (_a = a.file) === null || _a === void 0 ? void 0 : _a.srcPath;
|
|
210
|
+
const pathB = (_b = b.file) === null || _b === void 0 ? void 0 : _b.srcPath;
|
|
211
|
+
if (pathA < pathB) {
|
|
212
|
+
return -1;
|
|
213
|
+
}
|
|
214
|
+
else if (pathA > pathB) {
|
|
215
|
+
return 1;
|
|
216
|
+
}
|
|
217
|
+
return 0;
|
|
218
|
+
});
|
|
208
219
|
const primaryEnum = enumLocations.shift();
|
|
209
220
|
const fullName = primaryEnum.statement.fullName;
|
|
210
221
|
for (const duplicateEnumInfo of enumLocations) {
|