brighterscript 1.0.0-alpha.25 → 1.0.0-alpha.27
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 +44 -0
- package/bsconfig.schema.json +5 -0
- package/dist/AstValidationSegmenter.d.ts +1 -1
- package/dist/AstValidationSegmenter.js +6 -7
- package/dist/AstValidationSegmenter.js.map +1 -1
- package/dist/BsConfig.d.ts +1 -0
- package/dist/DiagnosticMessages.d.ts +1 -3
- package/dist/DiagnosticMessages.js +5 -8
- package/dist/DiagnosticMessages.js.map +1 -1
- package/dist/Program.d.ts +1 -1
- package/dist/Program.js +40 -42
- package/dist/Program.js.map +1 -1
- package/dist/Scope.d.ts +2 -13
- package/dist/Scope.js +27 -35
- package/dist/Scope.js.map +1 -1
- package/dist/SymbolTable.d.ts +1 -8
- package/dist/SymbolTable.js +1 -10
- package/dist/SymbolTable.js.map +1 -1
- package/dist/SymbolTableFlag.d.ts +8 -0
- package/dist/SymbolTableFlag.js +13 -0
- package/dist/SymbolTableFlag.js.map +1 -0
- package/dist/XmlScope.d.ts +1 -6
- package/dist/XmlScope.js +6 -25
- package/dist/XmlScope.js.map +1 -1
- package/dist/astUtils/CachedLookups.d.ts +1 -2
- package/dist/astUtils/CachedLookups.js +3 -14
- package/dist/astUtils/CachedLookups.js.map +1 -1
- package/dist/astUtils/Editor.spec.js +1 -1
- package/dist/astUtils/Editor.spec.js.map +1 -1
- package/dist/astUtils/creators.js +77 -18
- package/dist/astUtils/creators.js.map +1 -1
- package/dist/astUtils/creators.spec.js +4 -4
- package/dist/astUtils/creators.spec.js.map +1 -1
- package/dist/astUtils/reflection.d.ts +3 -1
- package/dist/astUtils/reflection.js +12 -4
- package/dist/astUtils/reflection.js.map +1 -1
- package/dist/astUtils/reflection.spec.js +59 -42
- package/dist/astUtils/reflection.spec.js.map +1 -1
- package/dist/astUtils/visitors.spec.js +30 -19
- package/dist/astUtils/visitors.spec.js.map +1 -1
- package/dist/bscPlugin/BscPlugin.d.ts +2 -1
- package/dist/bscPlugin/BscPlugin.js +7 -3
- package/dist/bscPlugin/BscPlugin.js.map +1 -1
- package/dist/bscPlugin/CallExpressionInfo.js +7 -7
- package/dist/bscPlugin/CallExpressionInfo.js.map +1 -1
- package/dist/bscPlugin/SignatureHelpUtil.js +5 -4
- package/dist/bscPlugin/SignatureHelpUtil.js.map +1 -1
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.js +2 -2
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.js.map +1 -1
- package/dist/bscPlugin/completions/CompletionsProcessor.js +23 -23
- package/dist/bscPlugin/completions/CompletionsProcessor.js.map +1 -1
- package/dist/bscPlugin/definition/DefinitionProvider.d.ts +13 -0
- package/dist/bscPlugin/definition/DefinitionProvider.js +210 -0
- package/dist/bscPlugin/definition/DefinitionProvider.js.map +1 -0
- package/dist/bscPlugin/definition/DefinitionProvider.spec.d.ts +1 -0
- package/dist/bscPlugin/definition/DefinitionProvider.spec.js +88 -0
- package/dist/bscPlugin/definition/DefinitionProvider.spec.js.map +1 -0
- package/dist/bscPlugin/hover/HoverProcessor.d.ts +1 -0
- package/dist/bscPlugin/hover/HoverProcessor.js +28 -8
- package/dist/bscPlugin/hover/HoverProcessor.js.map +1 -1
- package/dist/bscPlugin/hover/HoverProcessor.spec.js +74 -2
- package/dist/bscPlugin/hover/HoverProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js +2 -5
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js.map +1 -1
- package/dist/bscPlugin/transpile/BrsFileTranspileProcessor.js +8 -6
- package/dist/bscPlugin/transpile/BrsFileTranspileProcessor.js.map +1 -1
- package/dist/bscPlugin/validation/BrsFileValidator.js +46 -47
- package/dist/bscPlugin/validation/BrsFileValidator.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.d.ts +10 -0
- package/dist/bscPlugin/validation/ScopeValidator.js +120 -39
- package/dist/bscPlugin/validation/ScopeValidator.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.spec.js +165 -10
- package/dist/bscPlugin/validation/ScopeValidator.spec.js.map +1 -1
- package/dist/diagnosticUtils.d.ts +1 -1
- package/dist/files/BrsFile.Class.spec.js +7 -6
- package/dist/files/BrsFile.Class.spec.js.map +1 -1
- package/dist/files/BrsFile.d.ts +7 -15
- package/dist/files/BrsFile.js +49 -309
- package/dist/files/BrsFile.js.map +1 -1
- package/dist/files/BrsFile.spec.js +111 -157
- package/dist/files/BrsFile.spec.js.map +1 -1
- package/dist/files/XmlFile.d.ts +2 -3
- package/dist/files/XmlFile.js +0 -2
- package/dist/files/XmlFile.js.map +1 -1
- package/dist/interfaces.d.ts +109 -84
- package/dist/interfaces.js +9 -9
- package/dist/interfaces.js.map +1 -1
- package/dist/parser/AstNode.spec.js +6 -6
- package/dist/parser/AstNode.spec.js.map +1 -1
- package/dist/parser/Expression.d.ts +301 -164
- package/dist/parser/Expression.js +355 -294
- package/dist/parser/Expression.js.map +1 -1
- package/dist/parser/Parser.Class.spec.js +26 -27
- package/dist/parser/Parser.Class.spec.js.map +1 -1
- package/dist/parser/Parser.d.ts +6 -2
- package/dist/parser/Parser.js +361 -160
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/Parser.spec.js +69 -213
- package/dist/parser/Parser.spec.js.map +1 -1
- package/dist/parser/SGParser.js +49 -35
- package/dist/parser/SGParser.js.map +1 -1
- package/dist/parser/SGTypes.d.ts +36 -24
- package/dist/parser/SGTypes.js +26 -55
- package/dist/parser/SGTypes.js.map +1 -1
- package/dist/parser/Statement.d.ts +381 -238
- package/dist/parser/Statement.js +510 -386
- package/dist/parser/Statement.js.map +1 -1
- package/dist/parser/Statement.spec.js +2 -2
- package/dist/parser/Statement.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/For.spec.js +1 -1
- package/dist/parser/tests/controlFlow/For.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/ForEach.spec.js +2 -2
- package/dist/parser/tests/controlFlow/ForEach.spec.js.map +1 -1
- package/dist/parser/tests/expression/AssociativeArrayLiterals.spec.js +1 -1
- package/dist/parser/tests/expression/AssociativeArrayLiterals.spec.js.map +1 -1
- package/dist/parser/tests/expression/Call.spec.js +11 -11
- package/dist/parser/tests/expression/Call.spec.js.map +1 -1
- package/dist/parser/tests/expression/Indexing.spec.js +30 -5
- package/dist/parser/tests/expression/Indexing.spec.js.map +1 -1
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js +2 -2
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/TernaryExpression.spec.js +2 -2
- package/dist/parser/tests/expression/TernaryExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/TypeExpression.spec.js +8 -9
- package/dist/parser/tests/expression/TypeExpression.spec.js.map +1 -1
- package/dist/parser/tests/statement/ConstStatement.spec.js +1 -1
- package/dist/parser/tests/statement/ConstStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/Dim.spec.js +8 -8
- package/dist/parser/tests/statement/Dim.spec.js.map +1 -1
- package/dist/parser/tests/statement/Enum.spec.js +2 -2
- package/dist/parser/tests/statement/Enum.spec.js.map +1 -1
- package/dist/parser/tests/statement/LibraryStatement.spec.js +2 -2
- package/dist/parser/tests/statement/LibraryStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/Misc.spec.js +2 -2
- package/dist/parser/tests/statement/Misc.spec.js.map +1 -1
- package/dist/parser/tests/statement/PrintStatement.spec.js +1 -1
- package/dist/parser/tests/statement/TryCatch.spec.js +10 -3
- package/dist/parser/tests/statement/TryCatch.spec.js.map +1 -1
- package/dist/roku-types/data.json +70 -52
- package/dist/roku-types/index.d.ts +43 -21
- package/dist/types/ArrayType.js +1 -2
- package/dist/types/ArrayType.js.map +1 -1
- package/dist/types/ArrayType.spec.js +7 -8
- package/dist/types/ArrayType.spec.js.map +1 -1
- package/dist/types/AssociativeArrayType.js +2 -3
- package/dist/types/AssociativeArrayType.js.map +1 -1
- package/dist/types/BscType.d.ts +1 -1
- package/dist/types/BscType.js +2 -3
- package/dist/types/BscType.js.map +1 -1
- package/dist/types/BuiltInInterfaceAdder.js +15 -9
- package/dist/types/BuiltInInterfaceAdder.js.map +1 -1
- package/dist/types/BuiltInInterfaceAdder.spec.js +31 -32
- package/dist/types/BuiltInInterfaceAdder.spec.js.map +1 -1
- package/dist/types/ClassType.spec.js +10 -11
- package/dist/types/ClassType.spec.js.map +1 -1
- package/dist/types/ComponentType.d.ts +2 -1
- package/dist/types/ComponentType.js.map +1 -1
- package/dist/types/EnumType.js +2 -3
- package/dist/types/EnumType.js.map +1 -1
- package/dist/types/InheritableType.js +3 -4
- package/dist/types/InheritableType.js.map +1 -1
- package/dist/types/InterfaceType.js +2 -3
- package/dist/types/InterfaceType.js.map +1 -1
- package/dist/types/InterfaceType.spec.js +3 -4
- package/dist/types/InterfaceType.spec.js.map +1 -1
- package/dist/types/ObjectType.js +1 -2
- package/dist/types/ObjectType.js.map +1 -1
- package/dist/types/ReferenceType.d.ts +1 -1
- package/dist/types/ReferenceType.spec.js +21 -22
- package/dist/types/ReferenceType.spec.js.map +1 -1
- package/dist/types/UnionType.js +3 -3
- package/dist/types/UnionType.js.map +1 -1
- package/dist/types/UnionType.spec.js +37 -38
- package/dist/types/UnionType.spec.js.map +1 -1
- package/dist/types/helper.spec.js +4 -5
- package/dist/types/helper.spec.js.map +1 -1
- package/dist/util.d.ts +16 -7
- package/dist/util.js +89 -43
- package/dist/util.js.map +1 -1
- package/dist/validators/ClassValidator.d.ts +0 -9
- package/dist/validators/ClassValidator.js +9 -52
- package/dist/validators/ClassValidator.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,210 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DefinitionProvider = void 0;
|
|
4
|
+
const reflection_1 = require("../../astUtils/reflection");
|
|
5
|
+
const TokenKind_1 = require("../../lexer/TokenKind");
|
|
6
|
+
const Parser_1 = require("../../parser/Parser");
|
|
7
|
+
const util_1 = require("../../util");
|
|
8
|
+
const vscode_uri_1 = require("vscode-uri");
|
|
9
|
+
const visitors_1 = require("../../astUtils/visitors");
|
|
10
|
+
class DefinitionProvider {
|
|
11
|
+
constructor(event) {
|
|
12
|
+
this.event = event;
|
|
13
|
+
}
|
|
14
|
+
process() {
|
|
15
|
+
if ((0, reflection_1.isBrsFile)(this.event.file)) {
|
|
16
|
+
this.brsFileGetDefinition(this.event.file);
|
|
17
|
+
}
|
|
18
|
+
else if ((0, reflection_1.isXmlFile)(this.event.file)) {
|
|
19
|
+
this.xmlFileGetDefinition(this.event.file);
|
|
20
|
+
}
|
|
21
|
+
return this.event.definitions;
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* For a position in a BrsFile, get the location where the token at that position was defined
|
|
25
|
+
*/
|
|
26
|
+
brsFileGetDefinition(file) {
|
|
27
|
+
var _a, _b, _c, _d, _e, _f;
|
|
28
|
+
//get the token at the position
|
|
29
|
+
const token = file.getTokenAt(this.event.position);
|
|
30
|
+
// While certain other tokens are allowed as local variables (AllowedLocalIdentifiers: https://github.com/rokucommunity/brighterscript/blob/master/src/lexer/TokenKind.ts#L418), these are converted by the parser to TokenKind.Identifier by the time we retrieve the token using getTokenAt
|
|
31
|
+
let definitionTokenTypes = [
|
|
32
|
+
TokenKind_1.TokenKind.Identifier,
|
|
33
|
+
TokenKind_1.TokenKind.StringLiteral
|
|
34
|
+
];
|
|
35
|
+
//throw out invalid tokens and the wrong kind of tokens
|
|
36
|
+
if (!token || !definitionTokenTypes.includes(token.kind)) {
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
const scopesForFile = this.event.program.getScopesForFile(file);
|
|
40
|
+
const [scope] = scopesForFile;
|
|
41
|
+
const expression = file.getClosestExpression(this.event.position);
|
|
42
|
+
if (scope && expression) {
|
|
43
|
+
scope.linkSymbolTable();
|
|
44
|
+
let containingNamespace = (_a = expression.findAncestor(reflection_1.isNamespaceStatement)) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript);
|
|
45
|
+
const fullName = (_b = util_1.default.getAllDottedGetParts(expression)) === null || _b === void 0 ? void 0 : _b.map(x => x.text).join('.');
|
|
46
|
+
//find a constant with this name
|
|
47
|
+
const constant = scope === null || scope === void 0 ? void 0 : scope.getConstFileLink(fullName, containingNamespace);
|
|
48
|
+
if (constant) {
|
|
49
|
+
this.event.definitions.push(util_1.default.createLocation(vscode_uri_1.URI.file(constant.file.srcPath).toString(), constant.item.tokens.name.range));
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
if ((0, reflection_1.isDottedGetExpression)(expression) || (0, reflection_1.isVariableExpression)(expression)) {
|
|
53
|
+
const enumLink = scope.getEnumFileLink(fullName, containingNamespace);
|
|
54
|
+
if (enumLink) {
|
|
55
|
+
this.event.definitions.push(util_1.default.createLocation(vscode_uri_1.URI.file(enumLink.file.srcPath).toString(), enumLink.item.tokens.name.range));
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
const enumMemberLink = scope.getEnumMemberFileLink(fullName, containingNamespace);
|
|
59
|
+
if (enumMemberLink) {
|
|
60
|
+
this.event.definitions.push(util_1.default.createLocation(vscode_uri_1.URI.file(enumMemberLink.file.srcPath).toString(), enumMemberLink.item.tokens.name.range));
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
const interfaceFileLink = scope.getInterfaceFileLink(fullName, containingNamespace);
|
|
64
|
+
if (interfaceFileLink) {
|
|
65
|
+
this.event.definitions.push(util_1.default.createLocation(vscode_uri_1.URI.file(interfaceFileLink.file.srcPath).toString(), interfaceFileLink.item.tokens.name.range));
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
const classFileLink = scope.getClassFileLink(fullName, containingNamespace);
|
|
69
|
+
if (classFileLink) {
|
|
70
|
+
this.event.definitions.push(util_1.default.createLocation(vscode_uri_1.URI.file(classFileLink.file.srcPath).toString(), classFileLink.item.tokens.name.range));
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
let textToSearchFor = token.text.toLowerCase();
|
|
76
|
+
const previousToken = file.getTokenAt({ line: token.range.start.line, character: token.range.start.character });
|
|
77
|
+
if ((previousToken === null || previousToken === void 0 ? void 0 : previousToken.kind) === TokenKind_1.TokenKind.Callfunc) {
|
|
78
|
+
for (const scope of this.event.program.getScopes()) {
|
|
79
|
+
//does this xml file declare this function in its interface?
|
|
80
|
+
if ((0, reflection_1.isXmlScope)(scope)) {
|
|
81
|
+
const apiFunc = (_f = (_e = (_d = (_c = scope.xmlFile.ast) === null || _c === void 0 ? void 0 : _c.componentElement) === null || _d === void 0 ? void 0 : _d.interfaceElement) === null || _e === void 0 ? void 0 : _e.functions) === null || _f === void 0 ? void 0 : _f.find(x => x.name.toLowerCase() === textToSearchFor); // eslint-disable-line @typescript-eslint/no-loop-func
|
|
82
|
+
if (apiFunc) {
|
|
83
|
+
this.event.definitions.push(util_1.default.createLocation(util_1.default.pathToUri(scope.xmlFile.srcPath), apiFunc.getAttribute('name').tokens.value.range));
|
|
84
|
+
const callable = scope.getAllCallables().find((c) => c.callable.name.toLowerCase() === textToSearchFor); // eslint-disable-line @typescript-eslint/no-loop-func
|
|
85
|
+
if (callable) {
|
|
86
|
+
this.event.definitions.push(util_1.default.createLocation(util_1.default.pathToUri(callable.callable.file.srcPath), callable.callable.functionStatement.tokens.name.range));
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
// eslint-disable-next-line @typescript-eslint/dot-notation
|
|
94
|
+
let classToken = file['getTokenBefore'](token, TokenKind_1.TokenKind.Class);
|
|
95
|
+
if (classToken) {
|
|
96
|
+
let cs = file.parser.ast.findChild((klass) => (0, reflection_1.isClassStatement)(klass) && klass.tokens.class.range === classToken.range);
|
|
97
|
+
if (cs === null || cs === void 0 ? void 0 : cs.parentClassName) {
|
|
98
|
+
const nameParts = cs.parentClassName.getNameParts();
|
|
99
|
+
let extendedClass = file.getClassFileLink(nameParts[nameParts.length - 1], nameParts.slice(0, -1).join('.'));
|
|
100
|
+
if (extendedClass) {
|
|
101
|
+
this.event.definitions.push(util_1.default.createLocation(util_1.default.pathToUri(extendedClass.file.srcPath), extendedClass.item.range));
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
106
|
+
if (token.kind === TokenKind_1.TokenKind.StringLiteral) {
|
|
107
|
+
// We need to strip off the quotes but only if present
|
|
108
|
+
const startIndex = textToSearchFor.startsWith('"') ? 1 : 0;
|
|
109
|
+
let endIndex = textToSearchFor.length;
|
|
110
|
+
if (textToSearchFor.endsWith('"')) {
|
|
111
|
+
endIndex--;
|
|
112
|
+
}
|
|
113
|
+
textToSearchFor = textToSearchFor.substring(startIndex, endIndex);
|
|
114
|
+
}
|
|
115
|
+
//look through local variables first, get the function scope for this position (if it exists)
|
|
116
|
+
const functionScope = file.getFunctionScopeAtPosition(this.event.position);
|
|
117
|
+
if (functionScope) {
|
|
118
|
+
//find any variable or label with this name
|
|
119
|
+
for (const varDeclaration of functionScope.variableDeclarations) {
|
|
120
|
+
//we found a variable declaration with this token text!
|
|
121
|
+
if (varDeclaration.name.toLowerCase() === textToSearchFor) {
|
|
122
|
+
const uri = util_1.default.pathToUri(file.srcPath);
|
|
123
|
+
this.event.definitions.push(util_1.default.createLocation(uri, varDeclaration.nameRange));
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
// eslint-disable-next-line @typescript-eslint/dot-notation
|
|
127
|
+
if (file['tokenFollows'](token, TokenKind_1.TokenKind.Goto)) {
|
|
128
|
+
for (const label of functionScope.labelStatements) {
|
|
129
|
+
if (label.name.toLocaleLowerCase() === textToSearchFor) {
|
|
130
|
+
const uri = util_1.default.pathToUri(file.srcPath);
|
|
131
|
+
this.event.definitions.push(util_1.default.createLocation(uri, label.nameRange));
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
const filesSearched = new Set();
|
|
137
|
+
//look through all files in scope for matches
|
|
138
|
+
for (const scope of scopesForFile) {
|
|
139
|
+
for (const file of scope.getAllFiles()) {
|
|
140
|
+
if (!(0, reflection_1.isBrsFile)(file) || filesSearched.has(file)) {
|
|
141
|
+
continue;
|
|
142
|
+
}
|
|
143
|
+
filesSearched.add(file);
|
|
144
|
+
if ((previousToken === null || previousToken === void 0 ? void 0 : previousToken.kind) === TokenKind_1.TokenKind.Dot && file.parseMode === Parser_1.ParseMode.BrighterScript) {
|
|
145
|
+
this.event.definitions.push(...file.getClassMemberDefinitions(textToSearchFor, file));
|
|
146
|
+
const namespaceDefinition = this.brsFileGetDefinitionsForNamespace(token, file);
|
|
147
|
+
if (namespaceDefinition) {
|
|
148
|
+
this.event.definitions.push(namespaceDefinition);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
file.parser.ast.walk((0, visitors_1.createVisitor)({
|
|
152
|
+
FunctionStatement: (statement) => {
|
|
153
|
+
if (statement.getName(file.parseMode).toLowerCase() === textToSearchFor) {
|
|
154
|
+
const uri = util_1.default.pathToUri(file.srcPath);
|
|
155
|
+
this.event.definitions.push(util_1.default.createLocation(uri, statement.range));
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
}), {
|
|
159
|
+
walkMode: visitors_1.WalkMode.visitStatements
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
brsFileGetDefinitionsForNamespace(token, file) {
|
|
165
|
+
//BrightScript does not support namespaces, so return an empty list in that case
|
|
166
|
+
if (!token) {
|
|
167
|
+
return undefined;
|
|
168
|
+
}
|
|
169
|
+
let location;
|
|
170
|
+
const nameParts = this.event.file.getPartialVariableName(token, [TokenKind_1.TokenKind.New]).split('.');
|
|
171
|
+
const endName = nameParts[nameParts.length - 1].toLowerCase();
|
|
172
|
+
const namespaceName = nameParts.slice(0, -1).join('.').toLowerCase();
|
|
173
|
+
const statementHandler = (statement) => {
|
|
174
|
+
if (!location && statement.getName(Parser_1.ParseMode.BrighterScript).toLowerCase() === namespaceName) {
|
|
175
|
+
const namespaceItemStatementHandler = (statement) => {
|
|
176
|
+
if (!location && statement.tokens.name.text.toLowerCase() === endName) {
|
|
177
|
+
const uri = util_1.default.pathToUri(file.srcPath);
|
|
178
|
+
location = util_1.default.createLocation(uri, statement.range);
|
|
179
|
+
}
|
|
180
|
+
};
|
|
181
|
+
file.parser.ast.walk((0, visitors_1.createVisitor)({
|
|
182
|
+
ClassStatement: namespaceItemStatementHandler,
|
|
183
|
+
FunctionStatement: namespaceItemStatementHandler
|
|
184
|
+
}), {
|
|
185
|
+
walkMode: visitors_1.WalkMode.visitStatements
|
|
186
|
+
});
|
|
187
|
+
}
|
|
188
|
+
};
|
|
189
|
+
file.parser.ast.walk((0, visitors_1.createVisitor)({
|
|
190
|
+
NamespaceStatement: statementHandler
|
|
191
|
+
}), {
|
|
192
|
+
walkMode: visitors_1.WalkMode.visitStatements
|
|
193
|
+
});
|
|
194
|
+
return location;
|
|
195
|
+
}
|
|
196
|
+
xmlFileGetDefinition(file) {
|
|
197
|
+
//if the position is within the file's parent component name
|
|
198
|
+
if ((0, reflection_1.isXmlFile)(file) &&
|
|
199
|
+
file.parentComponent &&
|
|
200
|
+
file.parentComponentName &&
|
|
201
|
+
util_1.default.rangeContains(file.parentComponentName.range, this.event.position)) {
|
|
202
|
+
this.event.definitions.push({
|
|
203
|
+
range: util_1.default.createRange(0, 0, 0, 0),
|
|
204
|
+
uri: util_1.default.pathToUri(file.parentComponent.srcPath)
|
|
205
|
+
});
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
exports.DefinitionProvider = DefinitionProvider;
|
|
210
|
+
//# sourceMappingURL=DefinitionProvider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DefinitionProvider.js","sourceRoot":"","sources":["../../../src/bscPlugin/definition/DefinitionProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const chai_config_spec_1 = require("../../chai-config.spec");
|
|
4
|
+
const Program_1 = require("../../Program");
|
|
5
|
+
const util_1 = require("../../util");
|
|
6
|
+
let rootDir = (0, util_1.standardizePath) `${process.cwd()}/rootDir`;
|
|
7
|
+
const sinon_1 = require("sinon");
|
|
8
|
+
const DefinitionProvider_1 = require("./DefinitionProvider");
|
|
9
|
+
const vscode_uri_1 = require("vscode-uri");
|
|
10
|
+
const sinon = (0, sinon_1.createSandbox)();
|
|
11
|
+
describe('DefinitionProvider', () => {
|
|
12
|
+
let program;
|
|
13
|
+
beforeEach(() => {
|
|
14
|
+
program = new Program_1.Program({
|
|
15
|
+
rootDir: rootDir
|
|
16
|
+
});
|
|
17
|
+
sinon.restore();
|
|
18
|
+
});
|
|
19
|
+
afterEach(() => {
|
|
20
|
+
program.dispose();
|
|
21
|
+
sinon.restore();
|
|
22
|
+
});
|
|
23
|
+
it('handles unknown file type', () => {
|
|
24
|
+
const result = new DefinitionProvider_1.DefinitionProvider({
|
|
25
|
+
program: program,
|
|
26
|
+
file: undefined,
|
|
27
|
+
position: util_1.util.createPosition(1, 2),
|
|
28
|
+
definitions: []
|
|
29
|
+
}).process();
|
|
30
|
+
(0, chai_config_spec_1.expect)(result).to.eql([]);
|
|
31
|
+
});
|
|
32
|
+
it('handles callfuncs', () => {
|
|
33
|
+
const customButtonXml = program.setFile('components/CustomButton.xml', `
|
|
34
|
+
<component name="CustomButton" extends="Group">
|
|
35
|
+
<script uri="CustomButton.brs" />
|
|
36
|
+
<interface>
|
|
37
|
+
<function name="clickCustomButton" />
|
|
38
|
+
</interface>
|
|
39
|
+
</component>
|
|
40
|
+
`);
|
|
41
|
+
const customButtonBrs = program.setFile('components/CustomButton.brs', `
|
|
42
|
+
function clickCustomButton()
|
|
43
|
+
end function
|
|
44
|
+
`);
|
|
45
|
+
const brsFile = program.setFile('source/main.brs', `
|
|
46
|
+
sub main()
|
|
47
|
+
m.customButton@.clickCustomButton()
|
|
48
|
+
end sub
|
|
49
|
+
`);
|
|
50
|
+
(0, chai_config_spec_1.expect)(
|
|
51
|
+
// m.customButton@.click|CustomButon()
|
|
52
|
+
program.getDefinition(brsFile.srcPath, util_1.util.createPosition(2, 37))).to.eql([{
|
|
53
|
+
uri: vscode_uri_1.URI.file(customButtonXml.srcPath).toString(),
|
|
54
|
+
range: util_1.util.createRange(4, 36, 4, 53)
|
|
55
|
+
}, {
|
|
56
|
+
uri: vscode_uri_1.URI.file(customButtonBrs.srcPath).toString(),
|
|
57
|
+
range: util_1.util.createRange(1, 21, 1, 38)
|
|
58
|
+
}]);
|
|
59
|
+
});
|
|
60
|
+
it('handles callfuncs for xml file having no interface', () => {
|
|
61
|
+
program.setFile('components/CustomButton.xml', `
|
|
62
|
+
<component name="CustomButton" extends="Group">
|
|
63
|
+
</component>
|
|
64
|
+
`);
|
|
65
|
+
const main = program.setFile('source/main.brs', `
|
|
66
|
+
sub main()
|
|
67
|
+
m.customButton@.clickCustomButton()
|
|
68
|
+
end sub
|
|
69
|
+
`);
|
|
70
|
+
// m.customButton@.click|CustomButon()
|
|
71
|
+
(0, chai_config_spec_1.expect)(program.getDefinition(main.srcPath, util_1.util.createPosition(2, 37))).to.eql([]);
|
|
72
|
+
});
|
|
73
|
+
it('handles goto', () => {
|
|
74
|
+
const main = program.setFile('source/main.brs', `
|
|
75
|
+
sub main()
|
|
76
|
+
label1:
|
|
77
|
+
print "label1"
|
|
78
|
+
goto label1
|
|
79
|
+
end sub
|
|
80
|
+
`);
|
|
81
|
+
// goto lab|el1
|
|
82
|
+
(0, chai_config_spec_1.expect)(program.getDefinition(main.srcPath, util_1.util.createPosition(4, 24))).to.eql([{
|
|
83
|
+
uri: vscode_uri_1.URI.file(main.srcPath).toString(),
|
|
84
|
+
range: util_1.util.createRange(2, 16, 2, 22)
|
|
85
|
+
}]);
|
|
86
|
+
});
|
|
87
|
+
});
|
|
88
|
+
//# sourceMappingURL=DefinitionProvider.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DefinitionProvider.spec.js","sourceRoot":"","sources":["../../../src/bscPlugin/definition/DefinitionProvider.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ const TokenKind_1 = require("../../lexer/TokenKind");
|
|
|
7
7
|
const BrsTranspileState_1 = require("../../parser/BrsTranspileState");
|
|
8
8
|
const Parser_1 = require("../../parser/Parser");
|
|
9
9
|
const util_1 = require("../../util");
|
|
10
|
-
const SymbolTable_1 = require("../../SymbolTable");
|
|
11
10
|
const fence = (code) => util_1.default.mdFence(code, 'brightscript');
|
|
12
11
|
class HoverProcessor {
|
|
13
12
|
constructor(event) {
|
|
@@ -79,7 +78,7 @@ class HoverProcessor {
|
|
|
79
78
|
let firstToken;
|
|
80
79
|
if (extraData === null || extraData === void 0 ? void 0 : extraData.definingNode) {
|
|
81
80
|
if ((0, reflection_1.isClassStatement)(extraData.definingNode)) {
|
|
82
|
-
firstToken = extraData.definingNode.
|
|
81
|
+
firstToken = extraData.definingNode.tokens.class;
|
|
83
82
|
declarationText = (_a = firstToken === null || firstToken === void 0 ? void 0 : firstToken.text) !== null && _a !== void 0 ? _a : TokenKind_1.TokenKind.Class;
|
|
84
83
|
}
|
|
85
84
|
else if ((0, reflection_1.isInterfaceStatement)(extraData.definingNode)) {
|
|
@@ -87,7 +86,7 @@ class HoverProcessor {
|
|
|
87
86
|
declarationText = (_b = firstToken === null || firstToken === void 0 ? void 0 : firstToken.text) !== null && _b !== void 0 ? _b : TokenKind_1.TokenKind.Interface;
|
|
88
87
|
}
|
|
89
88
|
else if ((0, reflection_1.isNamespaceStatement)(extraData.definingNode)) {
|
|
90
|
-
firstToken = extraData.definingNode.
|
|
89
|
+
firstToken = extraData.definingNode.tokens.namespace;
|
|
91
90
|
exprTypeString = extraData.definingNode.getName(Parser_1.ParseMode.BrighterScript);
|
|
92
91
|
declarationText = (_c = firstToken === null || firstToken === void 0 ? void 0 : firstToken.text) !== null && _c !== void 0 ? _c : TokenKind_1.TokenKind.Namespace;
|
|
93
92
|
}
|
|
@@ -101,7 +100,16 @@ class HoverProcessor {
|
|
|
101
100
|
let result = fence(innerText);
|
|
102
101
|
return result;
|
|
103
102
|
}
|
|
103
|
+
getMemberHover(memberExpression, expressionType) {
|
|
104
|
+
var _a;
|
|
105
|
+
let nameText = `${(_a = memberExpression.parent) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript)}.${memberExpression.tokens.name.text}`;
|
|
106
|
+
let exprTypeString = expressionType.toString();
|
|
107
|
+
const innerText = `${nameText} as ${exprTypeString}`.trim();
|
|
108
|
+
let result = fence(innerText);
|
|
109
|
+
return result;
|
|
110
|
+
}
|
|
104
111
|
getBrsFileHover(file) {
|
|
112
|
+
var _a;
|
|
105
113
|
//get the token at the position
|
|
106
114
|
let token = file.getTokenAt(this.event.position);
|
|
107
115
|
if (!this.isValidTokenForHover(token)) {
|
|
@@ -127,7 +135,7 @@ class HoverProcessor {
|
|
|
127
135
|
}
|
|
128
136
|
}
|
|
129
137
|
const isInTypeExpression = util_1.default.isInTypeExpression(expression);
|
|
130
|
-
const typeFlag = isInTypeExpression ?
|
|
138
|
+
const typeFlag = isInTypeExpression ? 2 /* SymbolTypeFlag.typetime */ : 1 /* SymbolTypeFlag.runtime */;
|
|
131
139
|
const typeChain = [];
|
|
132
140
|
const extraData = {};
|
|
133
141
|
const exprType = expression.getType({ flags: typeFlag, typeChain: typeChain, data: extraData, ignoreCall: (0, reflection_1.isCallfuncExpression)(expression) });
|
|
@@ -137,11 +145,20 @@ class HoverProcessor {
|
|
|
137
145
|
const exprNameString = !processedTypeChain.containsDynamic ? fullName : token.text;
|
|
138
146
|
const useCustomTypeHover = isInTypeExpression || (expression === null || expression === void 0 ? void 0 : expression.findAncestor(reflection_1.isNewExpression));
|
|
139
147
|
let hoverContent = '';
|
|
148
|
+
let descriptionNode;
|
|
140
149
|
if (useCustomTypeHover && (0, reflection_1.isInheritableType)(exprType)) {
|
|
141
150
|
hoverContent = this.getCustomTypeHover(exprType, extraData);
|
|
142
151
|
}
|
|
152
|
+
else if ((0, reflection_1.isMemberField)(expression)) {
|
|
153
|
+
hoverContent = this.getMemberHover(expression, exprType);
|
|
154
|
+
descriptionNode = expression;
|
|
155
|
+
}
|
|
156
|
+
else if ((0, reflection_1.isEnumMemberStatement)(expression)) {
|
|
157
|
+
hoverContent = fence(`${(_a = expression.parent) === null || _a === void 0 ? void 0 : _a.name}.${expression.tokens.name.text} as ${exprType.toString()}`.trim());
|
|
158
|
+
descriptionNode = expression;
|
|
159
|
+
}
|
|
143
160
|
else if ((0, reflection_1.isNamespaceType)(exprType) ||
|
|
144
|
-
(0, reflection_1.isEnumType)(expression.getType({ flags:
|
|
161
|
+
(0, reflection_1.isEnumType)(expression.getType({ flags: 2 /* SymbolTypeFlag.typetime */ }))) {
|
|
145
162
|
hoverContent = this.getCustomTypeHover(exprType, extraData);
|
|
146
163
|
}
|
|
147
164
|
else {
|
|
@@ -153,13 +170,16 @@ class HoverProcessor {
|
|
|
153
170
|
}
|
|
154
171
|
const modifiers = [];
|
|
155
172
|
// eslint-disable-next-line no-bitwise
|
|
156
|
-
if ((extraData === null || extraData === void 0 ? void 0 : extraData.flags) && (extraData === null || extraData === void 0 ? void 0 : extraData.flags) &
|
|
173
|
+
if ((extraData === null || extraData === void 0 ? void 0 : extraData.flags) && (extraData === null || extraData === void 0 ? void 0 : extraData.flags) & 4 /* SymbolTypeFlag.optional */) {
|
|
157
174
|
modifiers.push(TokenKind_1.TokenKind.Optional);
|
|
158
175
|
}
|
|
159
176
|
if (modifiers.length > 0) {
|
|
160
|
-
hoverContent += `\n*(${modifiers.join(', ').toLowerCase()})
|
|
177
|
+
hoverContent += `\n * (${modifiers.join(', ').toLowerCase()})* `;
|
|
178
|
+
}
|
|
179
|
+
if (descriptionNode) {
|
|
180
|
+
hoverContent = this.buildContentsWithDocsFromExpression(hoverContent, descriptionNode);
|
|
161
181
|
}
|
|
162
|
-
if (extraData.description) {
|
|
182
|
+
else if (extraData.description) {
|
|
163
183
|
hoverContent = this.buildContentsWithDocsFromDescription(hoverContent, extraData.description);
|
|
164
184
|
}
|
|
165
185
|
else if (extraData.definingNode) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HoverProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/hover/HoverProcessor.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"HoverProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/hover/HoverProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ const sinon_1 = require("sinon");
|
|
|
7
7
|
const testHelpers_spec_1 = require("../../testHelpers.spec");
|
|
8
8
|
let sinon = (0, sinon_1.createSandbox)();
|
|
9
9
|
const fence = (code) => util_1.util.mdFence(code, 'brightscript');
|
|
10
|
+
const commentSep = `\n***\n`;
|
|
10
11
|
describe('HoverProcessor', () => {
|
|
11
12
|
let program;
|
|
12
13
|
beforeEach(() => {
|
|
@@ -306,7 +307,6 @@ describe('HoverProcessor', () => {
|
|
|
306
307
|
end sub
|
|
307
308
|
`);
|
|
308
309
|
program.validate();
|
|
309
|
-
let commentSep = `\n***\n`;
|
|
310
310
|
// gu|y as Person
|
|
311
311
|
let hover = program.getHover('source/main.bs', util_1.util.createPosition(7, 60))[0];
|
|
312
312
|
(0, chai_config_spec_1.expect)(hover === null || hover === void 0 ? void 0 : hover.range).to.eql(util_1.util.createRange(7, 59, 7, 62));
|
|
@@ -393,7 +393,6 @@ describe('HoverProcessor', () => {
|
|
|
393
393
|
end sub
|
|
394
394
|
`);
|
|
395
395
|
program.validate();
|
|
396
|
-
let commentSep = `\n***\n`;
|
|
397
396
|
// print lc|ase("HELLO")
|
|
398
397
|
let hover = program.getHover(mainFile.srcPath, util_1.util.createPosition(2, 29))[0];
|
|
399
398
|
(0, chai_config_spec_1.expect)(hover.contents).to.eql([`${fence('function lcase(s as string) as string')}${commentSep}Converts the string to all lower case.`]);
|
|
@@ -480,6 +479,79 @@ describe('HoverProcessor', () => {
|
|
|
480
479
|
let hover = program.getHover(file.srcPath, util_1.util.createPosition(6, 24))[0];
|
|
481
480
|
(0, chai_config_spec_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).eql([fence('myFloat as float')]);
|
|
482
481
|
});
|
|
482
|
+
it('should provide correct hover for members of classes', () => {
|
|
483
|
+
let file = program.setFile('source/main.bs', `
|
|
484
|
+
class SomeKlass
|
|
485
|
+
name as string
|
|
486
|
+
other as OtherKlass
|
|
487
|
+
myLabel as roSGNodeLabel
|
|
488
|
+
end class
|
|
489
|
+
|
|
490
|
+
class OtherKlass
|
|
491
|
+
size as integer
|
|
492
|
+
end class
|
|
493
|
+
`);
|
|
494
|
+
program.validate();
|
|
495
|
+
// na|me as string
|
|
496
|
+
let hover = program.getHover(file.srcPath, util_1.util.createPosition(2, 24))[0];
|
|
497
|
+
(0, chai_config_spec_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).eql([fence('SomeKlass.name as string')]);
|
|
498
|
+
// ot|her as OtherKlass
|
|
499
|
+
hover = program.getHover(file.srcPath, util_1.util.createPosition(3, 24))[0];
|
|
500
|
+
(0, chai_config_spec_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).eql([fence('SomeKlass.other as OtherKlass')]);
|
|
501
|
+
// my|Label as RoSGNodeLabel
|
|
502
|
+
hover = program.getHover(file.srcPath, util_1.util.createPosition(4, 24))[0];
|
|
503
|
+
(0, chai_config_spec_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).eql([fence('SomeKlass.myLabel as roSGNodeLabel')]);
|
|
504
|
+
});
|
|
505
|
+
it('should provide correct hover for members of interfaces', () => {
|
|
506
|
+
let file = program.setFile('source/main.bs', `
|
|
507
|
+
interface SomeIFace
|
|
508
|
+
name as string
|
|
509
|
+
other as OtherIFace
|
|
510
|
+
myLabel as roSGNodeLabel
|
|
511
|
+
end interface
|
|
512
|
+
|
|
513
|
+
interface OtherIFace
|
|
514
|
+
size as integer
|
|
515
|
+
end interface
|
|
516
|
+
`);
|
|
517
|
+
program.validate();
|
|
518
|
+
// na|me as string
|
|
519
|
+
let hover = program.getHover(file.srcPath, util_1.util.createPosition(2, 24))[0];
|
|
520
|
+
(0, chai_config_spec_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).eql([fence('SomeIFace.name as string')]);
|
|
521
|
+
// ot|her as OtherIFace
|
|
522
|
+
hover = program.getHover(file.srcPath, util_1.util.createPosition(3, 24))[0];
|
|
523
|
+
(0, chai_config_spec_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).eql([fence('SomeIFace.other as OtherIFace')]);
|
|
524
|
+
// my|Label as RoSGNodeLabel
|
|
525
|
+
hover = program.getHover(file.srcPath, util_1.util.createPosition(4, 24))[0];
|
|
526
|
+
(0, chai_config_spec_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).eql([fence('SomeIFace.myLabel as roSGNodeLabel')]);
|
|
527
|
+
});
|
|
528
|
+
it('should include leading trivia of member field hover', () => {
|
|
529
|
+
let file = program.setFile('source/main.bs', `
|
|
530
|
+
interface SomeIFace
|
|
531
|
+
' Some description
|
|
532
|
+
name as string
|
|
533
|
+
other as OtherIFace
|
|
534
|
+
myLabel as roSGNodeLabel
|
|
535
|
+
end interface
|
|
536
|
+
`);
|
|
537
|
+
program.validate();
|
|
538
|
+
// na|me as string
|
|
539
|
+
let hover = program.getHover(file.srcPath, util_1.util.createPosition(3, 24))[0];
|
|
540
|
+
(0, chai_config_spec_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.eql([`${fence('SomeIFace.name as string')}${commentSep}Some description`]);
|
|
541
|
+
});
|
|
542
|
+
it('should include leading trivia of enum member field hover', () => {
|
|
543
|
+
let file = program.setFile('source/main.bs', `
|
|
544
|
+
enum Direction
|
|
545
|
+
' Go Up
|
|
546
|
+
up = "up"
|
|
547
|
+
down = "down"
|
|
548
|
+
end enum
|
|
549
|
+
`);
|
|
550
|
+
program.validate();
|
|
551
|
+
// u|p = "up"
|
|
552
|
+
let hover = program.getHover(file.srcPath, util_1.util.createPosition(3, 22))[0];
|
|
553
|
+
(0, chai_config_spec_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.eql([`${fence('Direction.up as Direction')}${commentSep}Go Up`]);
|
|
554
|
+
});
|
|
483
555
|
});
|
|
484
556
|
describe('callFunc', () => {
|
|
485
557
|
it('should get hovers on @callfunc invocations', () => {
|