brighterscript 0.49.0 → 0.50.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +28 -0
- package/README.md +3 -3
- package/dist/BsConfig.d.ts +5 -0
- package/dist/DiagnosticCollection.js +6 -5
- package/dist/DiagnosticCollection.js.map +1 -1
- package/dist/DiagnosticFilterer.js +4 -3
- package/dist/DiagnosticFilterer.js.map +1 -1
- package/dist/LanguageServer.d.ts +2 -2
- package/dist/LanguageServer.js +49 -47
- package/dist/LanguageServer.js.map +1 -1
- package/dist/Program.d.ts +11 -7
- package/dist/Program.js +27 -22
- package/dist/Program.js.map +1 -1
- package/dist/ProgramBuilder.d.ts +4 -4
- package/dist/ProgramBuilder.js +28 -27
- package/dist/ProgramBuilder.js.map +1 -1
- package/dist/Scope.d.ts +1 -1
- package/dist/Scope.js +6 -6
- package/dist/Scope.js.map +1 -1
- package/dist/XmlScope.js +1 -1
- package/dist/XmlScope.js.map +1 -1
- package/dist/astUtils/AstEditor.d.ts +28 -0
- package/dist/astUtils/AstEditor.js +107 -0
- package/dist/astUtils/AstEditor.js.map +1 -1
- package/dist/astUtils/AstEditor.spec.js +99 -34
- package/dist/astUtils/AstEditor.spec.js.map +1 -1
- package/dist/astUtils/creators.d.ts +6 -2
- package/dist/astUtils/creators.js +9 -2
- package/dist/astUtils/creators.js.map +1 -1
- package/dist/astUtils/reflection.d.ts +9 -1
- package/dist/astUtils/reflection.js +20 -4
- package/dist/astUtils/reflection.js.map +1 -1
- package/dist/astUtils/visitors.d.ts +9 -1
- package/dist/astUtils/visitors.js +7 -0
- package/dist/astUtils/visitors.js.map +1 -1
- package/dist/astUtils/visitors.spec.js +3 -3
- package/dist/astUtils/visitors.spec.js.map +1 -1
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.js +2 -2
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.js.map +1 -1
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.spec.js +6 -6
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js +36 -25
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js.map +1 -1
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.js +59 -2
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/validation/ScopeValidator.js +3 -3
- package/dist/bscPlugin/validation/ScopeValidator.js.map +1 -1
- package/dist/cli.js +1 -0
- package/dist/cli.js.map +1 -1
- package/dist/files/BrsFile.Class.spec.js +83 -2
- package/dist/files/BrsFile.Class.spec.js.map +1 -1
- package/dist/files/BrsFile.d.ts +8 -2
- package/dist/files/BrsFile.js +35 -23
- package/dist/files/BrsFile.js.map +1 -1
- package/dist/files/BrsFile.spec.js +25 -6
- package/dist/files/BrsFile.spec.js.map +1 -1
- package/dist/files/XmlFile.d.ts +8 -2
- package/dist/files/XmlFile.js +18 -7
- package/dist/files/XmlFile.js.map +1 -1
- package/dist/files/XmlFile.spec.js +3 -3
- package/dist/files/XmlFile.spec.js.map +1 -1
- package/dist/files/tests/imports.spec.js +2 -2
- package/dist/files/tests/imports.spec.js.map +1 -1
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/interfaces.d.ts +3 -3
- package/dist/parser/BrsTranspileState.d.ts +5 -0
- package/dist/parser/BrsTranspileState.js +6 -1
- package/dist/parser/BrsTranspileState.js.map +1 -1
- package/dist/parser/Parser.Class.spec.js.map +1 -1
- package/dist/parser/Parser.d.ts +3 -3
- package/dist/parser/Parser.js +4 -4
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/Statement.d.ts +23 -13
- package/dist/parser/Statement.js +68 -34
- package/dist/parser/Statement.js.map +1 -1
- package/dist/util.d.ts +5 -6
- package/dist/util.js +24 -23
- package/dist/util.js.map +1 -1
- package/dist/validators/ClassValidator.js +2 -2
- package/dist/validators/ClassValidator.js.map +1 -1
- package/package.json +4 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitors.spec.js","sourceRoot":"","sources":["../../src/astUtils/visitors.spec.ts"],"names":[],"mappings":";;AAEA,iEAAuE;AACvE,+BAA8B;AAC9B,+BAA+B;AAC/B,wCAAqC;AAGrC,mDAA6E;AAE7E,kDAA+C;AAC/C,yCAAqE;AACrE,6CAAgD;AAChD,yCAAyC;AACzC,qDAAwD;AAExD,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC9B,IAAI,OAAgB,CAAC;IAErB,MAAM,UAAU,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA6BlB,CAAC;IAEF,MAAM,eAAe,GAAG;;;;;;;;;;;;;;;;;;;;;;KAsBvB,CAAC;IAEF,UAAU,CAAC,GAAG,EAAE;QACZ,OAAO,GAAG,IAAI,iBAAO,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IACH,SAAS,CAAC,GAAG,EAAE;QACX,OAAO,CAAC,OAAO,EAAE,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,SAAS,eAAe,CAAC,OAA0D,EAAE,MAA0B;QAC3G,OAAO,CAAC,IAAa,EAAE,EAAE;YACrB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE;gBACjE,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;gBAC5C,IAAA,yBAAc,EAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;gBACnG,OAAO,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,uBAAuB,CAAC;YAC3C,CAAC,CAAC,CAAC;QACP,CAAC,CAAC;IACN,CAAC;IAED,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QACxB,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;YACnD,MAAM,MAAM,GAAa,EAAE,CAAC;YAC5B,MAAM,OAAO,GAAG,IAAA,qCAAoB,EAAC,CAAC,CAAY,EAAE,KAAkB,EAAE,EAAE;gBACtE,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC;gBACvB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;YACxC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;gBAChB,IAAI,EAAE,QAAQ;gBACd,cAAc,EAAE,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAe,CAAC;aAClD,CAAC,CAAC;YACH,OAAO,CAAC,OAAO,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;YAC/C,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;gBACzB,SAAS;gBACT,kBAAkB;gBAClB,kBAAkB;gBAClB,qBAAqB;gBACrB,uBAAuB;gBACvB,eAAe;gBACf,SAAS;gBACT,kBAAkB;gBAClB,eAAe;gBACf,SAAS;gBACT,kBAAkB;gBAClB,SAAS;gBACT,kBAAkB;gBAClB,kBAAkB;gBAClB,SAAS;gBACT,kBAAkB;gBAClB,gBAAgB;gBAChB,uBAAuB;gBACvB,SAAS;gBACT,kBAAkB;gBAClB,SAAS;gBACT,uBAAuB;gBACvB,SAAS;gBACT,kBAAkB,CAAQ,YAAY;aACzC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;YACjE,MAAM,MAAM,GAAG,IAAI,+CAAuB,EAAE,CAAC;YAC7C,MAAM,MAAM,GAAa,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YACnF,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;gBAChB,IAAI,EAAE,QAAQ;gBACd,cAAc,EAAE,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAe,CAAC;aAClD,CAAC,CAAC;YACH,OAAO,CAAC,OAAO,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;YAC/C,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;gBACzB,OAAO;gBACP,gBAAgB;gBAChB,gBAAgB;gBAChB,mBAAmB;gBACnB,qBAAqB;gBACrB,aAAa;gBACb,OAAO;gBACP,gBAAgB;gBAChB,aAAa;gBACb,OAAO;gBACP,gBAAgB;gBAChB,OAAO;gBACP,gBAAgB;gBAChB,gBAAgB;gBAChB,OAAO;gBACP,gBAAgB;gBAChB,cAAc;gBACd,qBAAqB;gBACrB,OAAO;gBACP,gBAAgB;gBAChB,OAAO;gBACP,qBAAqB;gBACrB,OAAO;gBACP,gBAAgB,CAAQ,YAAY;aACvC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACpC,MAAM,MAAM,GAAG,IAAI,+CAAuB,EAAE,CAAC;YAC7C,MAAM,MAAM,GAAa,EAAE,CAAC;YAC5B,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,MAAM,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE;gBAC/B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;gBAChC,IAAI,IAAA,6BAAgB,EAAC,CAAC,CAAC,EAAE;oBACrB,IAAI,EAAE,KAAK,KAAK,CAAC,EAAE;wBACf,MAAM,CAAC,MAAM,EAAE,CAAC;qBACnB;iBACJ;YACL,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YACjB,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;gBAChB,IAAI,EAAE,QAAQ;gBACd,cAAc,EAAE,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAe,CAAC;aAClD,CAAC,CAAC;YACH,OAAO,CAAC,OAAO,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;YAC/C,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;gBACzB,OAAO;gBACP,gBAAgB;gBAChB,gBAAgB;gBAChB,mBAAmB;gBACnB,qBAAqB;gBACrB,aAAa;gBACb,OAAO;gBACP,gBAAgB;gBAChB,aAAa;gBACb,OAAO;gBACP,gBAAgB,CAAQ,UAAU;aACrC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;YAC9C,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;YACjC,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;YACjC,MAAM,OAAO,GAAG,IAAA,wBAAa,EAAC;gBAC1B,cAAc,EAAE,YAAY;gBAC5B,KAAK,EAAE,YAAY;aACtB,CAAC,CAAC;YACH,MAAM,cAAc,GAAG,IAAI,0BAAc,CAAC;gBACtC,KAAK,EAAE,IAAA,sBAAW,EAAC,qBAAS,CAAC,KAAK,CAAC;aACtC,EAAE,EAAE,CAAC,CAAC;YACP,MAAM,cAAc,GAAG,IAAI,iBAAK,CAAC,EAAE,EAAE,6BAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/D,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;YACnC,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;YACnC,IAAA,aAAM,EAAC,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC3C,IAAA,aAAM,EAAC,YAAY,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;YAC3D,IAAA,aAAM,EAAC,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC3C,IAAA,aAAM,EAAC,YAAY,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC/D,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACnC,MAAM,eAAe,GAAG,IAAI,0BAAc,CAAC;gBACvC,KAAK,EAAE,IAAA,sBAAW,EAAC,qBAAS,CAAC,KAAK,CAAC;aACtC,EAAE,EAAE,CAAC,CAAC;YACP,MAAM,eAAe,GAAG,IAAI,0BAAc,CAAC;gBACvC,KAAK,EAAE,IAAA,sBAAW,EAAC,qBAAS,CAAC,KAAK,CAAC;aACtC,EAAE,EAAE,CAAC,CAAC;YACP,MAAM,KAAK,GAAG,IAAI,iBAAK,CAAC;gBACpB,eAAe;gBACf,IAAI,2BAAe,CAAC,EAAE,MAAM,EAAE,IAAA,sBAAW,EAAC,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC;aACjE,EAAE,6BAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,OAAO,GAAG,IAAA,wBAAa,EAAC;gBAC1B,cAAc,EAAE,GAAG,EAAE,CAAC,eAAe;aACxC,CAAC,CAAC;YACH,IAAA,yBAAc,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC/B,IAAA,aAAM,EAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QACzB,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;YACrC,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,IAAI,IAA6C,CAAC;YAClD,MAAM,gBAAgB,GAAG,IAAA,qCAAoB,EAAC,CAAC,SAAoB,EAAE,KAAkB,EAAE,EAAE;gBACvF,IAAI,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;YACzD,CAAC,CAAC,CAAC;YACH,SAAS,iBAAiB,CAAC,UAAsB,EAAE,CAAyB;gBACxE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;gBAClC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,IAAI,KAAK,IAAI,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;YACzF,CAAC;YACD,MAAM,MAAM,GAAG,eAAe,CAAC,CAAC,SAAS,EAAE,eAAe,EAAE,EAAE;gBAC1D,gBAAgB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;gBAC7C,SAAS,CAAC,IAAI,CAAC,iBAAiB,EAAE;oBAC9B,QAAQ,EAAE,mBAAQ,CAAC,qBAAqB;iBAC3C,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;gBAChB,IAAI,EAAE,QAAQ;gBACd,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAe,CAAC;aACpD,CAAC,CAAC;YAEH,OAAO,CAAC,OAAO,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;YACpD,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;gBACzB,iKAAiK;gBACjK,+DAA+D;gBAC/D,oCAAoC;gBACpC,oCAAoC;gBACpC,2CAA2C;gBAC3C,gDAAgD;gBAChD,oCAAoC;gBACpC,qCAAqC;gBACrC,gDAAgD;gBAChD,oCAAoC;gBACpC,yCAAyC;gBACzC,wCAAwC;gBACxC,yCAAyC;gBACzC,0CAA0C;gBAC1C,0CAA0C;gBAC1C,yCAAyC;gBACzC,wCAAwC;gBACxC,0CAA0C;gBAC1C,yCAAyC;gBACzC,yCAAyC;gBACzC,sCAAsC;gBACtC,0CAA0C;gBAC1C,yCAAyC;gBACzC,sCAAsC;gBACtC,0CAA0C;gBAC1C,kCAAkC;gBAClC,yCAAyC;gBACzC,uCAAuC;gBACvC,mCAAmC;gBACnC,qCAAqC;gBACrC,oCAAoC;gBACpC,yCAAyC;gBACzC,gCAAgC;gBAChC,kCAAkC;gBAClC,iCAAiC;gBACjC,gCAAgC;gBAChC,kCAAkC;gBAClC,+BAA+B;gBAC/B,iCAAiC;gBACjC,qCAAqC,CAAa,mBAAmB;aACxE,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;QAClB,SAAS,QAAQ,CAAC,IAAY,EAAE,oBAA8B,EAAE,QAAQ,GAAG,mBAAQ,CAAC,iBAAiB;YACjG,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE,IAAI,CAAC,CAAC;YAC9D,MAAM,KAAK,GAAG,EAAE,CAAC;YACjB,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAY,EAAE,EAAE;gBAC3B,OAAO,CAAC,OAAO,GAAG,KAAK,EAAE,CAAC;gBAC1B,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACxB,CAAC,EAAE;gBACC,QAAQ,EAAE,QAAQ;aACrB,CAAC,CAAC;YACH,KAAK,GAAG,CAAC,CAAC;YACV,IAAA,aAAM,EAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;QAC1H,CAAC;QAED,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;YACrD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAU,gBAAgB,EAAE;;;;;;;aAOvD,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,IAAI,+CAAuB,EAAE,CAAC;YAC7C,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,MAAM,SAAS,GAAG,CAAC,CAAC;YAEpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE;gBAChC,KAAK,EAAE,CAAC;gBACR,IAAI,KAAK,KAAK,SAAS,EAAE;oBACrB,MAAM,CAAC,MAAM,EAAE,CAAC;iBACnB;YACL,CAAC,EAAE;gBACC,QAAQ,EAAE,mBAAQ,CAAC,iBAAiB;gBACpC,MAAM,EAAE,MAAM,CAAC,KAAK;aACvB,CAAC,CAAC;YAEH,IAAA,aAAM,EAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;YAC1B,QAAQ,CAAC;;;;;;;;;;aAUR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,IAAI;gBACJ,aAAa;gBACb,mBAAmB;gBACnB,OAAO;gBACP,gBAAgB;gBAChB,mBAAmB;gBACnB,SAAS;gBACT,aAAa;gBACb,mBAAmB;gBACnB,OAAO;gBACP,gBAAgB;gBAChB,mBAAmB;gBACnB,MAAM;gBACN,OAAO;gBACP,gBAAgB;gBAChB,mBAAmB;aACtB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;YACvC,QAAQ,CAAC;;;;;;aAMR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,aAAa;gBACb,mBAAmB;gBACnB,OAAO;gBACP,gBAAgB;gBAChB,mBAAmB;aACtB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;YACjC,QAAQ,CAAC;;;;;aAKR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,qBAAqB;gBACrB,mBAAmB;gBACnB,oBAAoB;gBACpB,oBAAoB;aACvB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;YAC1B,QAAQ,CAAC;;;;;;aAMR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,cAAc;gBACd,qBAAqB;gBACrB,mBAAmB;gBACnB,mBAAmB;gBACnB,mBAAmB;gBACnB,OAAO;gBACP,gBAAgB;gBAChB,oBAAoB;aACvB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;YAC9B,QAAQ,CAAC;;;;;;aAMR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,kBAAkB;gBAClB,wBAAwB;gBACxB,mBAAmB;gBACnB,mBAAmB;gBACnB,mBAAmB;gBACnB,OAAO;gBACP,gBAAgB;gBAChB,oBAAoB;aACvB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YAC/C,QAAQ,CAAC;;;;;;aAMR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,qBAAqB;gBACrB,qBAAqB;gBACrB,oBAAoB;gBACpB,oBAAoB;gBACpB,mBAAmB;gBACnB,qBAAqB;gBACrB,oBAAoB;gBACpB,mBAAmB;gBACnB,mBAAmB;aACtB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kBAAkB,EAAE,GAAG,EAAE;YACxB,QAAQ,CAAC;;;;;;aAMR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,gBAAgB;gBAChB,kBAAkB;gBAClB,kBAAkB;gBAClB,mBAAmB;gBACnB,mBAAmB;gBACnB,mBAAmB;gBACnB,OAAO;gBACP,gBAAgB;gBAChB,mBAAmB;aACtB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE;YACvB,QAAQ,CAAC;;;aAGR,EAAE;gBACC,oBAAoB;gBACpB,kCAAkC;gBAClC,qBAAqB;gBACrB,oBAAoB;aACvB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;YAC9B,QAAQ,CAAC;;;;;;;;;;;;;aAaR,EAAE;gBACC,YAAY;gBACZ,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,gBAAgB;gBAChB,mBAAmB;gBAEnB,gBAAgB;gBAChB,qBAAqB;gBACrB,oBAAoB;gBACpB,OAAO;gBACP,gBAAgB;gBAChB,mBAAmB;gBAEnB,gBAAgB;gBAChB,qBAAqB;gBACrB,oBAAoB;gBACpB,OAAO;gBACP,gBAAgB;gBAChB,mBAAmB;gBAEnB,cAAc;gBACd,qBAAqB;gBACrB,oBAAoB;gBACpB,OAAO;gBACP,gBAAgB;gBAChB,mBAAmB;aACtB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;YAC5B,QAAQ,CAAC;;;;aAIR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,qBAAqB;gBACrB,gBAAgB;gBAChB,oBAAoB;gBACpB,mBAAmB;aACtB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;YACjC,QAAQ,CAAC;;;;;aAKR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,6BAA6B;gBAC7B,OAAO;gBACP,qBAAqB;gBACrB,oBAAoB;gBACpB,6BAA6B;gBAC7B,6BAA6B;gBAC7B,OAAO;aACV,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;YACjC,QAAQ,CAAC;;;;aAIR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,gBAAgB;gBAChB,qBAAqB;gBACrB,oBAAoB;aACvB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;YACvC,QAAQ,CAAC;;;;aAIR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,gBAAgB;gBAChB,2BAA2B;gBAC3B,oBAAoB;aACvB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;YAClC,QAAQ,CAAC;;;;aAIR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,gBAAgB;gBAChB,sBAAsB;gBACtB,oBAAoB;gBACpB,mBAAmB;aACtB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0BAA0B,EAAE,GAAG,EAAE;YAChC,QAAQ,CAAC;;;;aAIR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,gBAAgB;gBAChB,kBAAkB;gBAClB,mBAAmB;gBACnB,oBAAoB;gBACpB,kBAAkB;gBAClB,mBAAmB;gBACnB,mBAAmB;aACtB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;YACjC,QAAQ,CAAC;;;;;;;aAOR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,qBAAqB;gBACrB,qBAAqB;gBACrB,kBAAkB;gBAClB,oBAAoB;gBACpB,mBAAmB;aACtB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uBAAuB,EAAE,GAAG,EAAE;YAC7B,QAAQ,CAAC;;;;aAIR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,qBAAqB;gBACrB,iBAAiB;gBACjB,oBAAoB;aACvB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;YACtC,QAAQ,CAAC;;;;aAIR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,gBAAgB;gBAChB,0BAA0B;gBAC1B,+BAA+B;gBAC/B,mBAAmB;gBACnB,oBAAoB;gBACpB,+BAA+B;gBAC/B,mBAAmB;aACtB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;YACnD,QAAQ,CAAC;;;;;;;;;;;aAWR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,qBAAqB;gBACrB,mBAAmB;gBACnB,IAAI;gBACJ,aAAa;gBACb,kBAAkB;gBAClB,oBAAoB;gBACpB,mBAAmB;gBACnB,OAAO;gBACP,iBAAiB;gBACjB,SAAS;gBACT,aAAa;gBACb,kBAAkB;gBAClB,oBAAoB;gBACpB,mBAAmB;gBACnB,OAAO;gBACP,iBAAiB;gBACjB,mBAAmB;gBACnB,MAAM;gBACN,OAAO;gBACP,iBAAiB;gBACjB,kBAAkB;aACrB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;YAC5C,QAAQ,CAAC;;;;aAIR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,gBAAgB;gBAChB,gCAAgC;gBAChC,+BAA+B;gBAC/B,mBAAmB;gBACnB,oBAAoB;gBACpB,+BAA+B;gBAC/B,mBAAmB;aACtB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;YACzE,QAAQ,CAAC;;;;aAIR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,gBAAgB;gBAChB,0BAA0B;gBAC1B,+BAA+B;gBAC/B,mBAAmB;gBACnB,kCAAkC;gBAClC,mBAAmB;aACtB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE;YAC3B,QAAQ,CAAC;;;;aAIR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,qBAAqB;gBACrB,eAAe;gBACf,gBAAgB;gBAChB,kCAAkC;gBAClC,oBAAoB;aACvB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0BAA0B,EAAE,GAAG,EAAE;YAChC,QAAQ,CAAC;;;;aAIR,EAAE;gBACC,mBAAmB;gBACnB,oBAAoB;gBACpB,OAAO;gBACP,qBAAqB;gBACrB,oBAAoB;gBACpB,oBAAoB;gBACpB,mBAAmB;aACtB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;YAC5B,QAAQ,CAAC;;;;;;;;aAQR,EAAE;gBACC,gBAAgB;gBAChB,qBAAqB;gBACrB,qBAAqB;gBACrB,mBAAmB;gBACnB,sBAAsB;gBACtB,oBAAoB;gBACpB,OAAO;gBACP,iBAAiB;gBACjB,qBAAqB;gBACrB,oBAAoB;aACvB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YAChD,QAAQ,CAAC;;;;;;;aAOR,EAAE;gBACC,mBAAmB;gBACnB,OAAO;gBACP,qBAAqB;gBACrB,OAAO;gBACP,gBAAgB;gBAChB,qBAAqB;aACxB,EAAE,mBAAQ,CAAC,wBAAwB,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YAC/C,QAAQ,CAAC;;;;;;;aAOR,EAAE;gBACC,oBAAoB;gBACpB,oBAAoB;gBACpB,6BAA6B;gBAC7B,kBAAkB;gBAClB,mBAAmB;gBACnB,oBAAoB;gBACpB,gBAAgB;gBAChB,oBAAoB;gBACpB,kBAAkB;gBAClB,mBAAmB;gBACnB,mBAAmB;aACtB,EAAE,mBAAQ,CAAC,yBAAyB,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"visitors.spec.js","sourceRoot":"","sources":["../../src/astUtils/visitors.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,7 @@ class CodeActionsProcessor {
|
|
|
47
47
|
kind: vscode_languageserver_1.CodeActionKind.QuickFix,
|
|
48
48
|
changes: [{
|
|
49
49
|
type: 'insert',
|
|
50
|
-
filePath: this.event.file.
|
|
50
|
+
filePath: this.event.file.srcPath,
|
|
51
51
|
position: insertPosition,
|
|
52
52
|
newText: `import "${pkgPath}"\n`
|
|
53
53
|
}]
|
|
@@ -72,7 +72,7 @@ class CodeActionsProcessor {
|
|
|
72
72
|
}
|
|
73
73
|
addMissingExtends(diagnostic) {
|
|
74
74
|
var _a;
|
|
75
|
-
const srcPath = this.event.file.
|
|
75
|
+
const srcPath = this.event.file.srcPath;
|
|
76
76
|
const { component } = this.event.file.parser.ast;
|
|
77
77
|
//inject new attribute after the final attribute, or after the `<component` if there are no attributes
|
|
78
78
|
const pos = ((_a = component.attributes[component.attributes.length - 1]) !== null && _a !== void 0 ? _a : component.tag).range.end;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodeActionsProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/codeActions/CodeActionsProcessor.ts"],"names":[],"mappings":";;;AACA,iEAAuD;AACvD,yDAAsD;AAEtD,iEAA6D;AAI7D,gDAAgD;AAChD,qCAAkC;AAElC,MAAa,oBAAoB;IAC7B,YACW,KAA4B;QAA5B,UAAK,GAAL,KAAK,CAAuB;QAiB/B,qBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAd7C,CAAC;IAEM,OAAO;QACV,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;YAC7C,IAAI,UAAU,CAAC,IAAI,KAAK,sCAAiB,CAAC,qBAAqB,EAAE;gBAC7D,IAAI,CAAC,sBAAsB,CAAC,UAAiB,CAAC,CAAC;aAClD;iBAAM,IAAI,UAAU,CAAC,IAAI,KAAK,sCAAiB,CAAC,oBAAoB,EAAE;gBACnE,IAAI,CAAC,mBAAmB,CAAC,UAAiB,CAAC,CAAC;aAC/C;iBAAM,IAAI,UAAU,CAAC,IAAI,KAAK,sCAAiB,CAAC,mCAAmC,EAAE;gBAClF,IAAI,CAAC,iBAAiB,CAAC,UAAiB,CAAC,CAAC;aAC7C;SACJ;IACL,CAAC;IAID;;OAEG;IACK,cAAc,CAAC,UAAsB,EAAE,GAAW,EAAE,KAAgB;;QACxE,yCAAyC;QACzC,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAChC,OAAO;SACV;QAED,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,gBAAgB,GAAI,IAAI,CAAC,KAAK,CAAC,IAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC;QACzF,0FAA0F;QAC1F,MAAM,cAAc,GAAG,MAAA,MAAA,MAAA,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,0CAAE,WAAW,CAAC,KAAK,0CAAE,KAAK,mCAAI,WAAI,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAE5H,6CAA6C;QAC7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,MAAM,OAAO,GAAG,WAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAClD,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CACvB,+BAAc,CAAC,gBAAgB,CAAC;gBAC5B,KAAK,EAAE,WAAW,OAAO,GAAG;gBAC5B,WAAW,EAAE,CAAC,UAAU,CAAC;gBACzB,WAAW,EAAE,KAAK;gBAClB,IAAI,EAAE,sCAAc,CAAC,QAAQ;gBAC7B,OAAO,EAAE,CAAC;wBACN,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"CodeActionsProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/codeActions/CodeActionsProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ describe('CodeActionsProcessor', () => {
|
|
|
25
25
|
`);
|
|
26
26
|
program.validate();
|
|
27
27
|
(0, testHelpers_spec_1.expectCodeActions)(() => {
|
|
28
|
-
program.getCodeActions(file.
|
|
28
|
+
program.getCodeActions(file.srcPath,
|
|
29
29
|
//<comp|onent name="comp1">
|
|
30
30
|
util_1.util.createRange(1, 5, 1, 5));
|
|
31
31
|
}, [{
|
|
@@ -68,7 +68,7 @@ describe('CodeActionsProcessor', () => {
|
|
|
68
68
|
</component>
|
|
69
69
|
`);
|
|
70
70
|
program.validate();
|
|
71
|
-
const codeActions = program.getCodeActions(file.
|
|
71
|
+
const codeActions = program.getCodeActions(file.srcPath,
|
|
72
72
|
//<comp|onent name="comp1">
|
|
73
73
|
util_1.util.createRange(1, 5, 1, 5));
|
|
74
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));
|
|
@@ -104,7 +104,7 @@ describe('CodeActionsProcessor', () => {
|
|
|
104
104
|
`);
|
|
105
105
|
program.validate();
|
|
106
106
|
//we should only get each file import suggestion exactly once
|
|
107
|
-
const codeActions = program.getCodeActions(componentCommonFile.
|
|
107
|
+
const codeActions = program.getCodeActions(componentCommonFile.srcPath,
|
|
108
108
|
// doSome|thing()
|
|
109
109
|
util_1.util.createRange(2, 22, 2, 22));
|
|
110
110
|
(0, chai_1.expect)(codeActions.map(x => x.title).sort()).to.eql([
|
|
@@ -133,7 +133,7 @@ describe('CodeActionsProcessor', () => {
|
|
|
133
133
|
`);
|
|
134
134
|
program.validate();
|
|
135
135
|
//there should be no code actions since this is a brs file
|
|
136
|
-
const codeActions = program.getCodeActions(file.
|
|
136
|
+
const codeActions = program.getCodeActions(file.srcPath,
|
|
137
137
|
// DoSometh|ing()
|
|
138
138
|
util_1.util.createRange(2, 28, 2, 28));
|
|
139
139
|
(0, chai_1.expect)(codeActions).to.be.empty;
|
|
@@ -156,7 +156,7 @@ describe('CodeActionsProcessor', () => {
|
|
|
156
156
|
end class
|
|
157
157
|
`);
|
|
158
158
|
program.validate();
|
|
159
|
-
(0, chai_1.expect)(program.getCodeActions(file.
|
|
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"`
|
|
@@ -183,7 +183,7 @@ describe('CodeActionsProcessor', () => {
|
|
|
183
183
|
end namespace
|
|
184
184
|
`);
|
|
185
185
|
program.validate();
|
|
186
|
-
(0, chai_1.expect)(program.getCodeActions(file.
|
|
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,IAAA,sBAAC,EAAA,GAAG,OAAO,CAAC,GAAG,EAAE,eAAe,CAAC;AACjD,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IAClC,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,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,0BAA0B,EAAE,GAAG,EAAE;YAChC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,sBAAsB,EAAE,IAAA,uBAAI,EAAA;;;;aAIxD,CAAC,CAAC;YACH,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAA,oCAAiB,EAAC,GAAG,EAAE;gBACnB,OAAO,CAAC,cAAc,CAClB,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"CodeActionsProcessor.spec.js","sourceRoot":"","sources":["../../../src/bscPlugin/codeActions/CodeActionsProcessor.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,33 +60,44 @@ class BrsFileSemanticTokensProcessor {
|
|
|
60
60
|
handleEnums() {
|
|
61
61
|
var _a, _b, _c;
|
|
62
62
|
const enumLookup = (_a = this.event.file.program.getFirstScopeForFile(this.event.file)) === null || _a === void 0 ? void 0 : _a.getEnumMap();
|
|
63
|
-
for (const
|
|
64
|
-
const
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
63
|
+
for (const referenceExpression of this.event.file.parser.references.expressions) {
|
|
64
|
+
const actualExpressions = [];
|
|
65
|
+
//binary expressions actually have two expressions (left and right), so handle them independently
|
|
66
|
+
if ((0, reflection_1.isBinaryExpression)(referenceExpression)) {
|
|
67
|
+
actualExpressions.push(referenceExpression.left, referenceExpression.right);
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
//assume all other expressions are a single chain
|
|
71
|
+
actualExpressions.push(referenceExpression);
|
|
72
|
+
}
|
|
73
|
+
for (const expression of actualExpressions) {
|
|
74
|
+
const parts = (_b = util_1.default.getAllDottedGetParts(expression)) === null || _b === void 0 ? void 0 : _b.map(x => x.toLowerCase());
|
|
75
|
+
if (parts) {
|
|
76
|
+
//discard the enum member name
|
|
77
|
+
const memberName = parts.pop();
|
|
78
|
+
//get the name of the enum (including leading namespace if applicable)
|
|
79
|
+
const enumName = parts.join('.');
|
|
80
|
+
const lowerEnumName = enumName.toLowerCase();
|
|
81
|
+
const theEnum = (_c = enumLookup.get(lowerEnumName)) === null || _c === void 0 ? void 0 : _c.item;
|
|
82
|
+
if (theEnum) {
|
|
83
|
+
const tokens = util_1.default.splitGetRange('.', lowerEnumName + '.' + memberName, expression.range);
|
|
84
|
+
//enum member name
|
|
85
|
+
this.event.semanticTokens.push({
|
|
86
|
+
range: tokens.pop().range,
|
|
87
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enumMember
|
|
88
|
+
});
|
|
89
|
+
//enum name
|
|
86
90
|
this.event.semanticTokens.push({
|
|
87
|
-
range:
|
|
88
|
-
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.
|
|
91
|
+
range: tokens.pop().range,
|
|
92
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enum
|
|
89
93
|
});
|
|
94
|
+
//namespace parts
|
|
95
|
+
for (const token of tokens) {
|
|
96
|
+
this.event.semanticTokens.push({
|
|
97
|
+
range: token.range,
|
|
98
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
99
|
+
});
|
|
100
|
+
}
|
|
90
101
|
}
|
|
91
102
|
}
|
|
92
103
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrsFileSemanticTokensProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.ts"],"names":[],"mappings":";;;AACA,mFAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"BrsFileSemanticTokensProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ describe('BrsFileSemanticTokensProcessor', () => {
|
|
|
30
30
|
`);
|
|
31
31
|
program.validate();
|
|
32
32
|
(0, testHelpers_spec_1.expectZeroDiagnostics)(program);
|
|
33
|
-
(0, chai_1.expect)(program.getSemanticTokens(file.
|
|
33
|
+
(0, chai_1.expect)(program.getSemanticTokens(file.srcPath)).to.eql([{
|
|
34
34
|
range: util_1.util.createRange(7, 34, 7, 44),
|
|
35
35
|
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
36
36
|
}, {
|
|
@@ -55,7 +55,7 @@ describe('BrsFileSemanticTokensProcessor', () => {
|
|
|
55
55
|
`);
|
|
56
56
|
program.validate();
|
|
57
57
|
(0, testHelpers_spec_1.expectZeroDiagnostics)(program);
|
|
58
|
-
(0, chai_1.expect)(util_1.util.sortByRange(program.getSemanticTokens(file.
|
|
58
|
+
(0, chai_1.expect)(util_1.util.sortByRange(program.getSemanticTokens(file.srcPath))).to.eql([{
|
|
59
59
|
range: util_1.util.createRange(2, 22, 2, 32),
|
|
60
60
|
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
61
61
|
}, {
|
|
@@ -69,5 +69,62 @@ describe('BrsFileSemanticTokensProcessor', () => {
|
|
|
69
69
|
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enumMember
|
|
70
70
|
}]);
|
|
71
71
|
});
|
|
72
|
+
it('matches each namespace section for enum', () => {
|
|
73
|
+
const file = program.setFile('source/main.bs', `
|
|
74
|
+
sub main()
|
|
75
|
+
print Sentients.Humanoids.HumanoidType.Cylon
|
|
76
|
+
end sub
|
|
77
|
+
namespace Sentients.Humanoids
|
|
78
|
+
enum HumanoidType
|
|
79
|
+
Human
|
|
80
|
+
Alien
|
|
81
|
+
Cylon
|
|
82
|
+
end enum
|
|
83
|
+
end namespace
|
|
84
|
+
`);
|
|
85
|
+
program.validate();
|
|
86
|
+
(0, testHelpers_spec_1.expectZeroDiagnostics)(program);
|
|
87
|
+
(0, chai_1.expect)(util_1.util.sortByRange(program.getSemanticTokens(file.srcPath))).to.eql([{
|
|
88
|
+
range: util_1.util.createRange(2, 22, 2, 31),
|
|
89
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
90
|
+
}, {
|
|
91
|
+
range: util_1.util.createRange(2, 32, 2, 41),
|
|
92
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
93
|
+
}, {
|
|
94
|
+
range: util_1.util.createRange(2, 42, 2, 54),
|
|
95
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enum
|
|
96
|
+
}, {
|
|
97
|
+
range: util_1.util.createRange(2, 55, 2, 60),
|
|
98
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enumMember
|
|
99
|
+
}]);
|
|
100
|
+
});
|
|
101
|
+
it('matches enums in if statements', () => {
|
|
102
|
+
const file = program.setFile('source/main.bs', `
|
|
103
|
+
sub main()
|
|
104
|
+
if Humanoids.HumanoidType.Cylon = "Cylon" then
|
|
105
|
+
print true
|
|
106
|
+
end if
|
|
107
|
+
end sub
|
|
108
|
+
namespace Humanoids
|
|
109
|
+
enum HumanoidType
|
|
110
|
+
Human = "Human"
|
|
111
|
+
Alien = "Alien"
|
|
112
|
+
Cylon = "Cylon"
|
|
113
|
+
end enum
|
|
114
|
+
end namespace
|
|
115
|
+
`);
|
|
116
|
+
program.validate();
|
|
117
|
+
(0, testHelpers_spec_1.expectZeroDiagnostics)(program);
|
|
118
|
+
(0, chai_1.expect)(util_1.util.sortByRange(program.getSemanticTokens(file.srcPath))).to.eql([{
|
|
119
|
+
range: util_1.util.createRange(2, 19, 2, 28),
|
|
120
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.namespace
|
|
121
|
+
}, {
|
|
122
|
+
range: util_1.util.createRange(2, 29, 2, 41),
|
|
123
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enum
|
|
124
|
+
}, {
|
|
125
|
+
range: util_1.util.createRange(2, 42, 2, 47),
|
|
126
|
+
tokenType: vscode_languageserver_protocol_1.SemanticTokenTypes.enumMember
|
|
127
|
+
}]);
|
|
128
|
+
});
|
|
72
129
|
});
|
|
73
130
|
//# sourceMappingURL=BrsFileSemanticTokensProcessor.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrsFileSemanticTokensProcessor.spec.js","sourceRoot":"","sources":["../../../src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,mFAAoE;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,0CAA0C,EAAE,GAAG,EAAE;QAChD,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,
|
|
1
|
+
{"version":3,"file":"BrsFileSemanticTokensProcessor.spec.js","sourceRoot":"","sources":["../../../src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,7 +80,7 @@ class ScopeValidator {
|
|
|
80
80
|
if (!value) {
|
|
81
81
|
diagnostics.push(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.unknownEnumValue(memberName, theEnum.fullName)), { range: expression.name.range, relatedInformation: [{
|
|
82
82
|
message: 'Enum declared here',
|
|
83
|
-
location: vscode_languageserver_1.Location.create(vscode_uri_1.URI.file(file.
|
|
83
|
+
location: vscode_languageserver_1.Location.create(vscode_uri_1.URI.file(file.srcPath).toString(), theEnum.tokens.name.range)
|
|
84
84
|
}] }));
|
|
85
85
|
}
|
|
86
86
|
}
|
|
@@ -106,13 +106,13 @@ class ScopeValidator {
|
|
|
106
106
|
//now that we've collected all enum declarations, flag duplicates
|
|
107
107
|
for (const enumLocations of enumLocationsByName.values()) {
|
|
108
108
|
//sort by srcPath to keep the primary enum location consistent
|
|
109
|
-
enumLocations.sort((a, b) => { var _a, _b, _c; return (_b = (_a = a.file) === null || _a === void 0 ? void 0 : _a.
|
|
109
|
+
enumLocations.sort((a, b) => { var _a, _b, _c; return (_b = (_a = a.file) === null || _a === void 0 ? void 0 : _a.srcPath) === null || _b === void 0 ? void 0 : _b.localeCompare((_c = b.file) === null || _c === void 0 ? void 0 : _c.srcPath); });
|
|
110
110
|
const primaryEnum = enumLocations.shift();
|
|
111
111
|
const fullName = primaryEnum.statement.fullName;
|
|
112
112
|
for (const duplicateEnumInfo of enumLocations) {
|
|
113
113
|
diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.duplicateEnumDeclaration(event.scope.name, fullName)), { file: duplicateEnumInfo.file, range: duplicateEnumInfo.statement.tokens.name.range, relatedInformation: [{
|
|
114
114
|
message: 'Enum declared here',
|
|
115
|
-
location: vscode_languageserver_1.Location.create(vscode_uri_1.URI.file(primaryEnum.file.
|
|
115
|
+
location: vscode_languageserver_1.Location.create(vscode_uri_1.URI.file(primaryEnum.file.srcPath).toString(), primaryEnum.statement.tokens.name.range)
|
|
116
116
|
}] }));
|
|
117
117
|
}
|
|
118
118
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScopeValidator.js","sourceRoot":"","sources":["../../../src/bscPlugin/validation/ScopeValidator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ScopeValidator.js","sourceRoot":"","sources":["../../../src/bscPlugin/validation/ScopeValidator.ts"],"names":[],"mappings":"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"}
|
package/dist/cli.js
CHANGED
|
@@ -11,6 +11,7 @@ let options = yargs
|
|
|
11
11
|
.help('help', 'View help information about this tool.')
|
|
12
12
|
.option('create-package', { type: 'boolean', defaultDescription: 'true', description: 'Creates a zip package. This setting is ignored when deploy is enabled.' })
|
|
13
13
|
.option('source-map', { type: 'boolean', defaultDescription: 'false', description: 'Enables generating sourcemap files, which allow debugging tools to show the original source code while running the emitted files.' })
|
|
14
|
+
.option('allow-brighterscript-in-brightscript', { alias: 'allow-brighter-script-in-bright-script', type: 'boolean', defaultDescription: 'false', description: 'Allow brighterscript features (classes, interfaces, etc...) to be included in BrightScript (`.brs`) files, and force those files to be transpiled..' })
|
|
14
15
|
.option('cwd', { type: 'string', description: 'Override the current working directory.' })
|
|
15
16
|
.option('copy-to-staging', { type: 'boolean', defaultDescription: 'true', description: 'Copy project files into the staging folder, ready to be packaged.' })
|
|
16
17
|
.option('diagnostic-level', { type: 'string', defaultDescription: '"warn"', description: 'Specify what diagnostic types should be printed to the console. Value can be "error", "warn", "hint", "info".' })
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,12 +15,13 @@ let sinon = sinonImport.createSandbox();
|
|
|
15
15
|
describe('BrsFile BrighterScript classes', () => {
|
|
16
16
|
let tmpPath = (0, util_1.standardizePath) `${process.cwd()}/.tmp`;
|
|
17
17
|
let rootDir = (0, util_1.standardizePath) `${tmpPath}/rootDir`;
|
|
18
|
+
const stagingDir = (0, util_1.standardizePath) `${tmpPath}/staging`;
|
|
18
19
|
let program;
|
|
19
20
|
let testTranspile = (0, testHelpers_spec_1.getTestTranspile)(() => [program, rootDir]);
|
|
20
21
|
beforeEach(() => {
|
|
21
22
|
fsExtra.ensureDirSync(rootDir);
|
|
22
23
|
fsExtra.emptyDirSync(tmpPath);
|
|
23
|
-
program = new Program_1.Program({ rootDir: rootDir });
|
|
24
|
+
program = new Program_1.Program({ rootDir: rootDir, stagingFolderPath: stagingDir });
|
|
24
25
|
});
|
|
25
26
|
afterEach(() => {
|
|
26
27
|
sinon.restore();
|
|
@@ -173,6 +174,21 @@ describe('BrsFile BrighterScript classes', () => {
|
|
|
173
174
|
});
|
|
174
175
|
});
|
|
175
176
|
describe('transpile', () => {
|
|
177
|
+
it('does not mess with AST when injecting `super()` call', async () => {
|
|
178
|
+
const file = program.setFile('source/classes.bs', `
|
|
179
|
+
class Parent
|
|
180
|
+
end class
|
|
181
|
+
|
|
182
|
+
class Child extends parent
|
|
183
|
+
sub new()
|
|
184
|
+
super()
|
|
185
|
+
end sub
|
|
186
|
+
end class
|
|
187
|
+
`);
|
|
188
|
+
(0, chai_1.expect)(file.ast.statements[1].body[0].func.body.statements[0].expression.callee.name.text).to.eql('super');
|
|
189
|
+
await program.transpile([], stagingDir);
|
|
190
|
+
(0, chai_1.expect)(file.ast.statements[1].body[0].func.body.statements[0].expression.callee.name.text).to.eql('super');
|
|
191
|
+
});
|
|
176
192
|
it('follows correct sequence for property initializers', () => {
|
|
177
193
|
testTranspile(`
|
|
178
194
|
class Animal
|
|
@@ -495,6 +511,71 @@ describe('BrsFile BrighterScript classes', () => {
|
|
|
495
511
|
end sub
|
|
496
512
|
`, undefined, 'source/main.bs');
|
|
497
513
|
});
|
|
514
|
+
it('calls super ', () => {
|
|
515
|
+
const { file } = testTranspile(`
|
|
516
|
+
class Parent
|
|
517
|
+
sub new()
|
|
518
|
+
end sub
|
|
519
|
+
end class
|
|
520
|
+
class Child extends Parent
|
|
521
|
+
sub new()
|
|
522
|
+
end sub
|
|
523
|
+
end class
|
|
524
|
+
`, `
|
|
525
|
+
function __Parent_builder()
|
|
526
|
+
instance = {}
|
|
527
|
+
instance.new = sub()
|
|
528
|
+
end sub
|
|
529
|
+
return instance
|
|
530
|
+
end function
|
|
531
|
+
function Parent()
|
|
532
|
+
instance = __Parent_builder()
|
|
533
|
+
instance.new()
|
|
534
|
+
return instance
|
|
535
|
+
end function
|
|
536
|
+
function __Child_builder()
|
|
537
|
+
instance = __Parent_builder()
|
|
538
|
+
instance.super0_new = instance.new
|
|
539
|
+
instance.new = sub()
|
|
540
|
+
m.super0_new()
|
|
541
|
+
end sub
|
|
542
|
+
return instance
|
|
543
|
+
end function
|
|
544
|
+
function Child()
|
|
545
|
+
instance = __Child_builder()
|
|
546
|
+
instance.new()
|
|
547
|
+
return instance
|
|
548
|
+
end function
|
|
549
|
+
`, undefined, undefined, false);
|
|
550
|
+
//the AST should not be permanently modified
|
|
551
|
+
const constructor = file.ast.statements[0].body[0];
|
|
552
|
+
(0, chai_1.expect)(constructor.func.body.statements).to.be.lengthOf(0);
|
|
553
|
+
});
|
|
554
|
+
it('adds field initializers', () => {
|
|
555
|
+
const { file } = testTranspile(`
|
|
556
|
+
class Person
|
|
557
|
+
sub new()
|
|
558
|
+
end sub
|
|
559
|
+
name = "Bob"
|
|
560
|
+
end class
|
|
561
|
+
`, `
|
|
562
|
+
function __Person_builder()
|
|
563
|
+
instance = {}
|
|
564
|
+
instance.new = sub()
|
|
565
|
+
m.name = "Bob"
|
|
566
|
+
end sub
|
|
567
|
+
return instance
|
|
568
|
+
end function
|
|
569
|
+
function Person()
|
|
570
|
+
instance = __Person_builder()
|
|
571
|
+
instance.new()
|
|
572
|
+
return instance
|
|
573
|
+
end function
|
|
574
|
+
`);
|
|
575
|
+
//the AST should not be permanently modified
|
|
576
|
+
const constructor = file.ast.statements[0].body[0];
|
|
577
|
+
(0, chai_1.expect)(constructor.func.body.statements).to.be.lengthOf(0);
|
|
578
|
+
});
|
|
498
579
|
it('does not screw up local variable references', () => {
|
|
499
580
|
testTranspile(`
|
|
500
581
|
class Animal
|
|
@@ -1153,7 +1234,7 @@ describe('BrsFile BrighterScript classes', () => {
|
|
|
1153
1234
|
end class
|
|
1154
1235
|
`);
|
|
1155
1236
|
(0, assert_1.doesNotThrow)(() => {
|
|
1156
|
-
file.parser.references.classStatements[0]
|
|
1237
|
+
file.parser.references.classStatements[0]['getParentClassIndex'](new BrsTranspileState_1.BrsTranspileState(file));
|
|
1157
1238
|
});
|
|
1158
1239
|
});
|
|
1159
1240
|
it('does not crash when child has field with same name as sub in parent', () => {
|