brighterscript 0.68.5 → 0.69.1

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.
Files changed (114) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/BusyStatusTracker.d.ts +37 -7
  3. package/dist/BusyStatusTracker.js +73 -8
  4. package/dist/BusyStatusTracker.js.map +1 -1
  5. package/dist/DiagnosticCollection.d.ts +19 -5
  6. package/dist/DiagnosticCollection.js +67 -16
  7. package/dist/DiagnosticCollection.js.map +1 -1
  8. package/dist/LanguageServer.d.ts +82 -132
  9. package/dist/LanguageServer.js +403 -940
  10. package/dist/LanguageServer.js.map +1 -1
  11. package/dist/Logger.d.ts +9 -4
  12. package/dist/Logger.js +30 -6
  13. package/dist/Logger.js.map +1 -1
  14. package/dist/PluginInterface.d.ts +1 -1
  15. package/dist/PluginInterface.js.map +1 -1
  16. package/dist/Program.d.ts +20 -2
  17. package/dist/Program.js +124 -49
  18. package/dist/Program.js.map +1 -1
  19. package/dist/ProgramBuilder.d.ts +13 -6
  20. package/dist/ProgramBuilder.js +25 -15
  21. package/dist/ProgramBuilder.js.map +1 -1
  22. package/dist/Scope.js +6 -3
  23. package/dist/Scope.js.map +1 -1
  24. package/dist/SemanticTokenUtils.js +1 -1
  25. package/dist/SemanticTokenUtils.js.map +1 -1
  26. package/dist/bscPlugin/CallExpressionInfo.js +2 -1
  27. package/dist/bscPlugin/CallExpressionInfo.js.map +1 -1
  28. package/dist/bscPlugin/completions/CompletionsProcessor.js +14 -4
  29. package/dist/bscPlugin/completions/CompletionsProcessor.js.map +1 -1
  30. package/dist/bscPlugin/hover/HoverProcessor.js +1 -1
  31. package/dist/bscPlugin/hover/HoverProcessor.js.map +1 -1
  32. package/dist/bscPlugin/validation/ScopeValidator.js +9 -9
  33. package/dist/bscPlugin/validation/ScopeValidator.js.map +1 -1
  34. package/dist/common/Sequencer.d.ts +27 -0
  35. package/dist/common/Sequencer.js +113 -0
  36. package/dist/common/Sequencer.js.map +1 -0
  37. package/dist/common/Sequencer.spec.d.ts +1 -0
  38. package/dist/common/Sequencer.spec.js +75 -0
  39. package/dist/common/Sequencer.spec.js.map +1 -0
  40. package/dist/deferred.d.ts +2 -0
  41. package/dist/deferred.js +10 -0
  42. package/dist/deferred.js.map +1 -1
  43. package/dist/files/BrsFile.d.ts +1 -1
  44. package/dist/files/BrsFile.js +10 -15
  45. package/dist/files/BrsFile.js.map +1 -1
  46. package/dist/files/BrsFile.spec.js +8 -0
  47. package/dist/files/BrsFile.spec.js.map +1 -1
  48. package/dist/interfaces.d.ts +22 -2
  49. package/dist/lexer/Lexer.js +1 -1
  50. package/dist/lexer/Lexer.js.map +1 -1
  51. package/dist/logging.d.ts +6 -1
  52. package/dist/logging.js +14 -1
  53. package/dist/logging.js.map +1 -1
  54. package/dist/lsp/ActionQueue.d.ts +35 -0
  55. package/dist/lsp/ActionQueue.js +115 -0
  56. package/dist/lsp/ActionQueue.js.map +1 -0
  57. package/dist/lsp/ActionQueue.spec.d.ts +1 -0
  58. package/dist/lsp/ActionQueue.spec.js +80 -0
  59. package/dist/lsp/ActionQueue.spec.js.map +1 -0
  60. package/dist/lsp/DocumentManager.d.ts +63 -0
  61. package/dist/lsp/DocumentManager.js +122 -0
  62. package/dist/lsp/DocumentManager.js.map +1 -0
  63. package/dist/lsp/DocumentManager.spec.d.ts +1 -0
  64. package/dist/lsp/DocumentManager.spec.js +103 -0
  65. package/dist/lsp/DocumentManager.spec.js.map +1 -0
  66. package/dist/lsp/LspProject.d.ts +231 -0
  67. package/dist/lsp/LspProject.js +3 -0
  68. package/dist/lsp/LspProject.js.map +1 -0
  69. package/dist/lsp/PathFilterer.d.ts +75 -0
  70. package/dist/lsp/PathFilterer.js +196 -0
  71. package/dist/lsp/PathFilterer.js.map +1 -0
  72. package/dist/lsp/PathFilterer.spec.d.ts +1 -0
  73. package/dist/lsp/PathFilterer.spec.js +182 -0
  74. package/dist/lsp/PathFilterer.spec.js.map +1 -0
  75. package/dist/lsp/Project.d.ts +178 -0
  76. package/dist/lsp/Project.js +438 -0
  77. package/dist/lsp/Project.js.map +1 -0
  78. package/dist/lsp/Project.spec.d.ts +1 -0
  79. package/dist/lsp/Project.spec.js +236 -0
  80. package/dist/lsp/Project.spec.js.map +1 -0
  81. package/dist/lsp/ProjectManager.d.ts +221 -0
  82. package/dist/lsp/ProjectManager.js +735 -0
  83. package/dist/lsp/ProjectManager.js.map +1 -0
  84. package/dist/lsp/ProjectManager.spec.d.ts +1 -0
  85. package/dist/lsp/ProjectManager.spec.js +756 -0
  86. package/dist/lsp/ProjectManager.spec.js.map +1 -0
  87. package/dist/lsp/ReaderWriterManager.d.ts +21 -0
  88. package/dist/lsp/ReaderWriterManager.js +60 -0
  89. package/dist/lsp/ReaderWriterManager.js.map +1 -0
  90. package/dist/lsp/worker/MessageHandler.d.ts +99 -0
  91. package/dist/lsp/worker/MessageHandler.js +138 -0
  92. package/dist/lsp/worker/MessageHandler.js.map +1 -0
  93. package/dist/lsp/worker/MessageHandler.spec.d.ts +1 -0
  94. package/dist/lsp/worker/MessageHandler.spec.js +64 -0
  95. package/dist/lsp/worker/MessageHandler.spec.js.map +1 -0
  96. package/dist/lsp/worker/WorkerPool.d.ts +38 -0
  97. package/dist/lsp/worker/WorkerPool.js +78 -0
  98. package/dist/lsp/worker/WorkerPool.js.map +1 -0
  99. package/dist/lsp/worker/WorkerPool.spec.d.ts +1 -0
  100. package/dist/lsp/worker/WorkerPool.spec.js +59 -0
  101. package/dist/lsp/worker/WorkerPool.spec.js.map +1 -0
  102. package/dist/lsp/worker/WorkerThreadProject.d.ts +144 -0
  103. package/dist/lsp/worker/WorkerThreadProject.js +183 -0
  104. package/dist/lsp/worker/WorkerThreadProject.js.map +1 -0
  105. package/dist/lsp/worker/WorkerThreadProject.spec.d.ts +2 -0
  106. package/dist/lsp/worker/WorkerThreadProject.spec.js +68 -0
  107. package/dist/lsp/worker/WorkerThreadProject.spec.js.map +1 -0
  108. package/dist/lsp/worker/WorkerThreadProjectRunner.d.ts +15 -0
  109. package/dist/lsp/worker/WorkerThreadProjectRunner.js +58 -0
  110. package/dist/lsp/worker/WorkerThreadProjectRunner.js.map +1 -0
  111. package/dist/util.d.ts +32 -5
  112. package/dist/util.js +117 -19
  113. package/dist/util.js.map +1 -1
  114. package/package.json +13 -3
