brighterscript 1.0.0-alpha.2 → 1.0.0-alpha.20
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 +542 -253
- package/README.md +30 -9
- package/bsconfig.schema.json +13 -1
- package/dist/BsConfig.d.ts +4 -0
- package/dist/Cache.d.ts +3 -8
- package/dist/Cache.js +9 -14
- package/dist/Cache.js.map +1 -1
- package/dist/CodeActionUtil.d.ts +11 -2
- package/dist/CodeActionUtil.js +17 -3
- package/dist/CodeActionUtil.js.map +1 -1
- package/dist/CommentFlagProcessor.d.ts +4 -4
- package/dist/CommentFlagProcessor.js +5 -3
- package/dist/CommentFlagProcessor.js.map +1 -1
- package/dist/DependencyGraph.js +5 -4
- package/dist/DependencyGraph.js.map +1 -1
- package/dist/DiagnosticFilterer.js +1 -1
- package/dist/DiagnosticFilterer.js.map +1 -1
- package/dist/DiagnosticMessages.d.ts +59 -4
- package/dist/DiagnosticMessages.js +65 -7
- package/dist/DiagnosticMessages.js.map +1 -1
- package/dist/LanguageServer.d.ts +4 -14
- package/dist/LanguageServer.js +40 -26
- package/dist/LanguageServer.js.map +1 -1
- package/dist/Logger.d.ts +2 -0
- package/dist/Logger.js +10 -8
- package/dist/Logger.js.map +1 -1
- package/dist/PluginInterface.d.ts +7 -3
- package/dist/PluginInterface.js +9 -0
- package/dist/PluginInterface.js.map +1 -1
- package/dist/Program.d.ts +43 -25
- package/dist/Program.js +180 -82
- package/dist/Program.js.map +1 -1
- package/dist/ProgramBuilder.d.ts +4 -0
- package/dist/ProgramBuilder.js +30 -14
- package/dist/ProgramBuilder.js.map +1 -1
- package/dist/Scope.d.ts +100 -28
- package/dist/Scope.js +382 -154
- package/dist/Scope.js.map +1 -1
- package/dist/SemanticTokenUtils.d.ts +14 -0
- package/dist/SemanticTokenUtils.js +81 -0
- package/dist/SemanticTokenUtils.js.map +1 -0
- package/dist/SymbolTable.d.ts +10 -4
- package/dist/SymbolTable.js +40 -13
- package/dist/SymbolTable.js.map +1 -1
- package/dist/XmlScope.d.ts +8 -3
- package/dist/XmlScope.js +65 -27
- package/dist/XmlScope.js.map +1 -1
- package/dist/astUtils/AstEditor.d.ts +33 -0
- package/dist/astUtils/AstEditor.js +107 -0
- package/dist/astUtils/AstEditor.js.map +1 -0
- package/dist/{types/FunctionType.spec.d.ts → astUtils/AstEditor.spec.d.ts} +0 -0
- package/dist/astUtils/AstEditor.spec.js +170 -0
- package/dist/astUtils/AstEditor.spec.js.map +1 -0
- package/dist/astUtils/creators.d.ts +24 -6
- package/dist/astUtils/creators.js +130 -19
- package/dist/astUtils/creators.js.map +1 -1
- package/dist/astUtils/creators.spec.js +14 -4
- package/dist/astUtils/creators.spec.js.map +1 -1
- package/dist/astUtils/reflection.d.ts +27 -8
- package/dist/astUtils/reflection.js +66 -1
- package/dist/astUtils/reflection.js.map +1 -1
- package/dist/astUtils/reflection.spec.js +130 -119
- package/dist/astUtils/reflection.spec.js.map +1 -1
- package/dist/astUtils/stackedVisitor.js.map +1 -1
- package/dist/astUtils/stackedVisitor.spec.js +13 -13
- package/dist/astUtils/stackedVisitor.spec.js.map +1 -1
- package/dist/astUtils/visitors.d.ts +17 -2
- package/dist/astUtils/visitors.js +2 -2
- package/dist/astUtils/visitors.js.map +1 -1
- package/dist/astUtils/visitors.spec.js +31 -29
- package/dist/astUtils/visitors.spec.js.map +1 -1
- package/dist/astUtils/xml.d.ts +4 -3
- package/dist/astUtils/xml.js +8 -3
- package/dist/astUtils/xml.js.map +1 -1
- package/dist/bscPlugin/BscPlugin.d.ts +7 -1
- package/dist/bscPlugin/BscPlugin.js +28 -0
- package/dist/bscPlugin/BscPlugin.js.map +1 -1
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.js +4 -4
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.js.map +1 -1
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.spec.js +26 -26
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.d.ts +9 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js +97 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js.map +1 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.d.ts +1 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.js +73 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.js.map +1 -0
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.d.ts +8 -0
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.js +52 -0
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.js.map +1 -0
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.spec.d.ts +1 -0
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.spec.js +32 -0
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.spec.js.map +1 -0
- package/dist/bscPlugin/validation/BrsFileValidator.d.ts +9 -0
- package/dist/bscPlugin/validation/BrsFileValidator.js +66 -0
- package/dist/bscPlugin/validation/BrsFileValidator.js.map +1 -0
- package/dist/bscPlugin/validation/ScopeValidator.d.ts +29 -0
- package/dist/bscPlugin/validation/ScopeValidator.js +183 -0
- package/dist/bscPlugin/validation/ScopeValidator.js.map +1 -0
- package/dist/cli.js +9 -3
- package/dist/cli.js.map +1 -1
- package/dist/diagnosticUtils.d.ts +1 -0
- package/dist/diagnosticUtils.js +15 -8
- package/dist/diagnosticUtils.js.map +1 -1
- package/dist/examples/plugins/removePrint.js +12 -14
- package/dist/examples/plugins/removePrint.js.map +1 -1
- package/dist/files/BrsFile.Class.spec.js +634 -145
- package/dist/files/BrsFile.Class.spec.js.map +1 -1
- package/dist/files/BrsFile.d.ts +62 -30
- package/dist/files/BrsFile.js +683 -335
- package/dist/files/BrsFile.js.map +1 -1
- package/dist/files/BrsFile.spec.js +1055 -449
- package/dist/files/BrsFile.spec.js.map +1 -1
- package/dist/files/XmlFile.d.ts +11 -10
- package/dist/files/XmlFile.js +33 -26
- package/dist/files/XmlFile.js.map +1 -1
- package/dist/files/XmlFile.spec.js +302 -237
- package/dist/files/XmlFile.spec.js.map +1 -1
- package/dist/files/tests/imports.spec.js +44 -42
- package/dist/files/tests/imports.spec.js.map +1 -1
- package/dist/files/tests/optionalChaning.spec.d.ts +1 -0
- package/dist/files/tests/optionalChaning.spec.js +88 -0
- package/dist/files/tests/optionalChaning.spec.js.map +1 -0
- package/dist/globalCallables.d.ts +3 -1
- package/dist/globalCallables.js +424 -152
- package/dist/globalCallables.js.map +1 -1
- package/dist/index.d.ts +13 -3
- package/dist/index.js +23 -4
- package/dist/index.js.map +1 -1
- package/dist/interfaces.d.ts +129 -16
- package/dist/lexer/Lexer.d.ts +19 -1
- package/dist/lexer/Lexer.js +127 -21
- package/dist/lexer/Lexer.js.map +1 -1
- package/dist/lexer/Lexer.spec.js +657 -536
- package/dist/lexer/Lexer.spec.js.map +1 -1
- package/dist/lexer/Token.d.ts +2 -2
- package/dist/lexer/TokenKind.d.ts +13 -1
- package/dist/lexer/TokenKind.js +60 -3
- package/dist/lexer/TokenKind.js.map +1 -1
- package/dist/parser/BrsTranspileState.d.ts +7 -0
- package/dist/parser/BrsTranspileState.js +9 -0
- package/dist/parser/BrsTranspileState.js.map +1 -1
- package/dist/parser/Expression.d.ts +150 -34
- package/dist/parser/Expression.js +337 -150
- package/dist/parser/Expression.js.map +1 -1
- package/dist/parser/Parser.Class.spec.js +189 -89
- package/dist/parser/Parser.Class.spec.js.map +1 -1
- package/dist/parser/Parser.d.ts +152 -29
- package/dist/parser/Parser.js +1095 -501
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/Parser.spec.js +687 -266
- package/dist/parser/Parser.spec.js.map +1 -1
- package/dist/parser/SGParser.d.ts +41 -4
- package/dist/parser/SGParser.js +186 -175
- package/dist/parser/SGParser.js.map +1 -1
- package/dist/parser/SGParser.spec.js +35 -22
- package/dist/parser/SGParser.spec.js.map +1 -1
- package/dist/parser/SGTypes.d.ts +206 -38
- package/dist/parser/SGTypes.js +470 -161
- package/dist/parser/SGTypes.js.map +1 -1
- package/dist/parser/SGTypes.spec.d.ts +1 -0
- package/dist/parser/SGTypes.spec.js +351 -0
- package/dist/parser/SGTypes.spec.js.map +1 -0
- package/dist/parser/Statement.d.ts +194 -40
- package/dist/parser/Statement.js +597 -160
- package/dist/parser/Statement.js.map +1 -1
- package/dist/parser/Statement.spec.js +11 -11
- package/dist/parser/Statement.spec.js.map +1 -1
- package/dist/parser/TranspileState.d.ts +1 -1
- package/dist/parser/TranspileState.js +15 -7
- package/dist/parser/TranspileState.js.map +1 -1
- package/dist/parser/tests/Parser.spec.d.ts +10 -9
- package/dist/parser/tests/Parser.spec.js +15 -11
- package/dist/parser/tests/Parser.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/For.spec.js +60 -60
- package/dist/parser/tests/controlFlow/For.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/ForEach.spec.js +40 -39
- package/dist/parser/tests/controlFlow/ForEach.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/If.spec.js +213 -194
- package/dist/parser/tests/controlFlow/If.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/While.spec.js +37 -37
- package/dist/parser/tests/controlFlow/While.spec.js.map +1 -1
- package/dist/parser/tests/expression/Additive.spec.js +30 -30
- package/dist/parser/tests/expression/Additive.spec.js.map +1 -1
- package/dist/parser/tests/expression/ArrayLiterals.spec.js +119 -119
- package/dist/parser/tests/expression/ArrayLiterals.spec.js.map +1 -1
- package/dist/parser/tests/expression/AssociativeArrayLiterals.spec.js +162 -138
- package/dist/parser/tests/expression/AssociativeArrayLiterals.spec.js.map +1 -1
- package/dist/parser/tests/expression/Boolean.spec.js +24 -24
- package/dist/parser/tests/expression/Boolean.spec.js.map +1 -1
- package/dist/parser/tests/expression/Call.spec.js +41 -40
- package/dist/parser/tests/expression/Call.spec.js.map +1 -1
- package/dist/parser/tests/expression/Exponential.spec.js +17 -17
- package/dist/parser/tests/expression/Exponential.spec.js.map +1 -1
- package/dist/parser/tests/expression/Function.spec.js +256 -256
- package/dist/parser/tests/expression/Function.spec.js.map +1 -1
- package/dist/parser/tests/expression/Indexing.spec.js +87 -87
- package/dist/parser/tests/expression/Indexing.spec.js.map +1 -1
- package/dist/parser/tests/expression/Multiplicative.spec.js +37 -37
- package/dist/parser/tests/expression/Multiplicative.spec.js.map +1 -1
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js +75 -63
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/PrefixUnary.spec.js +41 -41
- package/dist/parser/tests/expression/PrefixUnary.spec.js.map +1 -1
- package/dist/parser/tests/expression/Primary.spec.js +41 -41
- package/dist/parser/tests/expression/Primary.spec.js.map +1 -1
- package/dist/parser/tests/expression/RegexLiteralExpression.spec.d.ts +1 -0
- package/dist/parser/tests/expression/RegexLiteralExpression.spec.js +171 -0
- package/dist/parser/tests/expression/RegexLiteralExpression.spec.js.map +1 -0
- package/dist/parser/tests/expression/Relational.spec.js +43 -43
- package/dist/parser/tests/expression/Relational.spec.js.map +1 -1
- package/dist/parser/tests/expression/SourceLiteralExpression.spec.js +9 -9
- package/dist/parser/tests/expression/SourceLiteralExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/TemplateStringExpression.spec.js +28 -28
- package/dist/parser/tests/expression/TemplateStringExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/TernaryExpression.spec.js +102 -102
- package/dist/parser/tests/expression/TernaryExpression.spec.js.map +1 -1
- package/dist/parser/tests/statement/AssignmentOperators.spec.js +36 -36
- package/dist/parser/tests/statement/AssignmentOperators.spec.js.map +1 -1
- package/dist/parser/tests/statement/Declaration.spec.js +44 -44
- package/dist/parser/tests/statement/Declaration.spec.js.map +1 -1
- package/dist/parser/tests/statement/Dim.spec.js +21 -21
- package/dist/parser/tests/statement/Dim.spec.js.map +1 -1
- package/dist/parser/tests/statement/Enum.spec.d.ts +1 -0
- package/dist/parser/tests/statement/Enum.spec.js +840 -0
- package/dist/parser/tests/statement/Enum.spec.js.map +1 -0
- package/dist/parser/tests/statement/For.spec.d.ts +1 -0
- package/dist/parser/tests/statement/For.spec.js +46 -0
- package/dist/parser/tests/statement/For.spec.js.map +1 -0
- package/dist/parser/tests/statement/ForEach.spec.d.ts +1 -0
- package/dist/parser/tests/statement/ForEach.spec.js +37 -0
- package/dist/parser/tests/statement/ForEach.spec.js.map +1 -0
- package/dist/parser/tests/statement/Function.spec.js +198 -197
- package/dist/parser/tests/statement/Function.spec.js.map +1 -1
- package/dist/parser/tests/statement/Goto.spec.js +15 -14
- package/dist/parser/tests/statement/Goto.spec.js.map +1 -1
- package/dist/parser/tests/statement/Increment.spec.js +50 -50
- package/dist/parser/tests/statement/Increment.spec.js.map +1 -1
- package/dist/parser/tests/statement/InterfaceStatement.spec.d.ts +1 -0
- package/dist/parser/tests/statement/InterfaceStatement.spec.js +254 -0
- package/dist/parser/tests/statement/InterfaceStatement.spec.js.map +1 -0
- package/dist/parser/tests/statement/LibraryStatement.spec.js +17 -17
- package/dist/parser/tests/statement/LibraryStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/Misc.spec.js +108 -106
- package/dist/parser/tests/statement/Misc.spec.js.map +1 -1
- package/dist/parser/tests/statement/PrintStatement.spec.js +40 -40
- package/dist/parser/tests/statement/PrintStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/ReturnStatement.spec.js +46 -46
- package/dist/parser/tests/statement/ReturnStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/Set.spec.js +83 -83
- package/dist/parser/tests/statement/Set.spec.js.map +1 -1
- package/dist/parser/tests/statement/Stop.spec.js +12 -11
- package/dist/parser/tests/statement/Stop.spec.js.map +1 -1
- package/dist/parser/tests/statement/Throw.spec.js +5 -5
- package/dist/parser/tests/statement/Throw.spec.js.map +1 -1
- package/dist/parser/tests/statement/TryCatch.spec.js +15 -13
- package/dist/parser/tests/statement/TryCatch.spec.js.map +1 -1
- package/dist/preprocessor/Chunk.d.ts +1 -1
- package/dist/preprocessor/Chunk.js.map +1 -1
- package/dist/preprocessor/Manifest.d.ts +5 -5
- package/dist/preprocessor/Manifest.js +14 -35
- package/dist/preprocessor/Manifest.js.map +1 -1
- package/dist/preprocessor/Manifest.spec.d.ts +1 -0
- package/dist/preprocessor/Manifest.spec.js +78 -103
- package/dist/preprocessor/Manifest.spec.js.map +1 -1
- package/dist/preprocessor/Preprocessor.d.ts +1 -1
- package/dist/preprocessor/Preprocessor.js +8 -8
- package/dist/preprocessor/Preprocessor.js.map +1 -1
- package/dist/preprocessor/Preprocessor.spec.js +49 -49
- package/dist/preprocessor/Preprocessor.spec.js.map +1 -1
- package/dist/preprocessor/PreprocessorParser.spec.js +72 -72
- package/dist/preprocessor/PreprocessorParser.spec.js.map +1 -1
- package/dist/roku-types/data.json +21891 -0
- package/dist/roku-types/index.d.ts +6776 -0
- package/dist/roku-types/index.js +11 -0
- package/dist/roku-types/index.js.map +1 -0
- package/dist/types/ArrayType.d.ts +8 -5
- package/dist/types/ArrayType.js +52 -12
- package/dist/types/ArrayType.js.map +1 -1
- package/dist/types/ArrayType.spec.js +72 -11
- package/dist/types/ArrayType.spec.js.map +1 -1
- package/dist/types/BooleanType.d.ts +4 -2
- package/dist/types/BooleanType.js +9 -4
- package/dist/types/BooleanType.js.map +1 -1
- package/dist/types/BooleanType.spec.js +5 -3
- package/dist/types/BooleanType.spec.js.map +1 -1
- package/dist/types/BscType.d.ts +20 -5
- package/dist/types/BscType.js +24 -0
- package/dist/types/BscType.js.map +1 -1
- package/dist/types/CustomType.d.ts +8 -6
- package/dist/types/CustomType.js +20 -11
- package/dist/types/CustomType.js.map +1 -1
- package/dist/types/DoubleType.d.ts +2 -0
- package/dist/types/DoubleType.js +14 -9
- package/dist/types/DoubleType.js.map +1 -1
- package/dist/types/DoubleType.spec.js +5 -3
- package/dist/types/DoubleType.spec.js.map +1 -1
- package/dist/types/DynamicType.d.ts +2 -0
- package/dist/types/DynamicType.js +6 -2
- package/dist/types/DynamicType.js.map +1 -1
- package/dist/types/DynamicType.spec.js +2 -2
- package/dist/types/DynamicType.spec.js.map +1 -1
- package/dist/types/FloatType.d.ts +2 -0
- package/dist/types/FloatType.js +14 -9
- package/dist/types/FloatType.js.map +1 -1
- package/dist/types/FloatType.spec.js +4 -2
- package/dist/types/FloatType.spec.js.map +1 -1
- package/dist/types/FunctionType.d.ts +7 -31
- package/dist/types/FunctionType.js +11 -57
- package/dist/types/FunctionType.js.map +1 -1
- package/dist/types/IntegerType.d.ts +2 -0
- package/dist/types/IntegerType.js +14 -9
- package/dist/types/IntegerType.js.map +1 -1
- package/dist/types/IntegerType.spec.js +5 -3
- package/dist/types/IntegerType.spec.js.map +1 -1
- package/dist/types/InterfaceType.d.ts +13 -4
- package/dist/types/InterfaceType.js +48 -8
- package/dist/types/InterfaceType.js.map +1 -1
- package/dist/types/InterfaceType.spec.d.ts +1 -0
- package/dist/types/InterfaceType.spec.js +194 -0
- package/dist/types/InterfaceType.spec.js.map +1 -0
- package/dist/types/InvalidType.d.ts +4 -2
- package/dist/types/InvalidType.js +10 -5
- package/dist/types/InvalidType.js.map +1 -1
- package/dist/types/InvalidType.spec.js +4 -2
- package/dist/types/InvalidType.spec.js.map +1 -1
- package/dist/types/LazyType.d.ts +8 -7
- package/dist/types/LazyType.js +22 -10
- package/dist/types/LazyType.js.map +1 -1
- package/dist/types/LongIntegerType.d.ts +2 -0
- package/dist/types/LongIntegerType.js +14 -9
- package/dist/types/LongIntegerType.js.map +1 -1
- package/dist/types/LongIntegerType.spec.js +4 -2
- package/dist/types/LongIntegerType.spec.js.map +1 -1
- package/dist/types/ObjectType.d.ts +8 -4
- package/dist/types/ObjectType.js +9 -4
- package/dist/types/ObjectType.js.map +1 -1
- package/dist/types/ObjectType.spec.js +2 -2
- package/dist/types/ObjectType.spec.js.map +1 -1
- package/dist/types/StringType.d.ts +4 -2
- package/dist/types/StringType.js +9 -4
- package/dist/types/StringType.js.map +1 -1
- package/dist/types/StringType.spec.js +4 -2
- package/dist/types/StringType.spec.js.map +1 -1
- package/dist/types/TypedFunctionType.d.ts +28 -0
- package/dist/types/TypedFunctionType.js +88 -0
- package/dist/types/TypedFunctionType.js.map +1 -0
- package/dist/types/TypedFunctionType.spec.d.ts +1 -0
- package/dist/types/TypedFunctionType.spec.js +37 -0
- package/dist/types/TypedFunctionType.spec.js.map +1 -0
- package/dist/types/UninitializedType.js +3 -3
- package/dist/types/UninitializedType.js.map +1 -1
- package/dist/types/VoidType.d.ts +4 -2
- package/dist/types/VoidType.js +8 -4
- package/dist/types/VoidType.js.map +1 -1
- package/dist/types/VoidType.spec.js +2 -2
- package/dist/types/VoidType.spec.js.map +1 -1
- package/dist/types/helpers.d.ts +42 -0
- package/dist/types/helpers.js +118 -0
- package/dist/types/helpers.js.map +1 -0
- package/dist/util.d.ts +87 -16
- package/dist/util.js +339 -94
- package/dist/util.js.map +1 -1
- package/dist/validators/ClassValidator.d.ts +19 -2
- package/dist/validators/ClassValidator.js +163 -102
- package/dist/validators/ClassValidator.js.map +1 -1
- package/package.json +26 -15
- package/dist/astUtils/index.d.ts +0 -7
- package/dist/astUtils/index.js +0 -26
- package/dist/astUtils/index.js.map +0 -1
- package/dist/lexer/index.d.ts +0 -3
- package/dist/lexer/index.js +0 -17
- package/dist/lexer/index.js.map +0 -1
- package/dist/parser/index.d.ts +0 -3
- package/dist/parser/index.js +0 -16
- package/dist/parser/index.js.map +0 -1
- package/dist/preprocessor/index.d.ts +0 -3
- package/dist/preprocessor/index.js +0 -16
- package/dist/preprocessor/index.js.map +0 -1
- package/dist/types/FunctionType.spec.js +0 -23
- package/dist/types/FunctionType.spec.js.map +0 -1
|
@@ -5,7 +5,7 @@ const vscode_uri_1 = require("vscode-uri");
|
|
|
5
5
|
const Program_1 = require("../../Program");
|
|
6
6
|
const testHelpers_spec_1 = require("../../testHelpers.spec");
|
|
7
7
|
const util_1 = require("../../util");
|
|
8
|
-
const rootDir = util_1.standardizePath `${process.cwd()}/.tmp/rootDir`;
|
|
8
|
+
const rootDir = (0, util_1.standardizePath) `${process.cwd()}/.tmp/rootDir`;
|
|
9
9
|
describe('CodeActionsProcessor', () => {
|
|
10
10
|
let program;
|
|
11
11
|
beforeEach(() => {
|
|
@@ -18,13 +18,13 @@ describe('CodeActionsProcessor', () => {
|
|
|
18
18
|
});
|
|
19
19
|
describe('getCodeActions', () => {
|
|
20
20
|
it('suggests `extends=Group`', () => {
|
|
21
|
-
const file = program.
|
|
21
|
+
const file = program.setFile('components/comp1.xml', (0, testHelpers_spec_1.trim) `
|
|
22
22
|
<?xml version="1.0" encoding="utf-8" ?>
|
|
23
23
|
<component name="comp1">
|
|
24
24
|
</component>
|
|
25
25
|
`);
|
|
26
26
|
program.validate();
|
|
27
|
-
testHelpers_spec_1.expectCodeActions(() => {
|
|
27
|
+
(0, testHelpers_spec_1.expectCodeActions)(() => {
|
|
28
28
|
program.getCodeActions(file.srcPath,
|
|
29
29
|
//<comp|onent name="comp1">
|
|
30
30
|
util_1.util.createRange(1, 5, 1, 5));
|
|
@@ -33,7 +33,7 @@ describe('CodeActionsProcessor', () => {
|
|
|
33
33
|
isPreferred: true,
|
|
34
34
|
kind: 'quickfix',
|
|
35
35
|
changes: [{
|
|
36
|
-
filePath: util_1.standardizePath `${rootDir}/components/comp1.xml`,
|
|
36
|
+
filePath: (0, util_1.standardizePath) `${rootDir}/components/comp1.xml`,
|
|
37
37
|
newText: ' extends="Group"',
|
|
38
38
|
type: 'insert',
|
|
39
39
|
//<component name="comp1"|>
|
|
@@ -43,7 +43,7 @@ describe('CodeActionsProcessor', () => {
|
|
|
43
43
|
title: `Extend "Task"`,
|
|
44
44
|
kind: 'quickfix',
|
|
45
45
|
changes: [{
|
|
46
|
-
filePath: util_1.standardizePath `${rootDir}/components/comp1.xml`,
|
|
46
|
+
filePath: (0, util_1.standardizePath) `${rootDir}/components/comp1.xml`,
|
|
47
47
|
newText: ' extends="Task"',
|
|
48
48
|
type: 'insert',
|
|
49
49
|
//<component name="comp1"|>
|
|
@@ -53,7 +53,7 @@ describe('CodeActionsProcessor', () => {
|
|
|
53
53
|
title: `Extend "ContentNode"`,
|
|
54
54
|
kind: 'quickfix',
|
|
55
55
|
changes: [{
|
|
56
|
-
filePath: util_1.standardizePath `${rootDir}/components/comp1.xml`,
|
|
56
|
+
filePath: (0, util_1.standardizePath) `${rootDir}/components/comp1.xml`,
|
|
57
57
|
newText: ' extends="ContentNode"',
|
|
58
58
|
type: 'insert',
|
|
59
59
|
//<component name="comp1"|>
|
|
@@ -62,7 +62,7 @@ describe('CodeActionsProcessor', () => {
|
|
|
62
62
|
}]);
|
|
63
63
|
});
|
|
64
64
|
it('adds attribute at end of component with multiple attributes`', () => {
|
|
65
|
-
const file = program.
|
|
65
|
+
const file = program.setFile('components/comp1.xml', (0, testHelpers_spec_1.trim) `
|
|
66
66
|
<?xml version="1.0" encoding="utf-8" ?>
|
|
67
67
|
<component name="comp1" attr2="attr3" attr3="attr3">
|
|
68
68
|
</component>
|
|
@@ -71,32 +71,32 @@ describe('CodeActionsProcessor', () => {
|
|
|
71
71
|
const codeActions = program.getCodeActions(file.srcPath,
|
|
72
72
|
//<comp|onent name="comp1">
|
|
73
73
|
util_1.util.createRange(1, 5, 1, 5));
|
|
74
|
-
chai_1.expect(codeActions[0].edit.changes[vscode_uri_1.URI.file(util_1.standardizePath `${rootDir}/components/comp1.xml`).toString()][0].range).to.eql(util_1.util.createRange(1, 51, 1, 51));
|
|
74
|
+
(0, chai_1.expect)(codeActions[0].edit.changes[vscode_uri_1.URI.file((0, util_1.standardizePath) `${rootDir}/components/comp1.xml`).toString()][0].range).to.eql(util_1.util.createRange(1, 51, 1, 51));
|
|
75
75
|
});
|
|
76
76
|
it('does not produce duplicate code actions for bs imports', () => {
|
|
77
77
|
//define the function in two files
|
|
78
|
-
program.
|
|
78
|
+
program.setFile('components/lib1.brs', `
|
|
79
79
|
sub doSomething()
|
|
80
80
|
end sub
|
|
81
81
|
`);
|
|
82
|
-
program.
|
|
82
|
+
program.setFile('components/lib2.brs', `
|
|
83
83
|
sub doSomething()
|
|
84
84
|
end sub
|
|
85
85
|
`);
|
|
86
86
|
//use the function in this file
|
|
87
|
-
const componentCommonFile = program.
|
|
87
|
+
const componentCommonFile = program.setFile('components/ComponentCommon.bs', `
|
|
88
88
|
sub init()
|
|
89
89
|
doSomething()
|
|
90
90
|
end sub
|
|
91
91
|
`);
|
|
92
92
|
//import the file in two scopes
|
|
93
|
-
program.
|
|
93
|
+
program.setFile('components/comp1.xml', (0, testHelpers_spec_1.trim) `
|
|
94
94
|
<?xml version="1.0" encoding="utf-8" ?>
|
|
95
95
|
<component name="ChildScene">
|
|
96
96
|
<script uri="ComponentCommon.bs" />
|
|
97
97
|
</component>
|
|
98
98
|
`);
|
|
99
|
-
program.
|
|
99
|
+
program.setFile('components/comp2.xml', (0, testHelpers_spec_1.trim) `
|
|
100
100
|
<?xml version="1.0" encoding="utf-8" ?>
|
|
101
101
|
<component name="ChildScene">
|
|
102
102
|
<script uri="ComponentCommon.bs" />
|
|
@@ -107,27 +107,27 @@ describe('CodeActionsProcessor', () => {
|
|
|
107
107
|
const codeActions = program.getCodeActions(componentCommonFile.srcPath,
|
|
108
108
|
// doSome|thing()
|
|
109
109
|
util_1.util.createRange(2, 22, 2, 22));
|
|
110
|
-
chai_1.expect(codeActions.map(x => x.title).sort()).to.eql([
|
|
110
|
+
(0, chai_1.expect)(codeActions.map(x => x.title).sort()).to.eql([
|
|
111
111
|
`import "pkg:/components/lib1.brs"`,
|
|
112
112
|
`import "pkg:/components/lib2.brs"`
|
|
113
113
|
]);
|
|
114
114
|
});
|
|
115
115
|
it('does not suggest imports for brs files', () => {
|
|
116
116
|
//import the file in two scopes
|
|
117
|
-
program.
|
|
117
|
+
program.setFile('components/comp1.xml', (0, testHelpers_spec_1.trim) `
|
|
118
118
|
<?xml version="1.0" encoding="utf-8" ?>
|
|
119
119
|
<component name="ChildScene">
|
|
120
120
|
<script uri="comp1.brs" />
|
|
121
121
|
</component>
|
|
122
122
|
`);
|
|
123
123
|
//import the function here
|
|
124
|
-
const file = program.
|
|
124
|
+
const file = program.setFile('components/comp1.brs', `
|
|
125
125
|
sub init()
|
|
126
126
|
DoSomething()
|
|
127
127
|
end sub
|
|
128
128
|
`);
|
|
129
129
|
//define the function here
|
|
130
|
-
program.
|
|
130
|
+
program.setFile('source/lib.brs', `
|
|
131
131
|
sub DoSomething()
|
|
132
132
|
end sub
|
|
133
133
|
`);
|
|
@@ -136,27 +136,27 @@ describe('CodeActionsProcessor', () => {
|
|
|
136
136
|
const codeActions = program.getCodeActions(file.srcPath,
|
|
137
137
|
// DoSometh|ing()
|
|
138
138
|
util_1.util.createRange(2, 28, 2, 28));
|
|
139
|
-
chai_1.expect(codeActions).to.be.empty;
|
|
139
|
+
(0, chai_1.expect)(codeActions).to.be.empty;
|
|
140
140
|
});
|
|
141
141
|
it('suggests class imports', () => {
|
|
142
142
|
//import the file in two scopes
|
|
143
|
-
program.
|
|
143
|
+
program.setFile('components/comp1.xml', (0, testHelpers_spec_1.trim) `
|
|
144
144
|
<?xml version="1.0" encoding="utf-8" ?>
|
|
145
145
|
<component name="ChildScene">
|
|
146
146
|
<script uri="comp1.bs" />
|
|
147
147
|
</component>
|
|
148
148
|
`);
|
|
149
|
-
const file = program.
|
|
149
|
+
const file = program.setFile('components/comp1.bs', `
|
|
150
150
|
sub init()
|
|
151
151
|
dude = new Person()
|
|
152
152
|
end sub
|
|
153
153
|
`);
|
|
154
|
-
program.
|
|
154
|
+
program.setFile('source/Person.bs', `
|
|
155
155
|
class Person
|
|
156
156
|
end class
|
|
157
157
|
`);
|
|
158
158
|
program.validate();
|
|
159
|
-
chai_1.expect(program.getCodeActions(file.srcPath,
|
|
159
|
+
(0, chai_1.expect)(program.getCodeActions(file.srcPath,
|
|
160
160
|
// new Per|son()
|
|
161
161
|
util_1.util.createRange(2, 34, 2, 34)).map(x => x.title).sort()).to.eql([
|
|
162
162
|
`import "pkg:/source/Person.bs"`
|
|
@@ -164,26 +164,26 @@ describe('CodeActionsProcessor', () => {
|
|
|
164
164
|
});
|
|
165
165
|
it('suggests class imports', () => {
|
|
166
166
|
//import the file in two scopes
|
|
167
|
-
program.
|
|
167
|
+
program.setFile('components/comp1.xml', (0, testHelpers_spec_1.trim) `
|
|
168
168
|
<?xml version="1.0" encoding="utf-8" ?>
|
|
169
169
|
<component name="ChildScene">
|
|
170
170
|
<script uri="comp1.bs" />
|
|
171
171
|
</component>
|
|
172
172
|
`);
|
|
173
173
|
//import the function here
|
|
174
|
-
const file = program.
|
|
174
|
+
const file = program.setFile('components/comp1.bs', `
|
|
175
175
|
sub init()
|
|
176
176
|
kitty = new Animals.Cat()
|
|
177
177
|
end sub
|
|
178
178
|
`);
|
|
179
|
-
program.
|
|
179
|
+
program.setFile('source/Animals.bs', `
|
|
180
180
|
namespace Animals
|
|
181
181
|
class Cat
|
|
182
182
|
end class
|
|
183
183
|
end namespace
|
|
184
184
|
`);
|
|
185
185
|
program.validate();
|
|
186
|
-
chai_1.expect(program.getCodeActions(file.srcPath,
|
|
186
|
+
(0, chai_1.expect)(program.getCodeActions(file.srcPath,
|
|
187
187
|
// new Anim|als.Cat()
|
|
188
188
|
util_1.util.createRange(2, 36, 2, 36)).map(x => x.title).sort()).to.eql([
|
|
189
189
|
`import "pkg:/source/Animals.bs"`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodeActionsProcessor.spec.js","sourceRoot":"","sources":["../../../src/bscPlugin/codeActions/CodeActionsProcessor.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,2CAAiC;AACjC,2CAAwC;AACxC,6DAAiE;AACjE,qCAAwD;AAExD,MAAM,OAAO,GAAG,sBAAC,
|
|
1
|
+
{"version":3,"file":"CodeActionsProcessor.spec.js","sourceRoot":"","sources":["../../../src/bscPlugin/codeActions/CodeActionsProcessor.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { BrsFile } from '../../files/BrsFile';
|
|
2
|
+
import type { OnGetSemanticTokensEvent } from '../../interfaces';
|
|
3
|
+
export declare class BrsFileSemanticTokensProcessor {
|
|
4
|
+
event: OnGetSemanticTokensEvent<BrsFile>;
|
|
5
|
+
constructor(event: OnGetSemanticTokensEvent<BrsFile>);
|
|
6
|
+
process(): void;
|
|
7
|
+
private handleClasses;
|
|
8
|
+
private handleEnums;
|
|
9
|
+
}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.BrsFileSemanticTokensProcessor = void 0;
|
|
4
|
+
const vscode_languageserver_protocol_1 = require("vscode-languageserver-protocol");
|
|
5
|
+
const reflection_1 = require("../../astUtils/reflection");
|
|
6
|
+
const Parser_1 = require("../../parser/Parser");
|
|
7
|
+
const util_1 = require("../../util");
|
|
8
|
+
class BrsFileSemanticTokensProcessor {
|
|
9
|
+
constructor(event) {
|
|
10
|
+
this.event = event;
|
|
11
|
+
}
|
|
12
|
+
process() {
|
|
13
|
+
this.handleClasses();
|
|
14
|
+
this.handleEnums();
|
|
15
|
+
}
|
|
16
|
+
handleClasses() {
|
|
17
|
+
var _a, _b;
|
|
18
|
+
const classes = [];
|
|
19
|
+
//classes used in function param types
|
|
20
|
+
for (const func of this.event.file.parser.references.functionExpressions) {
|
|
21
|
+
for (const parm of func.parameters) {
|
|
22
|
+
if ((0, reflection_1.isCustomType)(parm.type)) {
|
|
23
|
+
classes.push({
|
|
24
|
+
className: parm.type.getText(),
|
|
25
|
+
namespaceName: (_a = parm.namespaceName) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript),
|
|
26
|
+
range: parm.type.range
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
}
|
|
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
|
+
for (const cls of classes) {
|
|
40
|
+
if (cls.className.length > 0 &&
|
|
41
|
+
//only highlight classes that are in scope
|
|
42
|
+
this.event.scopes.some(x => x.hasClass(cls.className, cls.namespaceName))) {
|
|
43
|
+
const tokens = util_1.default.splitGetRange('.', cls.className, cls.range);
|
|
44
|
+
//namespace parts (skip the final array entry)
|
|
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
|
+
});
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
handleEnums() {
|
|
61
|
+
var _a, _b, _c;
|
|
62
|
+
const enumLookup = (_a = this.event.file.program.getFirstScopeForFile(this.event.file)) === null || _a === void 0 ? void 0 : _a.getEnumMap();
|
|
63
|
+
for (const expression of this.event.file.parser.references.expressions) {
|
|
64
|
+
const parts = (_b = util_1.default.getAllDottedGetParts(expression)) === null || _b === void 0 ? void 0 : _b.map(x => x.toLowerCase());
|
|
65
|
+
if (parts) {
|
|
66
|
+
//discard the enum member name
|
|
67
|
+
const memberName = parts.pop();
|
|
68
|
+
//get the name of the enum (including leading namespace if applicable)
|
|
69
|
+
const enumName = parts.join('.');
|
|
70
|
+
const lowerEnumName = enumName.toLowerCase();
|
|
71
|
+
const theEnum = (_c = enumLookup.get(lowerEnumName)) === null || _c === void 0 ? void 0 : _c.item;
|
|
72
|
+
if (theEnum) {
|
|
73
|
+
const tokens = util_1.default.splitGetRange('.', lowerEnumName + '.' + memberName, expression.range);
|
|
74
|
+
//enum member name
|
|
75
|
+
this.event.semanticTokens.push({
|
|
76
|
+
range: tokens.pop().range,
|
|
77
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enumMember
|
|
78
|
+
});
|
|
79
|
+
//enum name
|
|
80
|
+
this.event.semanticTokens.push({
|
|
81
|
+
range: tokens.pop().range,
|
|
82
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enum
|
|
83
|
+
});
|
|
84
|
+
//namespace parts
|
|
85
|
+
for (const token of tokens) {
|
|
86
|
+
this.event.semanticTokens.push({
|
|
87
|
+
range: token.range,
|
|
88
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
exports.BrsFileSemanticTokensProcessor = BrsFileSemanticTokensProcessor;
|
|
97
|
+
//# sourceMappingURL=BrsFileSemanticTokensProcessor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BrsFileSemanticTokensProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const chai_1 = require("chai");
|
|
4
|
+
const vscode_languageserver_protocol_1 = require("vscode-languageserver-protocol");
|
|
5
|
+
const Program_1 = require("../../Program");
|
|
6
|
+
const testHelpers_spec_1 = require("../../testHelpers.spec");
|
|
7
|
+
const util_1 = require("../../util");
|
|
8
|
+
const rootDir = (0, util_1.standardizePath) `${process.cwd()}/.tmp/rootDir`;
|
|
9
|
+
describe('BrsFileSemanticTokensProcessor', () => {
|
|
10
|
+
let program;
|
|
11
|
+
beforeEach(() => {
|
|
12
|
+
program = new Program_1.Program({
|
|
13
|
+
rootDir: rootDir
|
|
14
|
+
});
|
|
15
|
+
});
|
|
16
|
+
afterEach(() => {
|
|
17
|
+
program.dispose();
|
|
18
|
+
});
|
|
19
|
+
it('matches each namespace section', () => {
|
|
20
|
+
const file = program.setFile('source/main.bs', `
|
|
21
|
+
namespace Earthlings.Humanoids
|
|
22
|
+
class Person
|
|
23
|
+
end class
|
|
24
|
+
end namespace
|
|
25
|
+
class Dog
|
|
26
|
+
sub new()
|
|
27
|
+
m.owner = new Earthlings.Humanoids.Person()
|
|
28
|
+
end sub
|
|
29
|
+
end class
|
|
30
|
+
`);
|
|
31
|
+
program.validate();
|
|
32
|
+
(0, testHelpers_spec_1.expectZeroDiagnostics)(program);
|
|
33
|
+
(0, chai_1.expect)(program.getSemanticTokens(file.srcPath)).to.eql([{
|
|
34
|
+
range: util_1.util.createRange(7, 34, 7, 44),
|
|
35
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
36
|
+
}, {
|
|
37
|
+
range: util_1.util.createRange(7, 45, 7, 54),
|
|
38
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
39
|
+
}, {
|
|
40
|
+
range: util_1.util.createRange(7, 55, 7, 61),
|
|
41
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.class
|
|
42
|
+
}]);
|
|
43
|
+
});
|
|
44
|
+
it('matches each namespace section', () => {
|
|
45
|
+
const file = program.setFile('source/main.bs', `
|
|
46
|
+
sub main()
|
|
47
|
+
print Earthlings.Species.Human.Male
|
|
48
|
+
end sub
|
|
49
|
+
namespace Earthlings.Species
|
|
50
|
+
enum Human
|
|
51
|
+
Male
|
|
52
|
+
Female
|
|
53
|
+
end enum
|
|
54
|
+
end namespace
|
|
55
|
+
`);
|
|
56
|
+
program.validate();
|
|
57
|
+
(0, testHelpers_spec_1.expectZeroDiagnostics)(program);
|
|
58
|
+
(0, chai_1.expect)(util_1.util.sortByRange(program.getSemanticTokens(file.srcPath))).to.eql([{
|
|
59
|
+
range: util_1.util.createRange(2, 22, 2, 32),
|
|
60
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
61
|
+
}, {
|
|
62
|
+
range: util_1.util.createRange(2, 33, 2, 40),
|
|
63
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
64
|
+
}, {
|
|
65
|
+
range: util_1.util.createRange(2, 41, 2, 46),
|
|
66
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enum
|
|
67
|
+
}, {
|
|
68
|
+
range: util_1.util.createRange(2, 47, 2, 51),
|
|
69
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enumMember
|
|
70
|
+
}]);
|
|
71
|
+
});
|
|
72
|
+
});
|
|
73
|
+
//# sourceMappingURL=BrsFileSemanticTokensProcessor.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BrsFileSemanticTokensProcessor.spec.js","sourceRoot":"","sources":["../../../src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,mFAAoE;AAEpE,2CAAwC;AACxC,6DAA+D;AAC/D,qCAAwD;AAExD,MAAM,OAAO,GAAG,IAAA,sBAAC,EAAA,GAAG,OAAO,CAAC,GAAG,EAAE,eAAe,CAAC;AAEjD,QAAQ,CAAC,gCAAgC,EAAE,GAAG,EAAE;IAC5C,IAAI,OAAgB,CAAC;IACrB,UAAU,CAAC,GAAG,EAAE;QACZ,OAAO,GAAG,IAAI,iBAAO,CAAC;YAClB,OAAO,EAAE,OAAO;SACnB,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IACH,SAAS,CAAC,GAAG,EAAE;QACX,OAAO,CAAC,OAAO,EAAE,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;;;;SAUvD,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,EAAE,CAAC;QACnB,IAAA,wCAAqB,EAAC,OAAO,CAAC,CAAC;QAC/B,IAAA,aAAM,EACF,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAC1C,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;gBACN,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,KAAK;aACtC,CAAC,CAAC,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;;;;SAUvD,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,EAAE,CAAC;QACnB,IAAA,wCAAqB,EAAC,OAAO,CAAC,CAAC;QAC/B,IAAA,aAAM,EACF,WAAI,CAAC,WAAW,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAC5D,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;gBACN,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,SAAS;aAC1C,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,IAAI;aACrC,EAAE;gBACC,KAAK,EAAE,WAAI,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,SAAS,EAAE,mDAAkB,CAAC,UAAU;aAC3C,CAAC,CAAC,CAAC;IACR,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { BrsFile } from '../../files/BrsFile';
|
|
2
|
+
import type { BeforeFileTranspileEvent } from '../../interfaces';
|
|
3
|
+
export declare class BrsFilePreTranspileProcessor {
|
|
4
|
+
private event;
|
|
5
|
+
constructor(event: BeforeFileTranspileEvent<BrsFile>);
|
|
6
|
+
process(): void;
|
|
7
|
+
private replaceEnumValues;
|
|
8
|
+
}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.BrsFilePreTranspileProcessor = void 0;
|
|
4
|
+
const reflection_1 = require("../../astUtils/reflection");
|
|
5
|
+
const Cache_1 = require("../../Cache");
|
|
6
|
+
const util_1 = require("../../util");
|
|
7
|
+
class BrsFilePreTranspileProcessor {
|
|
8
|
+
constructor(event) {
|
|
9
|
+
this.event = event;
|
|
10
|
+
}
|
|
11
|
+
process() {
|
|
12
|
+
this.replaceEnumValues();
|
|
13
|
+
}
|
|
14
|
+
replaceEnumValues() {
|
|
15
|
+
var _a, _b, _c, _d;
|
|
16
|
+
const membersByEnum = new Cache_1.Cache();
|
|
17
|
+
const enumLookup = (_a = this.event.file.program.getFirstScopeForFile(this.event.file)) === null || _a === void 0 ? void 0 : _a.getEnumMap();
|
|
18
|
+
//skip this logic if current scope has no enums
|
|
19
|
+
if (((_b = enumLookup === null || enumLookup === void 0 ? void 0 : enumLookup.size) !== null && _b !== void 0 ? _b : 0) === 0) {
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
for (const referenceExpression of this.event.file.parser.references.expressions) {
|
|
23
|
+
const actualExpressions = [];
|
|
24
|
+
//binary expressions actually have two expressions (left and right), so handle them independently
|
|
25
|
+
if ((0, reflection_1.isBinaryExpression)(referenceExpression)) {
|
|
26
|
+
actualExpressions.push(referenceExpression.left, referenceExpression.right);
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
//assume all other expressions are a single chain
|
|
30
|
+
actualExpressions.push(referenceExpression);
|
|
31
|
+
}
|
|
32
|
+
for (const expression of actualExpressions) {
|
|
33
|
+
const parts = (_c = util_1.default.getAllDottedGetParts(expression)) === null || _c === void 0 ? void 0 : _c.map(x => x.toLowerCase());
|
|
34
|
+
if (parts) {
|
|
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
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
exports.BrsFilePreTranspileProcessor = BrsFilePreTranspileProcessor;
|
|
52
|
+
//# sourceMappingURL=BrsFilePreTranspileProcessor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BrsFilePreTranspileProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/transpile/BrsFilePreTranspileProcessor.ts"],"names":[],"mappings":";;;AAAA,0DAA+D;AAC/D,uCAAoC;AAIpC,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,mBAAmB,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE;YAC7E,MAAM,iBAAiB,GAAiB,EAAE,CAAC;YAC3C,iGAAiG;YACjG,IAAI,IAAA,+BAAkB,EAAC,mBAAmB,CAAC,EAAE;gBACzC,iBAAiB,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC;aAC/E;iBAAM;gBACH,iDAAiD;gBACjD,iBAAiB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;aAC/C;YACD,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE;gBACxC,MAAM,KAAK,GAAG,MAAA,cAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC/E,IAAI,KAAK,EAAE;oBACP,iCAAiC;oBACjC,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;oBAC/B,sEAAsE;oBACtE,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACjC,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;oBAC7C,MAAM,OAAO,GAAG,MAAA,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,0CAAE,IAAI,CAAC;oBACpD,IAAI,OAAO,EAAE;wBACT,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;wBACzF,MAAM,KAAK,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAC,UAAU,CAAC,CAAC;wBACvC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,uBAAuB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;qBAChE;iBACJ;aACJ;SACJ;IACL,CAAC;CACJ;AA7CD,oEA6CC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const sinon_1 = require("sinon");
|
|
4
|
+
const fsExtra = require("fs-extra");
|
|
5
|
+
const Program_1 = require("../../Program");
|
|
6
|
+
const util_1 = require("../../util");
|
|
7
|
+
const sinon = (0, sinon_1.createSandbox)();
|
|
8
|
+
describe('BrsFile', () => {
|
|
9
|
+
const tempDir = (0, util_1.standardizePath) `${process.cwd()}/.tmp`;
|
|
10
|
+
const rootDir = (0, util_1.standardizePath) `${tempDir}/rootDir`;
|
|
11
|
+
let program;
|
|
12
|
+
beforeEach(() => {
|
|
13
|
+
fsExtra.emptyDirSync(tempDir);
|
|
14
|
+
program = new Program_1.Program({ rootDir: rootDir, sourceMap: true });
|
|
15
|
+
});
|
|
16
|
+
afterEach(() => {
|
|
17
|
+
sinon.restore();
|
|
18
|
+
program.dispose();
|
|
19
|
+
});
|
|
20
|
+
describe('BrsFilePreTranspileProcessor', () => {
|
|
21
|
+
it('does not crash when operating on a file not included by any scope', async () => {
|
|
22
|
+
program.setFile('components/lib.brs', `
|
|
23
|
+
sub doSomething()
|
|
24
|
+
a = { b: "c"}
|
|
25
|
+
print a.b
|
|
26
|
+
end sub
|
|
27
|
+
`);
|
|
28
|
+
await program.transpile([], (0, util_1.standardizePath) `${tempDir}/out`);
|
|
29
|
+
});
|
|
30
|
+
});
|
|
31
|
+
});
|
|
32
|
+
//# sourceMappingURL=BrsFilePreTranspileProcessor.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BrsFilePreTranspileProcessor.spec.js","sourceRoot":"","sources":["../../../src/bscPlugin/transpile/BrsFilePreTranspileProcessor.spec.ts"],"names":[],"mappings":";;AAAA,iCAAsC;AACtC,oCAAoC;AACpC,2CAAwC;AACxC,qCAAkD;AAClD,MAAM,KAAK,GAAG,IAAA,qBAAa,GAAE,CAAC;AAE9B,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACrB,MAAM,OAAO,GAAG,IAAA,sBAAC,EAAA,GAAG,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC;IACzC,MAAM,OAAO,GAAG,IAAA,sBAAC,EAAA,GAAG,OAAO,UAAU,CAAC;IACtC,IAAI,OAAgB,CAAC;IAErB,UAAU,CAAC,GAAG,EAAE;QACZ,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC9B,OAAO,GAAG,IAAI,iBAAO,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IACH,SAAS,CAAC,GAAG,EAAE;QACX,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,OAAO,CAAC,OAAO,EAAE,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;QAC1C,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;YAC/E,OAAO,CAAC,OAAO,CAAC,oBAAoB,EAAE;;;;;aAKrC,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,IAAA,sBAAC,EAAA,GAAG,OAAO,MAAM,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { BrsFile } from '../../files/BrsFile';
|
|
2
|
+
import type { OnFileValidateEvent } from '../../interfaces';
|
|
3
|
+
export declare class BrsFileValidator {
|
|
4
|
+
event: OnFileValidateEvent<BrsFile>;
|
|
5
|
+
constructor(event: OnFileValidateEvent<BrsFile>);
|
|
6
|
+
process(): void;
|
|
7
|
+
validateEnumDeclarations(): void;
|
|
8
|
+
private validateEnumValueTypes;
|
|
9
|
+
}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.BrsFileValidator = void 0;
|
|
4
|
+
const __1 = require("../..");
|
|
5
|
+
const DiagnosticMessages_1 = require("../../DiagnosticMessages");
|
|
6
|
+
const TokenKind_1 = require("../../lexer/TokenKind");
|
|
7
|
+
class BrsFileValidator {
|
|
8
|
+
constructor(event) {
|
|
9
|
+
this.event = event;
|
|
10
|
+
}
|
|
11
|
+
process() {
|
|
12
|
+
this.validateEnumDeclarations();
|
|
13
|
+
}
|
|
14
|
+
validateEnumDeclarations() {
|
|
15
|
+
var _a, _b, _c, _d, _e;
|
|
16
|
+
const diagnostics = [];
|
|
17
|
+
for (const stmt of this.event.file.parser.references.enumStatements) {
|
|
18
|
+
const members = stmt.getMembers();
|
|
19
|
+
//the enum data type is based on the first member value
|
|
20
|
+
const enumValueKind = (_d = (_c = (_b = (_a = members.find(x => x.value)) === null || _a === void 0 ? void 0 : _a.value) === null || _b === void 0 ? void 0 : _b.token) === null || _c === void 0 ? void 0 : _c.kind) !== null && _d !== void 0 ? _d : TokenKind_1.TokenKind.IntegerLiteral;
|
|
21
|
+
const memberNames = new Set();
|
|
22
|
+
for (const member of members) {
|
|
23
|
+
const memberNameLower = (_e = member.name) === null || _e === void 0 ? void 0 : _e.toLowerCase();
|
|
24
|
+
/**
|
|
25
|
+
* flag duplicate member names
|
|
26
|
+
*/
|
|
27
|
+
if (memberNames.has(memberNameLower)) {
|
|
28
|
+
diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.duplicateIdentifier(member.name)), { file: this.event.file, range: member.range }));
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
memberNames.add(memberNameLower);
|
|
32
|
+
}
|
|
33
|
+
//Enforce all member values are the same type
|
|
34
|
+
this.validateEnumValueTypes(diagnostics, member, enumValueKind);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
this.event.file.addDiagnostics(diagnostics);
|
|
38
|
+
}
|
|
39
|
+
validateEnumValueTypes(diagnostics, member, enumValueKind) {
|
|
40
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
41
|
+
const memberValueKind = (_b = (_a = member.value) === null || _a === void 0 ? void 0 : _a.token) === null || _b === void 0 ? void 0 : _b.kind;
|
|
42
|
+
if (
|
|
43
|
+
//is integer enum, has value, that value type is not integer
|
|
44
|
+
(enumValueKind === TokenKind_1.TokenKind.IntegerLiteral && memberValueKind && memberValueKind !== enumValueKind) ||
|
|
45
|
+
//has value, that value is not a literal
|
|
46
|
+
(member.value && !(0, __1.isLiteralExpression)(member.value))) {
|
|
47
|
+
diagnostics.push(Object.assign(Object.assign({ file: this.event.file }, DiagnosticMessages_1.DiagnosticMessages.enumValueMustBeType(enumValueKind.replace(/literal$/i, '').toLowerCase())), { range: (_d = ((_c = member.value) !== null && _c !== void 0 ? _c : member)) === null || _d === void 0 ? void 0 : _d.range }));
|
|
48
|
+
}
|
|
49
|
+
//is non integer value
|
|
50
|
+
if (enumValueKind !== TokenKind_1.TokenKind.IntegerLiteral) {
|
|
51
|
+
//default value present
|
|
52
|
+
if (memberValueKind) {
|
|
53
|
+
//member value is same as enum
|
|
54
|
+
if (memberValueKind !== enumValueKind) {
|
|
55
|
+
diagnostics.push(Object.assign(Object.assign({ file: this.event.file }, DiagnosticMessages_1.DiagnosticMessages.enumValueMustBeType(enumValueKind.replace(/literal$/i, '').toLowerCase())), { range: (_f = ((_e = member.value) !== null && _e !== void 0 ? _e : member)) === null || _f === void 0 ? void 0 : _f.range }));
|
|
56
|
+
}
|
|
57
|
+
//default value missing
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
diagnostics.push(Object.assign(Object.assign({ file: this.event.file }, DiagnosticMessages_1.DiagnosticMessages.enumValueIsRequired(enumValueKind.replace(/literal$/i, '').toLowerCase())), { range: (_h = ((_g = member.value) !== null && _g !== void 0 ? _g : member)) === null || _h === void 0 ? void 0 : _h.range }));
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
exports.BrsFileValidator = BrsFileValidator;
|
|
66
|
+
//# sourceMappingURL=BrsFileValidator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BrsFileValidator.js","sourceRoot":"","sources":["../../../src/bscPlugin/validation/BrsFileValidator.ts"],"names":[],"mappings":"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"}
|