brighterscript 1.0.0-alpha.22 → 1.0.0-alpha.23
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 +33 -0
- package/dist/DiagnosticCollection.d.ts +3 -1
- package/dist/DiagnosticCollection.js +3 -5
- package/dist/DiagnosticCollection.js.map +1 -1
- package/dist/DiagnosticMessages.d.ts +6 -1
- package/dist/DiagnosticMessages.js +9 -4
- package/dist/DiagnosticMessages.js.map +1 -1
- package/dist/LanguageServer.d.ts +2 -1
- package/dist/LanguageServer.js +24 -13
- package/dist/LanguageServer.js.map +1 -1
- package/dist/Program.d.ts +7 -3
- package/dist/Program.js +41 -22
- package/dist/Program.js.map +1 -1
- package/dist/Scope.d.ts +2 -1
- package/dist/Scope.js +16 -0
- package/dist/Scope.js.map +1 -1
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.d.ts +7 -1
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js +53 -63
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js.map +1 -1
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.js +154 -23
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.js +13 -25
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.js +26 -20
- package/dist/bscPlugin/validation/ScopeValidator.js.map +1 -1
- package/dist/files/BrsFile.Class.spec.js +84 -0
- package/dist/files/BrsFile.Class.spec.js.map +1 -1
- package/dist/interfaces.d.ts +12 -0
- package/dist/parser/Expression.js.map +1 -1
- package/dist/parser/Parser.d.ts +4 -0
- package/dist/parser/Parser.js +31 -1
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/Parser.spec.js +51 -7
- package/dist/parser/Parser.spec.js.map +1 -1
- package/dist/parser/Statement.js +1 -1
- package/dist/parser/Statement.js.map +1 -1
- package/dist/parser/tests/statement/Enum.spec.js +39 -6
- package/dist/parser/tests/statement/Enum.spec.js.map +1 -1
- package/dist/parser/tests/statement/InterfaceStatement.spec.js +16 -2
- package/dist/parser/tests/statement/InterfaceStatement.spec.js.map +1 -1
- package/dist/util.d.ts +2 -2
- package/dist/util.js +8 -5
- package/dist/util.js.map +1 -1
- package/dist/validators/ClassValidator.d.ts +4 -0
- package/dist/validators/ClassValidator.js +21 -1
- package/dist/validators/ClassValidator.js.map +1 -1
- package/package.json +1 -1
|
@@ -11,10 +11,10 @@ class BrsFileSemanticTokensProcessor {
|
|
|
11
11
|
}
|
|
12
12
|
process() {
|
|
13
13
|
this.handleClasses();
|
|
14
|
-
this.
|
|
14
|
+
this.iterateExpressions();
|
|
15
15
|
}
|
|
16
16
|
handleClasses() {
|
|
17
|
-
var _a
|
|
17
|
+
var _a;
|
|
18
18
|
const classes = [];
|
|
19
19
|
//classes used in function param types
|
|
20
20
|
for (const func of this.event.file.parser.references.functionExpressions) {
|
|
@@ -28,77 +28,67 @@ class BrsFileSemanticTokensProcessor {
|
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
|
-
//classes used in `new` expressions
|
|
32
|
-
for (const expr of this.event.file.parser.references.newExpressions) {
|
|
33
|
-
classes.push({
|
|
34
|
-
className: expr.className.getName(Parser_1.ParseMode.BrighterScript),
|
|
35
|
-
namespaceName: (_b = expr.namespaceName) === null || _b === void 0 ? void 0 : _b.getName(Parser_1.ParseMode.BrighterScript),
|
|
36
|
-
range: expr.className.range
|
|
37
|
-
});
|
|
38
|
-
}
|
|
39
31
|
for (const cls of classes) {
|
|
40
32
|
if (cls.className.length > 0 &&
|
|
41
33
|
//only highlight classes that are in scope
|
|
42
34
|
this.event.scopes.some(x => x.hasClass(cls.className, cls.namespaceName))) {
|
|
43
35
|
const tokens = util_1.default.splitGetRange('.', cls.className, cls.range);
|
|
44
|
-
|
|
45
|
-
for (let i = 0; i < tokens.length - 1; i++) {
|
|
46
|
-
const token = tokens[i];
|
|
47
|
-
this.event.semanticTokens.push({
|
|
48
|
-
range: token.range,
|
|
49
|
-
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
50
|
-
});
|
|
51
|
-
}
|
|
52
|
-
//class name
|
|
53
|
-
this.event.semanticTokens.push({
|
|
54
|
-
range: tokens.pop().range,
|
|
55
|
-
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.class
|
|
56
|
-
});
|
|
36
|
+
this.addTokens(tokens.reverse(), vscode_languageserver_protocol_1.SemanticTokenTypes.class, vscode_languageserver_protocol_1.SemanticTokenTypes.namespace);
|
|
57
37
|
}
|
|
58
38
|
}
|
|
59
39
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
40
|
+
/**
|
|
41
|
+
* Add tokens for each locatable item in the list.
|
|
42
|
+
* Each locatable is paired with a token type. If there are more locatables than token types, all remaining locatables are given the final token type
|
|
43
|
+
*/
|
|
44
|
+
addTokens(locatables, ...semanticTokenTypes) {
|
|
45
|
+
var _a;
|
|
46
|
+
for (let i = 0; i < locatables.length; i++) {
|
|
47
|
+
const locatable = locatables[i];
|
|
48
|
+
//skip items that don't have a location
|
|
49
|
+
if (locatable === null || locatable === void 0 ? void 0 : locatable.range) {
|
|
50
|
+
this.addToken(locatables[i],
|
|
51
|
+
//use the type at the index, or the last type if missing
|
|
52
|
+
(_a = semanticTokenTypes[i]) !== null && _a !== void 0 ? _a : semanticTokenTypes[semanticTokenTypes.length - 1]);
|
|
68
53
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
addToken(locatable, type) {
|
|
57
|
+
this.event.semanticTokens.push({
|
|
58
|
+
range: locatable.range,
|
|
59
|
+
tokenType: type
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
iterateExpressions() {
|
|
63
|
+
var _a;
|
|
64
|
+
const scope = this.event.scopes[0];
|
|
65
|
+
for (let expression of this.event.file.parser.references.expressions) {
|
|
66
|
+
//lift the callee from call expressions to handle namespaced function calls
|
|
67
|
+
if ((0, reflection_1.isCallExpression)(expression)) {
|
|
68
|
+
expression = expression.callee;
|
|
72
69
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
for (const token of tokens) {
|
|
96
|
-
this.event.semanticTokens.push({
|
|
97
|
-
range: token.range,
|
|
98
|
-
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
99
|
-
});
|
|
100
|
-
}
|
|
101
|
-
}
|
|
70
|
+
else if ((0, reflection_1.isNewExpression)(expression)) {
|
|
71
|
+
expression = expression.call.callee;
|
|
72
|
+
}
|
|
73
|
+
const tokens = util_1.default.getAllDottedGetParts(expression);
|
|
74
|
+
const processedNames = [];
|
|
75
|
+
for (const token of tokens !== null && tokens !== void 0 ? tokens : []) {
|
|
76
|
+
processedNames.push((_a = token.text) === null || _a === void 0 ? void 0 : _a.toLowerCase());
|
|
77
|
+
const entityName = processedNames.join('.');
|
|
78
|
+
if (scope.getEnumMemberMap().has(entityName)) {
|
|
79
|
+
this.addToken(token, vscode_languageserver_protocol_1.SemanticTokenTypes.enumMember);
|
|
80
|
+
}
|
|
81
|
+
else if (scope.getEnumMap().has(entityName)) {
|
|
82
|
+
this.addToken(token, vscode_languageserver_protocol_1.SemanticTokenTypes.enum);
|
|
83
|
+
}
|
|
84
|
+
else if (scope.getClassMap().has(entityName)) {
|
|
85
|
+
this.addToken(token, vscode_languageserver_protocol_1.SemanticTokenTypes.class);
|
|
86
|
+
}
|
|
87
|
+
else if (scope.getCallableByName(entityName)) {
|
|
88
|
+
this.addToken(token, vscode_languageserver_protocol_1.SemanticTokenTypes.function);
|
|
89
|
+
}
|
|
90
|
+
else if (scope.namespaceLookup.has(entityName)) {
|
|
91
|
+
this.addToken(token, vscode_languageserver_protocol_1.SemanticTokenTypes.namespace);
|
|
102
92
|
}
|
|
103
93
|
}
|
|
104
94
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrsFileSemanticTokensProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.ts"],"names":[],"mappings":";;;AACA,mFAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"BrsFileSemanticTokensProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,32 +16,126 @@ describe('BrsFileSemanticTokensProcessor', () => {
|
|
|
16
16
|
afterEach(() => {
|
|
17
17
|
program.dispose();
|
|
18
18
|
});
|
|
19
|
-
|
|
19
|
+
function expectSemanticTokens(file, tokens) {
|
|
20
|
+
program.validate();
|
|
21
|
+
(0, testHelpers_spec_1.expectZeroDiagnostics)(program);
|
|
22
|
+
const result = util_1.util.sortByRange(program.getSemanticTokens(file.srcPath));
|
|
23
|
+
(0, chai_1.expect)(result).to.eql(util_1.util.sortByRange(tokens));
|
|
24
|
+
return result;
|
|
25
|
+
}
|
|
26
|
+
it('matches each namespace section for class', () => {
|
|
20
27
|
const file = program.setFile('source/main.bs', `
|
|
21
|
-
|
|
22
|
-
class Person
|
|
23
|
-
end class
|
|
24
|
-
end namespace
|
|
25
|
-
class Dog
|
|
28
|
+
class Host
|
|
26
29
|
sub new()
|
|
27
|
-
m.
|
|
30
|
+
m.alien = new Humanoids.Aliens.Alien()
|
|
28
31
|
end sub
|
|
29
32
|
end class
|
|
33
|
+
|
|
34
|
+
namespace Humanoids.Aliens
|
|
35
|
+
class Alien
|
|
36
|
+
end class
|
|
37
|
+
end namespace
|
|
30
38
|
`);
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
(0, chai_1.expect)(program.getSemanticTokens(file.srcPath)).to.eql([{
|
|
34
|
-
range: util_1.util.createRange(7, 34, 7, 44),
|
|
39
|
+
expectSemanticTokens(file, [{
|
|
40
|
+
range: util_1.util.createRange(3, 34, 3, 43),
|
|
35
41
|
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
36
42
|
}, {
|
|
37
|
-
range: util_1.util.createRange(
|
|
43
|
+
range: util_1.util.createRange(3, 44, 3, 50),
|
|
38
44
|
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
39
45
|
}, {
|
|
40
|
-
range: util_1.util.createRange(
|
|
46
|
+
range: util_1.util.createRange(3, 51, 3, 56),
|
|
41
47
|
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.class
|
|
42
48
|
}]);
|
|
43
49
|
});
|
|
44
|
-
it('matches each namespace section', () => {
|
|
50
|
+
it('matches each namespace section for namespaced function calls', () => {
|
|
51
|
+
const file = program.setFile('source/main.bs', `
|
|
52
|
+
sub new()
|
|
53
|
+
Humanoids.Aliens.Invade("earth")
|
|
54
|
+
end sub
|
|
55
|
+
namespace Humanoids.Aliens
|
|
56
|
+
function Invade(planet)
|
|
57
|
+
end function
|
|
58
|
+
end namespace
|
|
59
|
+
`);
|
|
60
|
+
expectSemanticTokens(file, [{
|
|
61
|
+
range: util_1.util.createRange(2, 16, 2, 25),
|
|
62
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
63
|
+
}, {
|
|
64
|
+
range: util_1.util.createRange(2, 26, 2, 32),
|
|
65
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
66
|
+
}, {
|
|
67
|
+
range: util_1.util.createRange(2, 33, 2, 39),
|
|
68
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.function
|
|
69
|
+
}]);
|
|
70
|
+
});
|
|
71
|
+
it('matches each namespace section for namespaced function assignment', () => {
|
|
72
|
+
const file = program.setFile('source/main.bs', `
|
|
73
|
+
sub new()
|
|
74
|
+
action = Humanoids.Aliens.Invade
|
|
75
|
+
end sub
|
|
76
|
+
namespace Humanoids.Aliens
|
|
77
|
+
function Invade(planet)
|
|
78
|
+
end function
|
|
79
|
+
end namespace
|
|
80
|
+
`);
|
|
81
|
+
expectSemanticTokens(file, [{
|
|
82
|
+
range: util_1.util.createRange(2, 25, 2, 34),
|
|
83
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
84
|
+
}, {
|
|
85
|
+
range: util_1.util.createRange(2, 35, 2, 41),
|
|
86
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
87
|
+
}, {
|
|
88
|
+
range: util_1.util.createRange(2, 42, 2, 48),
|
|
89
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.function
|
|
90
|
+
}]);
|
|
91
|
+
});
|
|
92
|
+
it('matches each namespace section for namespaced function as function parameter', () => {
|
|
93
|
+
const file = program.setFile('source/main.bs', `
|
|
94
|
+
sub new()
|
|
95
|
+
actionName = type(Humanoids.Aliens.Invade)
|
|
96
|
+
end sub
|
|
97
|
+
namespace Humanoids.Aliens
|
|
98
|
+
function Invade(planet)
|
|
99
|
+
end function
|
|
100
|
+
end namespace
|
|
101
|
+
`);
|
|
102
|
+
expectSemanticTokens(file, [{
|
|
103
|
+
//`type` function call
|
|
104
|
+
range: util_1.util.createRange(2, 29, 2, 33),
|
|
105
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.function
|
|
106
|
+
}, {
|
|
107
|
+
range: util_1.util.createRange(2, 34, 2, 43),
|
|
108
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
109
|
+
}, {
|
|
110
|
+
range: util_1.util.createRange(2, 44, 2, 50),
|
|
111
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
112
|
+
}, {
|
|
113
|
+
range: util_1.util.createRange(2, 51, 2, 57),
|
|
114
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.function
|
|
115
|
+
}]);
|
|
116
|
+
});
|
|
117
|
+
it('matches each namespace section for namespaced function in print statement', () => {
|
|
118
|
+
const file = program.setFile('source/main.bs', `
|
|
119
|
+
sub new()
|
|
120
|
+
print Humanoids.Aliens.Invade
|
|
121
|
+
end sub
|
|
122
|
+
namespace Humanoids.Aliens
|
|
123
|
+
function Invade(planet)
|
|
124
|
+
end function
|
|
125
|
+
end namespace
|
|
126
|
+
`);
|
|
127
|
+
expectSemanticTokens(file, [{
|
|
128
|
+
range: util_1.util.createRange(2, 22, 2, 31),
|
|
129
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
130
|
+
}, {
|
|
131
|
+
range: util_1.util.createRange(2, 32, 2, 38),
|
|
132
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
133
|
+
}, {
|
|
134
|
+
range: util_1.util.createRange(2, 39, 2, 45),
|
|
135
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.function
|
|
136
|
+
}]);
|
|
137
|
+
});
|
|
138
|
+
it('matches each namespace section for enums', () => {
|
|
45
139
|
const file = program.setFile('source/main.bs', `
|
|
46
140
|
sub main()
|
|
47
141
|
print Earthlings.Species.Human.Male
|
|
@@ -53,9 +147,7 @@ describe('BrsFileSemanticTokensProcessor', () => {
|
|
|
53
147
|
end enum
|
|
54
148
|
end namespace
|
|
55
149
|
`);
|
|
56
|
-
|
|
57
|
-
(0, testHelpers_spec_1.expectZeroDiagnostics)(program);
|
|
58
|
-
(0, chai_1.expect)(util_1.util.sortByRange(program.getSemanticTokens(file.srcPath))).to.eql([{
|
|
150
|
+
expectSemanticTokens(file, [{
|
|
59
151
|
range: util_1.util.createRange(2, 22, 2, 32),
|
|
60
152
|
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
61
153
|
}, {
|
|
@@ -82,9 +174,7 @@ describe('BrsFileSemanticTokensProcessor', () => {
|
|
|
82
174
|
end enum
|
|
83
175
|
end namespace
|
|
84
176
|
`);
|
|
85
|
-
|
|
86
|
-
(0, testHelpers_spec_1.expectZeroDiagnostics)(program);
|
|
87
|
-
(0, chai_1.expect)(util_1.util.sortByRange(program.getSemanticTokens(file.srcPath))).to.eql([{
|
|
177
|
+
expectSemanticTokens(file, [{
|
|
88
178
|
range: util_1.util.createRange(2, 22, 2, 31),
|
|
89
179
|
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
90
180
|
}, {
|
|
@@ -113,9 +203,7 @@ describe('BrsFileSemanticTokensProcessor', () => {
|
|
|
113
203
|
end enum
|
|
114
204
|
end namespace
|
|
115
205
|
`);
|
|
116
|
-
|
|
117
|
-
(0, testHelpers_spec_1.expectZeroDiagnostics)(program);
|
|
118
|
-
(0, chai_1.expect)(util_1.util.sortByRange(program.getSemanticTokens(file.srcPath))).to.eql([{
|
|
206
|
+
expectSemanticTokens(file, [{
|
|
119
207
|
range: util_1.util.createRange(2, 19, 2, 28),
|
|
120
208
|
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
121
209
|
}, {
|
|
@@ -126,5 +214,48 @@ describe('BrsFileSemanticTokensProcessor', () => {
|
|
|
126
214
|
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enumMember
|
|
127
215
|
}]);
|
|
128
216
|
});
|
|
217
|
+
it('matches enum with invalid member name', () => {
|
|
218
|
+
const file = program.setFile('source/main.bs', `
|
|
219
|
+
sub main()
|
|
220
|
+
print Humanoids.HumanoidType.INVALID_VALUE 'bs:disable-line
|
|
221
|
+
end sub
|
|
222
|
+
namespace Humanoids
|
|
223
|
+
enum HumanoidType
|
|
224
|
+
Human = "Human"
|
|
225
|
+
Alien = "Alien"
|
|
226
|
+
Cylon = "Cylon"
|
|
227
|
+
end enum
|
|
228
|
+
end namespace
|
|
229
|
+
`);
|
|
230
|
+
expectSemanticTokens(file, [{
|
|
231
|
+
range: util_1.util.createRange(2, 22, 2, 31),
|
|
232
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
233
|
+
}, {
|
|
234
|
+
range: util_1.util.createRange(2, 32, 2, 44),
|
|
235
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enum
|
|
236
|
+
}]);
|
|
237
|
+
});
|
|
238
|
+
it('matches class with invalid stuff after it', () => {
|
|
239
|
+
const file = program.setFile('source/main.bs', `
|
|
240
|
+
sub init()
|
|
241
|
+
m.alien = new Humanoids.Aliens.Alien.NOT_A_CLASS() 'bs:disable-line
|
|
242
|
+
end sub
|
|
243
|
+
|
|
244
|
+
namespace Humanoids.Aliens
|
|
245
|
+
class Alien
|
|
246
|
+
end class
|
|
247
|
+
end namespace
|
|
248
|
+
`);
|
|
249
|
+
expectSemanticTokens(file, [{
|
|
250
|
+
range: util_1.util.createRange(2, 30, 2, 39),
|
|
251
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
252
|
+
}, {
|
|
253
|
+
range: util_1.util.createRange(2, 40, 2, 46),
|
|
254
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
255
|
+
}, {
|
|
256
|
+
range: util_1.util.createRange(2, 47, 2, 52),
|
|
257
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.class
|
|
258
|
+
}]);
|
|
259
|
+
});
|
|
129
260
|
});
|
|
130
261
|
//# 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,mFAAoE;
|
|
1
|
+
{"version":3,"file":"BrsFileSemanticTokensProcessor.spec.js","sourceRoot":"","sources":["../../../src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BrsFilePreTranspileProcessor = void 0;
|
|
4
|
-
const reflection_1 = require("../../astUtils/reflection");
|
|
5
4
|
const Cache_1 = require("../../Cache");
|
|
6
5
|
const util_1 = require("../../util");
|
|
7
6
|
class BrsFilePreTranspileProcessor {
|
|
@@ -19,30 +18,19 @@ class BrsFilePreTranspileProcessor {
|
|
|
19
18
|
if (((_b = enumLookup === null || enumLookup === void 0 ? void 0 : enumLookup.size) !== null && _b !== void 0 ? _b : 0) === 0) {
|
|
20
19
|
return;
|
|
21
20
|
}
|
|
22
|
-
for (const
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
//get the name of the enum member
|
|
36
|
-
const memberName = parts.pop();
|
|
37
|
-
//get the name of the enum (including leading namespace if applicable)
|
|
38
|
-
const enumName = parts.join('.');
|
|
39
|
-
const lowerEnumName = enumName.toLowerCase();
|
|
40
|
-
const theEnum = (_d = enumLookup.get(lowerEnumName)) === null || _d === void 0 ? void 0 : _d.item;
|
|
41
|
-
if (theEnum) {
|
|
42
|
-
const members = membersByEnum.getOrAdd(lowerEnumName, () => theEnum.getMemberValueMap());
|
|
43
|
-
const value = members === null || members === void 0 ? void 0 : members.get(memberName);
|
|
44
|
-
this.event.editor.overrideTranspileResult(expression, value);
|
|
45
|
-
}
|
|
21
|
+
for (const expression of this.event.file.parser.references.expressions) {
|
|
22
|
+
const parts = (_c = util_1.default.getAllDottedGetParts(expression)) === null || _c === void 0 ? void 0 : _c.map(x => x.text.toLowerCase());
|
|
23
|
+
if (parts) {
|
|
24
|
+
//get the name of the enum member
|
|
25
|
+
const memberName = parts.pop();
|
|
26
|
+
//get the name of the enum (including leading namespace if applicable)
|
|
27
|
+
const enumName = parts.join('.');
|
|
28
|
+
const lowerEnumName = enumName.toLowerCase();
|
|
29
|
+
const theEnum = (_d = enumLookup.get(lowerEnumName)) === null || _d === void 0 ? void 0 : _d.item;
|
|
30
|
+
if (theEnum) {
|
|
31
|
+
const members = membersByEnum.getOrAdd(lowerEnumName, () => theEnum.getMemberValueMap());
|
|
32
|
+
const value = members === null || members === void 0 ? void 0 : members.get(memberName);
|
|
33
|
+
this.event.editor.overrideTranspileResult(expression, value);
|
|
46
34
|
}
|
|
47
35
|
}
|
|
48
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrsFilePreTranspileProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/transpile/BrsFilePreTranspileProcessor.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"BrsFilePreTranspileProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/transpile/BrsFilePreTranspileProcessor.ts"],"names":[],"mappings":";;;AAAA,uCAAoC;AAGpC,qCAA8B;AAE9B,MAAa,4BAA4B;IACrC,YACY,KAAwC;QAAxC,UAAK,GAAL,KAAK,CAAmC;IAEpD,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAEO,iBAAiB;;QACrB,MAAM,aAAa,GAAG,IAAI,aAAK,EAA+B,CAAC;QAE/D,MAAM,UAAU,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,0CAAE,UAAU,EAAE,CAAC;QAC/F,+CAA+C;QAC/C,IAAI,CAAC,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,mCAAI,CAAC,CAAC,KAAK,CAAC,EAAE;YAC/B,OAAO;SACV;QACD,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE;YACpE,MAAM,KAAK,GAAG,MAAA,cAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YACpF,IAAI,KAAK,EAAE;gBACP,iCAAiC;gBACjC,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;gBAC/B,sEAAsE;gBACtE,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACjC,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;gBAC7C,MAAM,OAAO,GAAG,MAAA,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,0CAAE,IAAI,CAAC;gBACpD,IAAI,OAAO,EAAE;oBACT,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;oBACzF,MAAM,KAAK,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAC,UAAU,CAAC,CAAC;oBACvC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,uBAAuB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;iBAChE;aACJ;SACJ;IACL,CAAC;CACJ;AAnCD,oEAmCC"}
|
|
@@ -49,7 +49,6 @@ class ScopeValidator {
|
|
|
49
49
|
*/
|
|
50
50
|
validateEnumUsage(event) {
|
|
51
51
|
const diagnostics = [];
|
|
52
|
-
const membersByEnum = new Cache_1.Cache();
|
|
53
52
|
//if there are any enums defined in this scope
|
|
54
53
|
const enumLookup = event.scope.getEnumMap();
|
|
55
54
|
//skip enum validation if there are no enums defined in this scope
|
|
@@ -62,26 +61,33 @@ class ScopeValidator {
|
|
|
62
61
|
if (!(0, reflection_1.isBrsFile)(file)) {
|
|
63
62
|
return;
|
|
64
63
|
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
64
|
+
// const namespaceLookup = this.event.scopes[0]?.namespaceLookup;
|
|
65
|
+
for (const referenceExpression of file.parser.references.expressions) {
|
|
66
|
+
const actualExpressions = [];
|
|
67
|
+
//binary expressions actually have two expressions (left and right), so handle them independently
|
|
68
|
+
if ((0, reflection_1.isBinaryExpression)(referenceExpression)) {
|
|
69
|
+
actualExpressions.push(referenceExpression.left, referenceExpression.right);
|
|
70
|
+
}
|
|
71
|
+
else {
|
|
72
|
+
//assume all other expressions are a single chain
|
|
73
|
+
actualExpressions.push(referenceExpression);
|
|
70
74
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
75
|
+
for (let expression of actualExpressions) {
|
|
76
|
+
const tokens = util_1.default.getAllDottedGetParts(expression);
|
|
77
|
+
if (tokens) {
|
|
78
|
+
//build the full name of the thing
|
|
79
|
+
const parts = tokens.map(x => x.text);
|
|
80
|
+
const fullName = parts.join('.');
|
|
81
|
+
const memberName = parts.pop();
|
|
82
|
+
const fullParentName = parts.join('.');
|
|
83
|
+
const theEnum = (_a = event.scope.getEnumMap().get(fullParentName.toLowerCase())) === null || _a === void 0 ? void 0 : _a.item;
|
|
84
|
+
//is an enum and this field does not exist
|
|
85
|
+
if (theEnum && !event.scope.getEnumMemberMap().has(fullName.toLowerCase())) {
|
|
86
|
+
diagnostics.push(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.unknownEnumValue(memberName, fullParentName)), { range: tokens[tokens.length - 1].range, relatedInformation: [{
|
|
87
|
+
message: 'Enum declared here',
|
|
88
|
+
location: vscode_languageserver_1.Location.create(vscode_uri_1.URI.file(file.srcPath).toString(), theEnum.tokens.name.range)
|
|
89
|
+
}] }));
|
|
90
|
+
}
|
|
85
91
|
}
|
|
86
92
|
}
|
|
87
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScopeValidator.js","sourceRoot":"","sources":["../../../src/bscPlugin/validation/ScopeValidator.ts"],"names":[],"mappings":";;;AAAA,iEAAiD;AACjD,2CAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"ScopeValidator.js","sourceRoot":"","sources":["../../../src/bscPlugin/validation/ScopeValidator.ts"],"names":[],"mappings":"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"}
|