@@ -1 +1 @@
1
- {"version":3,"file":"SemanticTokenUtils.js","sourceRoot":"","sources":["../src/SemanticTokenUtils.ts"],"names":[],"mappings":";;;AAGA,8DAG6C;AAC7C,qDAAmE;AAInE,iCAA0B;AAEb,QAAA,oBAAoB,GAAG;IAChC,UAAU,EAAE;QACR,yBAAkB,CAAC,SAAS;QAC5B,yBAAkB,CAAC,IAAI;QACvB,yBAAkB,CAAC,KAAK;QACxB,yBAAkB,CAAC,IAAI;QACvB,yBAAkB,CAAC,SAAS;QAC5B,yBAAkB,CAAC,MAAM;QACzB,yBAAkB,CAAC,aAAa;QAChC,yBAAkB,CAAC,SAAS;QAC5B,yBAAkB,CAAC,QAAQ;QAC3B,yBAAkB,CAAC,QAAQ;QAC3B,yBAAkB,CAAC,UAAU;QAC7B,yBAAkB,CAAC,KAAK;QACxB,yBAAkB,CAAC,QAAQ;QAC3B,yBAAkB,CAAC,MAAM;QACzB,yBAAkB,CAAC,KAAK;QACxB,yBAAkB,CAAC,OAAO;QAC1B,yBAAkB,CAAC,QAAQ;QAC3B,yBAAkB,CAAC,OAAO;QAC1B,yBAAkB,CAAC,MAAM;QACzB,yBAAkB,CAAC,MAAM;QACzB,yBAAkB,CAAC,MAAM;QACzB,yBAAkB,CAAC,QAAQ;KAC9B;IACD,cAAc,EAAE;QACZ,6BAAsB,CAAC,WAAW;QAClC,6BAAsB,CAAC,UAAU;QACjC,6BAAsB,CAAC,QAAQ;QAC/B,6BAAsB,CAAC,MAAM;QAC7B,6BAAsB,CAAC,UAAU;QACjC,6BAAsB,CAAC,QAAQ;QAC/B,6BAAsB,CAAC,KAAK;QAC5B,6BAAsB,CAAC,YAAY;QACnC,6BAAsB,CAAC,aAAa;QACpC,6BAAsB,CAAC,cAAc;KACxC;CACoB,CAAC;AAE1B;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,MAAuB;IACxD,cAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACzB,MAAM,OAAO,GAAG,IAAI,4BAAqB,EAAE,CAAC;IAC5C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QACxB,OAAO,CAAC,IAAI,CACR,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EACtB,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAC3B,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS;QACvD,kBAAkB;QAClB,4BAAoB,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC;QACxD,oBAAoB;QACpB,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,mBAAmB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CACvE,CAAC;KACL;IACD,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC;AAChC,CAAC;AAfD,oDAeC;AAED;;GAEG;AACH,SAAgB,mBAAmB,CAAC,SAAmC;IACnE,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAC9B,MAAM,GAAG,GAAG,4BAAoB,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAClE,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,qCAAqC,QAAQ,GAAG,CAAC,CAAC;SACrE;QAED,4FAA4F;QAC5F,gEAAgE;QAChE,sCAAsC;QACtC,MAAM,IAAI,CAAC,IAAI,GAAG,CAAC;KACtB;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAdD,kDAcC"}
1
+ {"version":3,"file":"SemanticTokenUtils.js","sourceRoot":"","sources":["../src/SemanticTokenUtils.ts"],"names":[],"mappings":";;;AAGA,8DAG6C;AAC7C,qDAAmE;AAInE,iCAA0B;AAEb,QAAA,oBAAoB,GAAG;IAChC,UAAU,EAAE;QACR,yBAAkB,CAAC,SAAS;QAC5B,yBAAkB,CAAC,IAAI;QACvB,yBAAkB,CAAC,KAAK;QACxB,yBAAkB,CAAC,IAAI;QACvB,yBAAkB,CAAC,SAAS;QAC5B,yBAAkB,CAAC,MAAM;QACzB,yBAAkB,CAAC,aAAa;QAChC,yBAAkB,CAAC,SAAS;QAC5B,yBAAkB,CAAC,QAAQ;QAC3B,yBAAkB,CAAC,QAAQ;QAC3B,yBAAkB,CAAC,UAAU;QAC7B,yBAAkB,CAAC,KAAK;QACxB,yBAAkB,CAAC,QAAQ;QAC3B,yBAAkB,CAAC,MAAM;QACzB,yBAAkB,CAAC,KAAK;QACxB,yBAAkB,CAAC,OAAO;QAC1B,yBAAkB,CAAC,QAAQ;QAC3B,yBAAkB,CAAC,OAAO;QAC1B,yBAAkB,CAAC,MAAM;QACzB,yBAAkB,CAAC,MAAM;QACzB,yBAAkB,CAAC,MAAM;QACzB,yBAAkB,CAAC,QAAQ;KAC9B;IACD,cAAc,EAAE;QACZ,6BAAsB,CAAC,WAAW;QAClC,6BAAsB,CAAC,UAAU;QACjC,6BAAsB,CAAC,QAAQ;QAC/B,6BAAsB,CAAC,MAAM;QAC7B,6BAAsB,CAAC,UAAU;QACjC,6BAAsB,CAAC,QAAQ;QAC/B,6BAAsB,CAAC,KAAK;QAC5B,6BAAsB,CAAC,YAAY;QACnC,6BAAsB,CAAC,aAAa;QACpC,6BAAsB,CAAC,cAAc;KACxC;CACoB,CAAC;AAE1B;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,MAAuB;IACxD,cAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACzB,MAAM,OAAO,GAAG,IAAI,4BAAqB,EAAE,CAAC;IAC5C,KAAK,MAAM,KAAK,IAAI,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,EAAE;QAC9B,OAAO,CAAC,IAAI,CACR,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EACtB,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAC3B,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS;QACvD,kBAAkB;QAClB,4BAAoB,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC;QACxD,oBAAoB;QACpB,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,mBAAmB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CACvE,CAAC;KACL;IACD,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC;AAChC,CAAC;AAfD,oDAeC;AAED;;GAEG;AACH,SAAgB,mBAAmB,CAAC,SAAmC;IACnE,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAC9B,MAAM,GAAG,GAAG,4BAAoB,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAClE,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,qCAAqC,QAAQ,GAAG,CAAC,CAAC;SACrE;QAED,4FAA4F;QAC5F,gEAAgE;QAChE,sCAAsC;QACtC,MAAM,IAAI,CAAC,IAAI,GAAG,CAAC;KACtB;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAdD,kDAcC"}
@@ -69,6 +69,7 @@ class CallExpressionInfo {
69
69
  return util_1.util.rangeContains(boundingRange, this.position);
70
70
  }
