brighterscript 1.0.0-alpha.23 → 1.0.0-alpha.24
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 +108 -1
- package/dist/DiagnosticMessages.d.ts +19 -3
- package/dist/DiagnosticMessages.js +23 -7
- package/dist/DiagnosticMessages.js.map +1 -1
- package/dist/LanguageServer.js +74 -20
- package/dist/LanguageServer.js.map +1 -1
- package/dist/Program.d.ts +7 -5
- package/dist/Program.js +84 -49
- package/dist/Program.js.map +1 -1
- package/dist/ProgramBuilder.js +2 -1
- package/dist/ProgramBuilder.js.map +1 -1
- package/dist/Scope.d.ts +22 -15
- package/dist/Scope.js +108 -122
- package/dist/Scope.js.map +1 -1
- package/dist/SymbolTable.d.ts +17 -6
- package/dist/SymbolTable.js +38 -9
- package/dist/SymbolTable.js.map +1 -1
- package/dist/XmlScope.js +3 -2
- package/dist/XmlScope.js.map +1 -1
- package/dist/astUtils/reflection.d.ts +5 -1
- package/dist/astUtils/reflection.js +15 -2
- package/dist/astUtils/reflection.js.map +1 -1
- package/dist/astUtils/visitors.d.ts +2 -1
- package/dist/astUtils/visitors.js.map +1 -1
- package/dist/bscPlugin/BscPlugin.d.ts +3 -1
- package/dist/bscPlugin/BscPlugin.js +8 -0
- package/dist/bscPlugin/BscPlugin.js.map +1 -1
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.d.ts +1 -1
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.js +11 -5
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.js.map +1 -1
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.spec.js +75 -1
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.d.ts +6 -0
- package/dist/bscPlugin/completions/CompletionsProcessor.js +53 -0
- package/dist/bscPlugin/completions/CompletionsProcessor.js.map +1 -0
- package/dist/bscPlugin/hover/HoverProcessor.d.ts +17 -0
- package/dist/bscPlugin/hover/HoverProcessor.js +190 -0
- package/dist/bscPlugin/hover/HoverProcessor.js.map +1 -0
- package/dist/bscPlugin/hover/HoverProcessor.spec.d.ts +1 -0
- package/dist/bscPlugin/hover/HoverProcessor.spec.js +195 -0
- package/dist/bscPlugin/hover/HoverProcessor.spec.js.map +1 -0
- 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/transpile/BrsFilePreTranspileProcessor.d.ts +7 -1
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.js +81 -22
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.js.map +1 -1
- package/dist/bscPlugin/validation/BrsFileValidator.d.ts +14 -1
- package/dist/bscPlugin/validation/BrsFileValidator.js +104 -27
- 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.d.ts +24 -3
- package/dist/bscPlugin/validation/ScopeValidator.js +249 -48
- package/dist/bscPlugin/validation/ScopeValidator.js.map +1 -1
- package/dist/cli.js +18 -10
- package/dist/cli.js.map +1 -1
- package/dist/files/BrsFile.Class.spec.js +51 -38
- package/dist/files/BrsFile.Class.spec.js.map +1 -1
- package/dist/files/BrsFile.d.ts +21 -10
- package/dist/files/BrsFile.js +158 -179
- package/dist/files/BrsFile.js.map +1 -1
- package/dist/files/BrsFile.spec.js +222 -126
- package/dist/files/BrsFile.spec.js.map +1 -1
- package/dist/files/XmlFile.d.ts +2 -2
- package/dist/files/XmlFile.js +1 -0
- package/dist/files/XmlFile.js.map +1 -1
- package/dist/files/tests/imports.spec.js +1 -1
- package/dist/files/tests/imports.spec.js.map +1 -1
- package/dist/files/tests/optionalChaning.spec.js +20 -16
- package/dist/files/tests/optionalChaning.spec.js.map +1 -1
- package/dist/globalCallables.js +3 -0
- package/dist/globalCallables.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/interfaces.d.ts +65 -3
- package/dist/lexer/Lexer.spec.js +7 -0
- package/dist/lexer/Lexer.spec.js.map +1 -1
- package/dist/lexer/TokenKind.d.ts +1 -0
- package/dist/lexer/TokenKind.js +8 -3
- package/dist/lexer/TokenKind.js.map +1 -1
- package/dist/parser/Expression.d.ts +12 -3
- package/dist/parser/Expression.js +16 -4
- package/dist/parser/Expression.js.map +1 -1
- package/dist/parser/Parser.Class.spec.js +1 -1
- package/dist/parser/Parser.d.ts +10 -3
- package/dist/parser/Parser.js +107 -47
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/Parser.spec.js +181 -108
- package/dist/parser/Parser.spec.js.map +1 -1
- package/dist/parser/Statement.d.ts +41 -7
- package/dist/parser/Statement.js +84 -11
- package/dist/parser/Statement.js.map +1 -1
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js +73 -31
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/TemplateStringExpression.spec.js +148 -47
- package/dist/parser/tests/expression/TemplateStringExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/TernaryExpression.spec.js +219 -37
- package/dist/parser/tests/expression/TernaryExpression.spec.js.map +1 -1
- package/dist/parser/tests/statement/ConstStatement.spec.d.ts +1 -0
- package/dist/parser/tests/statement/ConstStatement.spec.js +213 -0
- package/dist/parser/tests/statement/ConstStatement.spec.js.map +1 -0
- package/dist/parser/tests/statement/Enum.spec.js +17 -2
- package/dist/parser/tests/statement/Enum.spec.js.map +1 -1
- package/dist/parser/tests/statement/PrintStatement.spec.js +72 -57
- package/dist/parser/tests/statement/PrintStatement.spec.js.map +1 -1
- package/dist/preprocessor/Manifest.js +2 -2
- package/dist/preprocessor/Manifest.js.map +1 -1
- package/dist/preprocessor/Preprocessor.js +10 -6
- package/dist/preprocessor/Preprocessor.js.map +1 -1
- package/dist/roku-types/data.json +1002 -788
- package/dist/roku-types/index.d.ts +64 -239
- package/dist/types/DynamicType.d.ts +1 -0
- package/dist/types/DynamicType.js +1 -0
- package/dist/types/DynamicType.js.map +1 -1
- package/dist/util.d.ts +55 -14
- package/dist/util.js +131 -25
- package/dist/util.js.map +1 -1
- package/dist/validators/ClassValidator.d.ts +0 -1
- package/dist/validators/ClassValidator.js +15 -26
- package/dist/validators/ClassValidator.js.map +1 -1
- package/package.json +5 -2
|
@@ -0,0 +1,195 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const chai_1 = require("chai");
|
|
4
|
+
const Program_1 = require("../../Program");
|
|
5
|
+
const util_1 = require("../../util");
|
|
6
|
+
const sinon_1 = require("sinon");
|
|
7
|
+
let sinon = (0, sinon_1.createSandbox)();
|
|
8
|
+
let rootDir = (0, util_1.standardizePath) `${process.cwd()}/.tmp/rootDir`;
|
|
9
|
+
const fence = (code) => util_1.default.mdFence(code, 'brightscript');
|
|
10
|
+
describe('HoverProcessor', () => {
|
|
11
|
+
let program;
|
|
12
|
+
beforeEach(() => {
|
|
13
|
+
program = new Program_1.Program({ rootDir: rootDir, sourceMap: true });
|
|
14
|
+
});
|
|
15
|
+
afterEach(() => {
|
|
16
|
+
sinon.restore();
|
|
17
|
+
program.dispose();
|
|
18
|
+
});
|
|
19
|
+
it('does not short-circuit the event since our plugin is the base plugin', () => {
|
|
20
|
+
const mock = sinon.mock();
|
|
21
|
+
program.plugins.add({
|
|
22
|
+
name: 'test-plugin',
|
|
23
|
+
provideHover: mock
|
|
24
|
+
});
|
|
25
|
+
const file = program.setFile('source/main.brs', `
|
|
26
|
+
sub main()
|
|
27
|
+
end sub
|
|
28
|
+
`);
|
|
29
|
+
//get the hover
|
|
30
|
+
program.getHover(file.srcPath, util_1.default.createPosition(1, 20));
|
|
31
|
+
//the onGetHover function from `test-plugin` should always get called because
|
|
32
|
+
//BscPlugin should never short-circuit the event
|
|
33
|
+
(0, chai_1.expect)(mock.called).to.be.true;
|
|
34
|
+
});
|
|
35
|
+
describe('BrsFile', () => {
|
|
36
|
+
it('works for param types', () => {
|
|
37
|
+
const file = program.setFile('source/main.brs', `
|
|
38
|
+
sub DoSomething(name as string)
|
|
39
|
+
name = 1
|
|
40
|
+
sayMyName = function(name as string)
|
|
41
|
+
end function
|
|
42
|
+
end sub
|
|
43
|
+
`);
|
|
44
|
+
//hover over the `name = 1` line
|
|
45
|
+
let hover = program.getHover(file.srcPath, util_1.default.createPosition(2, 24))[0];
|
|
46
|
+
(0, chai_1.expect)(hover).to.exist;
|
|
47
|
+
(0, chai_1.expect)(hover.range).to.eql(util_1.default.createRange(2, 20, 2, 24));
|
|
48
|
+
//hover over the `name` parameter declaration
|
|
49
|
+
hover = program.getHover(file.srcPath, util_1.default.createPosition(1, 34))[0];
|
|
50
|
+
(0, chai_1.expect)(hover).to.exist;
|
|
51
|
+
(0, chai_1.expect)(hover.range).to.eql(util_1.default.createRange(1, 32, 1, 36));
|
|
52
|
+
});
|
|
53
|
+
//ignore this for now...it's not a huge deal
|
|
54
|
+
it('does not match on keywords or data types', () => {
|
|
55
|
+
let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
|
|
56
|
+
sub Main(name as string)
|
|
57
|
+
end sub
|
|
58
|
+
sub as()
|
|
59
|
+
end sub
|
|
60
|
+
`);
|
|
61
|
+
//hover over the `as`
|
|
62
|
+
(0, chai_1.expect)(program.getHover(file.srcPath, util_1.default.createPosition(1, 31))).to.be.empty;
|
|
63
|
+
//hover over the `string`
|
|
64
|
+
(0, chai_1.expect)(program.getHover(file.srcPath, util_1.default.createPosition(1, 36))).to.be.empty;
|
|
65
|
+
});
|
|
66
|
+
it('finds declared function', () => {
|
|
67
|
+
let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
|
|
68
|
+
function Main(count = 1)
|
|
69
|
+
firstName = "bob"
|
|
70
|
+
age = 21
|
|
71
|
+
shoeSize = 10
|
|
72
|
+
end function
|
|
73
|
+
`);
|
|
74
|
+
let hover = program.getHover(file.srcPath, util_1.default.createPosition(1, 28))[0];
|
|
75
|
+
(0, chai_1.expect)(hover).to.exist;
|
|
76
|
+
(0, chai_1.expect)(hover.range).to.eql(util_1.default.createRange(1, 25, 1, 29));
|
|
77
|
+
(0, chai_1.expect)(hover.contents).to.eql(fence('function Main(count? as integer) as dynamic'));
|
|
78
|
+
});
|
|
79
|
+
it('finds variable function hover in same scope', () => {
|
|
80
|
+
let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
|
|
81
|
+
sub Main()
|
|
82
|
+
sayMyName = sub(name as string)
|
|
83
|
+
end sub
|
|
84
|
+
|
|
85
|
+
sayMyName()
|
|
86
|
+
end sub
|
|
87
|
+
`);
|
|
88
|
+
let hover = program.getHover(file.srcPath, util_1.default.createPosition(5, 24))[0];
|
|
89
|
+
(0, chai_1.expect)(hover.range).to.eql(util_1.default.createRange(5, 20, 5, 29));
|
|
90
|
+
(0, chai_1.expect)(hover.contents).to.eql(fence('sub (name as string) as void'));
|
|
91
|
+
});
|
|
92
|
+
it('finds function hover in file scope', () => {
|
|
93
|
+
let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
|
|
94
|
+
sub Main()
|
|
95
|
+
sayMyName()
|
|
96
|
+
end sub
|
|
97
|
+
|
|
98
|
+
sub sayMyName()
|
|
99
|
+
|
|
100
|
+
end sub
|
|
101
|
+
`);
|
|
102
|
+
let hover = program.getHover(file.srcPath, util_1.default.createPosition(2, 25))[0];
|
|
103
|
+
(0, chai_1.expect)(hover.range).to.eql(util_1.default.createRange(2, 20, 2, 29));
|
|
104
|
+
(0, chai_1.expect)(hover.contents).to.eql(fence('sub sayMyName() as void'));
|
|
105
|
+
});
|
|
106
|
+
it('finds function hover in scope', () => {
|
|
107
|
+
let rootDir = process.cwd();
|
|
108
|
+
program = new Program_1.Program({
|
|
109
|
+
rootDir: rootDir
|
|
110
|
+
});
|
|
111
|
+
let mainFile = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
|
|
112
|
+
sub Main()
|
|
113
|
+
sayMyName()
|
|
114
|
+
end sub
|
|
115
|
+
`);
|
|
116
|
+
program.setFile({ src: `${rootDir}/source/lib.brs`, dest: 'source/lib.brs' }, `
|
|
117
|
+
sub sayMyName(name as string)
|
|
118
|
+
|
|
119
|
+
end sub
|
|
120
|
+
`);
|
|
121
|
+
let hover = program.getHover(mainFile.srcPath, util_1.default.createPosition(2, 25))[0];
|
|
122
|
+
(0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.range).to.eql(util_1.default.createRange(2, 20, 2, 29));
|
|
123
|
+
(0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.eql(fence('sub sayMyName(name as string) as void'));
|
|
124
|
+
});
|
|
125
|
+
it('finds top-level constant value', () => {
|
|
126
|
+
program.setFile('source/main.bs', `
|
|
127
|
+
sub main()
|
|
128
|
+
print SOME_VALUE
|
|
129
|
+
end sub
|
|
130
|
+
const SOME_VALUE = true
|
|
131
|
+
`);
|
|
132
|
+
// print SOM|E_VALUE
|
|
133
|
+
let hover = program.getHover('source/main.bs', util_1.default.createPosition(2, 29))[0];
|
|
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
|
+
(0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.eql(fence('const SOME_VALUE = true'));
|
|
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
|
+
});
|
|
165
|
+
it('finds namespaced constant value', () => {
|
|
166
|
+
program.setFile('source/main.bs', `
|
|
167
|
+
sub main()
|
|
168
|
+
print name.SOME_VALUE
|
|
169
|
+
end sub
|
|
170
|
+
namespace name
|
|
171
|
+
const SOME_VALUE = true
|
|
172
|
+
end namespace
|
|
173
|
+
`);
|
|
174
|
+
// print name.SOM|E_VALUE
|
|
175
|
+
let hover = program.getHover('source/main.bs', util_1.default.createPosition(2, 34))[0];
|
|
176
|
+
(0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.range).to.eql(util_1.default.createRange(2, 31, 2, 41));
|
|
177
|
+
(0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.eql(fence('const name.SOME_VALUE = true'));
|
|
178
|
+
});
|
|
179
|
+
it('finds deep namespaced constant value', () => {
|
|
180
|
+
program.setFile('source/main.bs', `
|
|
181
|
+
sub main()
|
|
182
|
+
print name.sp.a.c.e.SOME_VALUE
|
|
183
|
+
end sub
|
|
184
|
+
namespace name.sp.a.c.e
|
|
185
|
+
const SOME_VALUE = true
|
|
186
|
+
end namespace
|
|
187
|
+
`);
|
|
188
|
+
// print name.sp.a.c.e.SOM|E_VALUE
|
|
189
|
+
let hover = program.getHover('source/main.bs', util_1.default.createPosition(2, 43))[0];
|
|
190
|
+
(0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.range).to.eql(util_1.default.createRange(2, 40, 2, 50));
|
|
191
|
+
(0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.eql(fence('const name.sp.a.c.e.SOME_VALUE = true'));
|
|
192
|
+
});
|
|
193
|
+
});
|
|
194
|
+
});
|
|
195
|
+
//# sourceMappingURL=HoverProcessor.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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,IAAI,CAAC,OAAO,EAAE;wBAC9B,aAAa,EAAE,MAAA,IAAI,CAAC,aAAa,0CAAE,OAAO,CAAC,kBAAS,CAAC,cAAc,CAAC;wBACpE,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;qBACzB,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":"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"}
|
|
@@ -4,5 +4,11 @@ export declare class BrsFilePreTranspileProcessor {
|
|
|
4
4
|
private event;
|
|
5
5
|
constructor(event: BeforeFileTranspileEvent<BrsFile>);
|
|
6
6
|
process(): void;
|
|
7
|
-
private
|
|
7
|
+
private iterateExpressions;
|
|
8
|
+
/**
|
|
9
|
+
* Given a string optionally separated by dots, find an enum related to it.
|
|
10
|
+
* For example, all of these would return the enum: `SomeNamespace.SomeEnum.SomeMember`, SomeEnum.SomeMember, `SomeEnum`
|
|
11
|
+
*/
|
|
12
|
+
private getEnumInfo;
|
|
13
|
+
private processExpression;
|
|
8
14
|
}
|
|
@@ -1,38 +1,97 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BrsFilePreTranspileProcessor = void 0;
|
|
4
|
-
const
|
|
4
|
+
const creators_1 = require("../../astUtils/creators");
|
|
5
|
+
const reflection_1 = require("../../astUtils/reflection");
|
|
6
|
+
const TokenKind_1 = require("../../lexer/TokenKind");
|
|
7
|
+
const Expression_1 = require("../../parser/Expression");
|
|
8
|
+
const Parser_1 = require("../../parser/Parser");
|
|
5
9
|
const util_1 = require("../../util");
|
|
6
10
|
class BrsFilePreTranspileProcessor {
|
|
7
11
|
constructor(event) {
|
|
8
12
|
this.event = event;
|
|
9
13
|
}
|
|
10
14
|
process() {
|
|
11
|
-
this.
|
|
15
|
+
if ((0, reflection_1.isBrsFile)(this.event.file)) {
|
|
16
|
+
this.iterateExpressions();
|
|
17
|
+
}
|
|
12
18
|
}
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
19
|
+
iterateExpressions() {
|
|
20
|
+
const scope = this.event.program.getFirstScopeForFile(this.event.file);
|
|
21
|
+
for (let expression of this.event.file.parser.references.expressions) {
|
|
22
|
+
if (expression) {
|
|
23
|
+
this.processExpression(expression, scope);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Given a string optionally separated by dots, find an enum related to it.
|
|
29
|
+
* For example, all of these would return the enum: `SomeNamespace.SomeEnum.SomeMember`, SomeEnum.SomeMember, `SomeEnum`
|
|
30
|
+
*/
|
|
31
|
+
getEnumInfo(name, containingNamespace, scope) {
|
|
32
|
+
//look for the enum directly
|
|
33
|
+
let result = scope === null || scope === void 0 ? void 0 : scope.getEnumFileLink(name, containingNamespace);
|
|
34
|
+
if (result) {
|
|
35
|
+
return {
|
|
36
|
+
enum: result.item
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
//assume we've been given the enum.member syntax, so pop the member and try again
|
|
40
|
+
const parts = name.split('.');
|
|
41
|
+
const memberName = parts.pop();
|
|
42
|
+
result = scope === null || scope === void 0 ? void 0 : scope.getEnumMap().get(parts.join('.'));
|
|
43
|
+
if (result) {
|
|
44
|
+
const value = result.item.getMemberValue(memberName);
|
|
45
|
+
return {
|
|
46
|
+
enum: result.item,
|
|
47
|
+
value: new Expression_1.LiteralExpression((0, creators_1.createToken)(
|
|
48
|
+
//just use float literal for now...it will transpile properly with any literal value
|
|
49
|
+
value.startsWith('"') ? TokenKind_1.TokenKind.StringLiteral : TokenKind_1.TokenKind.FloatLiteral, value))
|
|
50
|
+
};
|
|
20
51
|
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
52
|
+
}
|
|
53
|
+
processExpression(expression, scope) {
|
|
54
|
+
var _a, _b, _c, _d;
|
|
55
|
+
let containingNamespace = (_a = this.event.file.getNamespaceStatementForPosition(expression.range.start)) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript);
|
|
56
|
+
const parts = util_1.default.splitExpression(expression);
|
|
57
|
+
const processedNames = [];
|
|
58
|
+
for (let i = 0; i < parts.length; i++) {
|
|
59
|
+
const part = parts[i];
|
|
60
|
+
let entityName;
|
|
61
|
+
if ((0, reflection_1.isVariableExpression)(part) || (0, reflection_1.isDottedGetExpression)(part)) {
|
|
62
|
+
processedNames.push((_c = (_b = part === null || part === void 0 ? void 0 : part.name) === null || _b === void 0 ? void 0 : _b.text) === null || _c === void 0 ? void 0 : _c.toLocaleLowerCase());
|
|
63
|
+
entityName = processedNames.join('.');
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
let value;
|
|
69
|
+
//did we find a const? transpile the value
|
|
70
|
+
let constStatement = (_d = scope === null || scope === void 0 ? void 0 : scope.getConstFileLink(entityName, containingNamespace)) === null || _d === void 0 ? void 0 : _d.item;
|
|
71
|
+
if (constStatement) {
|
|
72
|
+
value = constStatement.value;
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
//did we find an enum member? transpile that
|
|
76
|
+
let enumInfo = this.getEnumInfo(entityName, containingNamespace, scope);
|
|
77
|
+
if (enumInfo === null || enumInfo === void 0 ? void 0 : enumInfo.value) {
|
|
78
|
+
value = enumInfo.value;
|
|
34
79
|
}
|
|
35
80
|
}
|
|
81
|
+
if (value) {
|
|
82
|
+
//override the transpile for this item.
|
|
83
|
+
this.event.editor.setProperty(part, 'transpile', (state) => {
|
|
84
|
+
if ((0, reflection_1.isLiteralExpression)(value)) {
|
|
85
|
+
return value.transpile(state);
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
//wrap non-literals with parens to prevent on-device compile errors
|
|
89
|
+
return ['(', ...value.transpile(state), ')'];
|
|
90
|
+
}
|
|
91
|
+
});
|
|
92
|
+
//we are finished handling this expression
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
36
95
|
}
|
|
37
96
|
}
|
|
38
97
|
}
|
|
@@ -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":"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"}
|
|
@@ -4,6 +4,19 @@ 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;
|
|
18
|
+
/**
|
|
19
|
+
* Find statements defined at the top level (or inside a namespace body) that are not allowed to be there
|
|
20
|
+
*/
|
|
21
|
+
private flagTopLevelStatements;
|
|
9
22
|
}
|