71
71
  ascertainCallExpression() {
72
+ var _a;
72
73
  let expression = this.expression;
73
74
  function isCallFuncOrCallExpression(expression) {
74
75
  return (0, reflection_1.isCallfuncExpression)(expression) || (0, reflection_1.isCallExpression)(expression);
@@ -78,7 +79,7 @@ class CallExpressionInfo {
78
79
  //this expression is the NAME of a CallExpression
79
80
  callExpression = expression.parent.findAncestor(isCallFuncOrCallExpression);
80
81
  }
81
- else if ((0, reflection_1.isDottedGetExpression)(expression.parent) && expression.parent.parent === callExpression) {
82
+ else if ((0, reflection_1.isDottedGetExpression)(expression.parent) && ((_a = expression === null || expression === void 0 ? void 0 : expression.parent) === null || _a === void 0 ? void 0 : _a.parent) === callExpression) {
82
83
  callExpression = callExpression.findAncestor(isCallFuncOrCallExpression);
83
84
  }
84
85
  if (!callExpression && (0, reflection_1.isCallExpression)(expression)) {
@@ -1 +1 @@
1
- {"version":3,"file":"CallExpressionInfo.js","sourceRoot":"","sources":["../../src/bscPlugin/CallExpressionInfo.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CallExpressionInfo.js","sourceRoot":"","sources":["../../src/bscPlugin/CallExpressionInfo.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ exports.CompletionsProcessor = void 0;
4
4
  const reflection_1 = require("../../astUtils/reflection");
5
5
  const TokenKind_1 = require("../../lexer/TokenKind");
6
6
  const util_1 = require("../../util");
7
+ const thenby_1 = require("thenby");
7
8
  class CompletionsProcessor {
8
9
  constructor(event) {
9
10
  this.event = event;
@@ -27,12 +28,21 @@ class CompletionsProcessor {
27
28
  //no other result is possible in this case
28
29
  return;
29
30
  }
30
- //find the scopes for this file
31
- let scopesForFile = this.event.program.getScopesForFile(this.event.file);
31
+ //find the scopes for this file (sort by name so these results are always consistent)
32
+ let scopesForFile = this.event.program.getScopesForFile(this.event.file).sort((0, thenby_1.firstBy)(x => x.name));
32
33
  //if there are no scopes, include the global scope so we at least get the built-in functions
33
34
  scopesForFile = scopesForFile.length > 0 ? scopesForFile : [this.event.program.globalScope];
35
+ // Only process the first few scopes. This might result in missing completions,
36
+ // but it's better than wasting TONS of cycles building essentially the same completions over and over
37
+ const scopesToProcess = scopesForFile.slice(0, 3);
38
+ // always include the source scope if applicable to this file
39
+ let sourceScope = scopesForFile.find(x => x.name === 'source');
40
+ if (sourceScope && !scopesToProcess.includes(sourceScope)) {
41
+ //replace the first scope with the source scope so we always process exactly 3 scopes
42
+ scopesToProcess[0] = sourceScope;
43
+ }
34
44
  //get the completions from all scopes for this file
35
- let allCompletions = util_1.util.flatMap(scopesForFile.map(scope => {
45
+ let allCompletions = util_1.util.flatMap(scopesToProcess.map(scope => {
36
46
  return this.event.file.getCompletions(this.event.position, scope);
37
47
  }), c => c);
38
48
  //only keep completions common to every scope for this file
@@ -40,7 +50,7 @@ class CompletionsProcessor {
40
50
  for (let completion of allCompletions) {
41
51
  let key = `${completion.label}-${completion.kind}`;
42
52
  keyCounts.set(key, keyCounts.has(key) ? keyCounts.get(key) + 1 : 1);
43
- if (keyCounts.get(key) === scopesForFile.length) {
53
+ if (keyCounts.get(key) === scopesToProcess.length) {
44
54
  this.event.completions.push(completion);
45
55
  }
46
56
  }
@@ -1 +1 @@
1
- {"version":3,"file":"CompletionsProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/completions/CompletionsProcessor.ts"],"names":[],"mappings":";;;AAAA,0DAAkE;AAElE,qDAAkD;AAElD,qCAAkC;AAElC,MAAa,oBAAoB;IAC7B,YACY,KAA8B;QAA9B,UAAK,GAAL,KAAK,CAAyB;IAG1C,CAAC;IAEM,OAAO;QACV,IAAI,gBAAgB,GAAG,EAAE,CAAC;QAC1B,IAAI,IAAA,sBAAS,EAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,qBAAS,CAAC,QAAQ,CAAC,EAAE;YAClH,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,uBAAU,EAAC,CAAC,CAAC,CAAe,CAAC;YAC5F,qEAAqE;YACrE,qFAAqF;YACrF,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE;gBAC3B,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;gBAClE,KAAK,IAAI,QAAQ,IAAI,SAAS,EAAE;oBAC5B,IAAI,QAAQ,GAAG,KAAK,CAAC,qCAAqC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;oBAC1E,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;wBAC5C,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;wBACtC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;qBACzC;iBACJ;aACJ;YACD,0CAA0C;YAC1C,OAAO;SACV;QAED,+BAA+B;QAC/B,IAAI,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEzE,4FAA4F;QAC5F,aAAa,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAE5F,mDAAmD;QACnD,IAAI,cAAc,GAAG,WAAI,CAAC,OAAO,CAC7B,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACtE,CAAC,CAAC,EACF,CAAC,CAAC,EAAE,CAAC,CAAC,CACT,CAAC;QAEF,2DAA2D;QAC3D,IAAI,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC1C,KAAK,IAAI,UAAU,IAAI,cAAc,EAAE;YACnC,IAAI,GAAG,GAAG,GAAG,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;YACnD,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpE,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,aAAa,CAAC,MAAM,EAAE;gBAC7C,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAC3C;SACJ;IACL,CAAC;CACJ;AAnDD,oDAmDC"}
1
+ {"version":3,"file":"CompletionsProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/completions/CompletionsProcessor.ts"],"names":[],"mappings":";;;AAAA,0DAAkE;AAElE,qDAAkD;AAElD,qCAAkC;AAClC,mCAAiC;AAEjC,MAAa,oBAAoB;IAC7B,YACY,KAA8B;QAA9B,UAAK,GAAL,KAAK,CAAyB;IAG1C,CAAC;IAEM,OAAO;QACV,IAAI,gBAAgB,GAAG,EAAE,CAAC;QAC1B,IAAI,IAAA,sBAAS,EAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,qBAAS,CAAC,QAAQ,CAAC,EAAE;YAClH,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,uBAAU,EAAC,CAAC,CAAC,CAAe,CAAC;YAC5F,qEAAqE;YACrE,qFAAqF;YACrF,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE;gBAC3B,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;gBAClE,KAAK,IAAI,QAAQ,IAAI,SAAS,EAAE;oBAC5B,IAAI,QAAQ,GAAG,KAAK,CAAC,qCAAqC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;oBAC1E,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;wBAC5C,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;wBACtC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;qBACzC;iBACJ;aACJ;YACD,0CAA0C;YAC1C,OAAO;SACV;QAED,qFAAqF;QACrF,IAAI,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAA,gBAAO,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAEpG,4FAA4F;QAC5F,aAAa,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAE5F,+EAA+E;QAC/E,sGAAsG;QACtG,MAAM,eAAe,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAElD,6DAA6D;QAC7D,IAAI,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;QAC/D,IAAI,WAAW,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YACvD,qFAAqF;YACrF,eAAe,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC;SACpC;QAED,mDAAmD;QACnD,IAAI,cAAc,GAAG,WAAI,CAAC,OAAO,CAC7B,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACxB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACtE,CAAC,CAAC,EACF,CAAC,CAAC,EAAE,CAAC,CAAC,CACT,CAAC;QAEF,2DAA2D;QAC3D,IAAI,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC1C,KAAK,IAAI,UAAU,IAAI,cAAc,EAAE;YACnC,IAAI,GAAG,GAAG,GAAG,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;YACnD,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpE,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,eAAe,CAAC,MAAM,EAAE;gBAC/C,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAC3C;SACJ;IACL,CAAC;CACJ;AA9DD,oDA8DC"}
@@ -50,7 +50,7 @@ class HoverProcessor {
50
50
  return undefined;
51
51
  }
52
52
  const expression = file.getClosestExpression(this.event.position);
53
- if (expression) {
53
+ if (expression === null || expression === void 0 ? void 0 : expression.range) {
54
54
  let containingNamespace = (_a = file.getNamespaceStatementForPosition(expression.range.start)) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript);
55
55
  const fullName = (_b = util_1.default.getAllDottedGetParts(expression)) === null || _b === void 0 ? void 0 : _b.map(x => x.text).join('.');
56
56
  //find a constant with this name
@@ -1 +1 @@
1
- {"version":3,"file":"HoverProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/hover/HoverProcessor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"HoverProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/hover/HoverProcessor.ts"],"names":[],"mappings":"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"}
@@ -206,24 +206,24 @@ class ScopeValidator {
206
206
  * do this manually for now.
207
207
  */
208
208
  validateCreateObjectCalls(file) {
209
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
209
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
210
210
  const diagnostics = [];
211
- for (const call of file.functionCalls) {
211
+ for (const call of (_a = file === null || file === void 0 ? void 0 : file.functionCalls) !== null && _a !== void 0 ? _a : []) {
212
212
  //skip non CreateObject function calls
213
- if (((_a = call.name) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== 'createobject' || !(0, reflection_1.isLiteralExpression)((_b = call === null || call === void 0 ? void 0 : call.args[0]) === null || _b === void 0 ? void 0 : _b.expression)) {
213
+ if (((_b = call.name) === null || _b === void 0 ? void 0 : _b.toLowerCase()) !== 'createobject' || !(0, reflection_1.isLiteralExpression)((_c = call === null || call === void 0 ? void 0 : call.args[0]) === null || _c === void 0 ? void 0 : _c.expression)) {
214
214
  continue;
215
215
  }
216
- const firstParamToken = (_d = (_c = call === null || call === void 0 ? void 0 : call.args[0]) === null || _c === void 0 ? void 0 : _c.expression) === null || _d === void 0 ? void 0 : _d.token;
217
- const firstParamStringValue = (_e = firstParamToken === null || firstParamToken === void 0 ? void 0 : firstParamToken.text) === null || _e === void 0 ? void 0 : _e.replace(/"/g, '');
216
+ const firstParamToken = (_e = (_d = call === null || call === void 0 ? void 0 : call.args[0]) === null || _d === void 0 ? void 0 : _d.expression) === null || _e === void 0 ? void 0 : _e.token;
217
+ const firstParamStringValue = (_f = firstParamToken === null || firstParamToken === void 0 ? void 0 : firstParamToken.text) === null || _f === void 0 ? void 0 : _f.replace(/"/g, '');
218
218
  //if this is a `createObject('roSGNode'` call, only support known sg node types
219
- if ((firstParamStringValue === null || firstParamStringValue === void 0 ? void 0 : firstParamStringValue.toLowerCase()) === 'rosgnode' && (0, reflection_1.isLiteralExpression)((_f = call === null || call === void 0 ? void 0 : call.args[1]) === null || _f === void 0 ? void 0 : _f.expression)) {
220
- const componentName = (_h = (_g = call === null || call === void 0 ? void 0 : call.args[1]) === null || _g === void 0 ? void 0 : _g.expression) === null || _h === void 0 ? void 0 : _h.token;
219
+ if ((firstParamStringValue === null || firstParamStringValue === void 0 ? void 0 : firstParamStringValue.toLowerCase()) === 'rosgnode' && (0, reflection_1.isLiteralExpression)((_g = call === null || call === void 0 ? void 0 : call.args[1]) === null || _g === void 0 ? void 0 : _g.expression)) {
220
+ const componentName = (_j = (_h = call === null || call === void 0 ? void 0 : call.args[1]) === null || _h === void 0 ? void 0 : _h.expression) === null || _j === void 0 ? void 0 : _j.token;
221
221
  //don't validate any components with a colon in their name (probably component libraries, but regular components can have them too).
222
- if ((_j = componentName === null || componentName === void 0 ? void 0 : componentName.text) === null || _j === void 0 ? void 0 : _j.includes(':')) {
222
+ if ((_k = componentName === null || componentName === void 0 ? void 0 : componentName.text) === null || _k === void 0 ? void 0 : _k.includes(':')) {
223
223
  continue;
224
224
  }
225
225
  //add diagnostic for unknown components
226
- const unquotedComponentName = (_k = componentName === null || componentName === void 0 ? void 0 : componentName.text) === null || _k === void 0 ? void 0 : _k.replace(/"/g, '');
226
+ const unquotedComponentName = (_l = componentName === null || componentName === void 0 ? void 0 : componentName.text) === null || _l === void 0 ? void 0 : _l.replace(/"/g, '');
227
227
  if (unquotedComponentName && !platformNodeNames.has(unquotedComponentName.toLowerCase()) && !this.event.program.getComponent(unquotedComponentName)) {
228
228
  this.addDiagnosticOnce(Object.assign(Object.assign({ file: file }, DiagnosticMessages_1.DiagnosticMessages.unknownRoSGNode(unquotedComponentName)), { range: componentName.range }));
229
229
  }
@@ -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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"}
@@ -0,0 +1,27 @@
1
+ import type { CancellationToken } from 'vscode-languageserver-protocol';
2
+ /**
3
+ * Supports running a series of actions in sequence, either synchronously or asynchronously
4
+ */
5
+ export declare class Sequencer {
6
+ private options?;
7
+ constructor(options?: {
8
+ name?: string;
9
+ cancellationToken?: CancellationToken;
10
+ /**
11
+ * The number of operations to run before registering a nexttick
12
+ */
13
+ minSyncDuration?: number;
14
+ });
15
+ private get minSyncDuration();
16
+ private actions;
17
+ forEach<T>(items: T[], func: (item: T) => any): this;
18
+ private emitter;
19
+ onCancel(callback: () => void): this;
20
+ onComplete(callback: () => void): this;
21
+ onSuccess(callback: () => void): this;
22
+ once(func: () => any): this;
23
+ run(): Promise<void>;
24
+ runSync(): void;
25
+ private handleCancel;
26
+ private dispose;
27
+ }
@@ -0,0 +1,113 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.Sequencer = void 0;
4
+ const util_1 = require("../util");
5
+ const eventemitter3_1 = require("eventemitter3");
6
+ /**
7
+ * Supports running a series of actions in sequence, either synchronously or asynchronously
8
+ */
9
+ class Sequencer {
10
+ constructor(options) {
11
+ this.options = options;
12
+ // eslint-disable-next-line @typescript-eslint/ban-types
13
+ this.actions = [];
14
+ this.emitter = new eventemitter3_1.EventEmitter();
15
+ }
16
+ get minSyncDuration() {
17
+ var _a, _b;
18
+ return (_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.minSyncDuration) !== null && _b !== void 0 ? _b : 150;
19
+ }
20
+ forEach(items, func) {
21
+ for (const item of items) {
22
+ this.actions.push({
23
+ args: [item],
24
+ func: func
25
+ });
26
+ }
27
+ return this;
28
+ }
29
+ onCancel(callback) {
30
+ this.emitter.on('cancel', callback);
31
+ return this;
32
+ }
33
+ onComplete(callback) {
34
+ this.emitter.on('complete', callback);
35
+ return this;
36
+ }
37
+ onSuccess(callback) {
38
+ this.emitter.on('success', callback);
39
+ return this;
40
+ }
41
+ once(func) {
42
+ this.actions.push({
43
+ args: [],
44
+ func: func
45
+ });
46
+ return this;
47
+ }
48
+ async run() {
49
+ var _a, _b, _c, _d;
50
+ try {
51
+ let start = Date.now();
52
+ for (const action of this.actions) {
53
+ //register a very short timeout between every action so we don't hog the CPU
54
+ if (Date.now() - start > this.minSyncDuration) {
55
+ await util_1.util.sleep(1);
56
+ start = Date.now();
57
+ }
58
+ //if the cancellation token has asked us to cancel, then stop processing now
59
+ if ((_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.cancellationToken) === null || _b === void 0 ? void 0 : _b.isCancellationRequested) {
60
+ return this.handleCancel();
61
+ }
62
+ await Promise.resolve(action.func(...action.args));
63
+ //if the cancellation token has asked us to cancel, then stop processing now
64
+ if ((_d = (_c = this.options) === null || _c === void 0 ? void 0 : _c.cancellationToken) === null || _d === void 0 ? void 0 : _d.isCancellationRequested) {
65
+ return this.handleCancel();
66
+ }
67
+ }
68
+ this.emitter.emit('success');
69
+ }
70
+ catch (e) {
71
+ this.handleCancel();
72
+ throw e;
73
+ }
74
+ finally {
75
+ this.emitter.emit('complete');
76
+ this.dispose();
77
+ }
78
+ }
79
+ runSync() {
80
+ var _a, _b;
81
+ try {
82
+ for (const action of this.actions) {
83
+ //if the cancellation token has asked us to cancel, then stop processing now
84
+ if ((_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.cancellationToken) === null || _b === void 0 ? void 0 : _b.isCancellationRequested) {
85
+ return this.handleCancel();
86
+ }
87
+ const result = action.func(...action.args);
88
+ if (typeof (result === null || result === void 0 ? void 0 : result.then) === 'function') {
89
+ throw new Error(`Action returned a promise which is unsupported when running 'runSync'`);
90
+ }
91
+ }
92
+ this.emitter.emit('success');
93
+ }
94
+ catch (e) {
95
+ this.handleCancel();
96
+ throw e;
97
+ }
98
+ finally {
99
+ this.emitter.emit('complete');
100
+ this.dispose();
101
+ }
102
+ }
103
+ handleCancel() {
104
+ var _a;
105
+ console.log(`Cancelling sequence ${(_a = this.options) === null || _a === void 0 ? void 0 : _a.name}`);
106
+ this.emitter.emit('cancel');
107
+ }
108
+ dispose() {
109
+ this.emitter.removeAllListeners();
110
+ }
111
+ }
112
+ exports.Sequencer = Sequencer;
113
+ //# sourceMappingURL=Sequencer.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Sequencer.js","sourceRoot":"","sources":["../../src/common/Sequencer.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,75 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const vscode_languageserver_protocol_1 = require("vscode-languageserver-protocol");
4
+ const Sequencer_1 = require("./Sequencer");
5
+ const chai_config_spec_1 = require("../chai-config.spec");
6
+ describe('Sequencer', () => {
7
+ it('cancels when asked', () => {
8
+ const cancellationTokenSource = new vscode_languageserver_protocol_1.CancellationTokenSource();
9
+ const values = [];
10
+ new Sequencer_1.Sequencer({
11
+ name: 'test',
12
+ cancellationToken: cancellationTokenSource.token,
13
+ minSyncDuration: 100
14
+ }).forEach([1, 2, 3], (i) => {
15
+ values.push(i);
16
+ if (i === 2) {
17
+ cancellationTokenSource.cancel();
18
+ }
19
+ }).runSync();
20
+ (0, chai_config_spec_1.expect)(values).to.eql([1, 2]);
21
+ });
22
+ it('throws when returning a promise from runSync', () => {
23
+ let error;
24
+ try {
25
+ new Sequencer_1.Sequencer().once(() => {
26
+ return Promise.resolve();
27
+ }).runSync();
28
+ }
29
+ catch (e) {
30
+ error = e;
31
+ }
32
+ (0, chai_config_spec_1.expect)(error === null || error === void 0 ? void 0 : error.message).to.eql(`Action returned a promise which is unsupported when running 'runSync'`);
33
+ });
34
+ it('waits for async actions to complete', async () => {
35
+ const values = [];
36
+ await new Sequencer_1.Sequencer().forEach([1, 2, 3], async (i) => {
37
+ await new Promise((resolve) => {
38
+ setTimeout(resolve, 10);
39
+ });
40
+ values.push(i);
41
+ }).run();
42
+ (0, chai_config_spec_1.expect)(values).to.eql([1, 2, 3]);
43
+ });
44
+ it('runSync() calls cancel before throwing', () => {
45
+ let cancelCalled = false;
46
+ try {
47
+ new Sequencer_1.Sequencer().once(() => {
48
+ throw new Error('crash');
49
+ }).onCancel(() => {
50
+ cancelCalled = true;
51
+ }).runSync();
52
+ }
53
+ catch (e) {
54
+ //this is expected
55
+ (0, chai_config_spec_1.expect)(e.message).to.eql('crash');
56
+ }
57
+ (0, chai_config_spec_1.expect)(cancelCalled).to.be.true;
58
+ });
59
+ it('run() calls cancel before throwing', async () => {
60
+ let cancelCalled = false;
61
+ try {
62
+ await new Sequencer_1.Sequencer().once(() => {
63
+ throw new Error('crash');
64
+ }).onCancel(() => {
65
+ cancelCalled = true;
66
+ }).run();
67
+ }
68
+ catch (e) {
69
+ //this is expected
70
+ (0, chai_config_spec_1.expect)(e.message).to.eql('crash');
71
+ }
72
+ (0, chai_config_spec_1.expect)(cancelCalled).to.be.true;
73
+ });
74
+ });
75
+ //# sourceMappingURL=Sequencer.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Sequencer.spec.js","sourceRoot":"","sources":["../../src/common/Sequencer.spec.ts"],"names":[],"mappings":"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"}
@@ -22,9 +22,11 @@ export declare class Deferred<T = void, TReject = any> {
22
22
  */
23
23
  resolve(value?: T): void;
24
24
  private _resolve;
25
+ tryResolve(value?: T): void;
25
26
  /**
26
27
  * Reject the promise
27
28
  */
28
29
  reject(value: TReject): void;
29
30
  private _reject;
31
+ tryReject(reason?: TReject): void;
30
32
  }
package/dist/deferred.js CHANGED
@@ -43,6 +43,11 @@ class Deferred {
43
43
  this._isResolved = true;
44
44
  this._resolve(value);
45
45
  }
46
+ tryResolve(value) {
47
+ if (!this.isCompleted) {
48
+ this.resolve(value);
49
+ }
50
+ }
46
51
  /**
47
52
  * Reject the promise
48
53
  */
@@ -54,6 +59,11 @@ class Deferred {
54
59
  this._isRejected = true;
55
60
  this._reject(value);
56
61
  }
62
+ tryReject(reason) {
63
+ if (!this.isCompleted) {
64
+ this.reject(reason);
65
+ }
66
+ }
57
67
  }
58
68
  exports.Deferred = Deferred;
59
69
  //# sourceMappingURL=deferred.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"deferred.js","sourceRoot":"","sources":["../src/deferred.ts"],"names":[],"mappings":";;;AAAA,MAAa,QAAQ;IACjB;QAiBQ,iBAAY,GAAG,KAAK,CAAC;QAQrB,gBAAW,GAAG,KAAK,CAAC;QAQpB,gBAAW,GAAG,KAAK,CAAC;QAhCxB,IAAI,CAAC,QAAQ,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC/C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YACxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QAC1B,CAAC,CAAC,CAAC;IACP,CAAC;IACD,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAGD;;OAEG;IACH,IAAW,WAAW;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAGD;;OAEG;IACH,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAGD;;OAEG;IACH,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAGD;;OAEG;IACI,OAAO,CAAC,KAAS;QACpB,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACzC;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAGD;;OAEG;IACI,MAAM,CAAC,KAAc;QACxB,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACzC;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;CAEJ;AA7DD,4BA6DC"}
1
+ {"version":3,"file":"deferred.js","sourceRoot":"","sources":["../src/deferred.ts"],"names":[],"mappings":";;;AAAA,MAAa,QAAQ;IACjB;QAiBQ,iBAAY,GAAG,KAAK,CAAC;QAQrB,gBAAW,GAAG,KAAK,CAAC;QAQpB,gBAAW,GAAG,KAAK,CAAC;QAhCxB,IAAI,CAAC,QAAQ,GAAG,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC/C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YACxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QAC1B,CAAC,CAAC,CAAC;IACP,CAAC;IACD,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAGD;;OAEG;IACH,IAAW,WAAW;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAGD;;OAEG;IACH,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAGD;;OAEG;IACH,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAGD;;OAEG;IACI,OAAO,CAAC,KAAS;QACpB,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACzC;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAGM,UAAU,CAAC,KAAS;QACvB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACnB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SACvB;IACL,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAc;QACxB,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACzC;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IAGM,SAAS,CAAC,MAAgB;QAC7B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACnB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SACvB;IACL,CAAC;CACJ;AAzED,4BAyEC"}
@@ -187,7 +187,7 @@ export declare class BrsFile {
187
187
  getTokensUntil(currentToken: Token, tokenKind: TokenKind, direction?: -1 | 1): any[];
188
188
  getPreviousToken(token: Token): Token;
189
189
  /**
190
- * Find the first scope that has a namespace with this name.
190
+ * Finds the first scope for this file, then returns true if there's a namespace with this name.
191
191
  * Returns false if no namespace was found with that name
192
192
  */
193
193
  calleeStartsWithNamespace(callee: Expression): boolean;
@@ -1062,7 +1062,7 @@ class BrsFile {
1062
1062
  return parser.tokens[idx - 1];
1063
1063
  }
1064
1064
  /**
1065
- * Find the first scope that has a namespace with this name.
1065
+ * Finds the first scope for this file, then returns true if there's a namespace with this name.
1066
1066
  * Returns false if no namespace was found with that name
1067
1067
  */
1068
1068
  calleeStartsWithNamespace(callee) {
@@ -1073,11 +1073,9 @@ class BrsFile {
1073
1073
  if ((0, reflection_1.isVariableExpression)(left)) {
1074
1074
  let lowerName = left.name.text.toLowerCase();
1075
1075
  //find the first scope that contains this namespace
1076
- let scopes = this.program.getScopesForFile(this);
1077
- for (let scope of scopes) {
1078
- if (scope.namespaceLookup.has(lowerName)) {
1079
- return true;
1080
- }
1076
+ let scope = this.program.getFirstScopeForFile(this);
1077
+ if (scope === null || scope === void 0 ? void 0 : scope.namespaceLookup.has(lowerName)) {
1078
+ return true;
1081
1079
  }
1082
1080
  }
1083
1081
  return false;
@@ -1091,19 +1089,16 @@ class BrsFile {
1091
1089
  if ((0, reflection_1.isVariableExpression)(callee) && namespaceName) {
1092
1090
  let lowerCalleeName = (_b = (_a = callee === null || callee === void 0 ? void 0 : callee.name) === null || _a === void 0 ? void 0 : _a.text) === null || _b === void 0 ? void 0 : _b.toLowerCase();
1093
1091
  if (lowerCalleeName) {
1094
- let scopes = this.program.getScopesForFile(this);
1092
+ let scope = this.program.getFirstScopeForFile(this);
1095
1093
  //if this file does not belong to any scopes, make a temporary one to answer the question
1096
- if (scopes.length === 0) {
1097
- const scope = new Scope_1.Scope(`temporary-for-${this.pkgPath}`, this.program);
1094
+ if (!scope) {
1095
+ scope = new Scope_1.Scope(`temporary-for-${this.pkgPath}`, this.program);
1098
1096
  scope.getAllFiles = () => [this];
1099
1097
  scope.getOwnFiles = scope.getAllFiles;
1100
- scopes.push(scope);
1101
1098
  }
1102
- for (let scope of scopes) {
1103
- let namespace = scope.namespaceLookup.get(namespaceName.toLowerCase());
1104
- if (namespace === null || namespace === void 0 ? void 0 : namespace.functionStatements[lowerCalleeName]) {
1105
- return true;
1106
- }
1099
+ let namespace = scope.namespaceLookup.get(namespaceName.toLowerCase());
1100
+ if (namespace === null || namespace === void 0 ? void 0 : namespace.functionStatements[lowerCalleeName]) {
1101
+ return true;
1107
1102
  }
1108
1103
  }
1109
1104
  }