Merge branch 'master' into enhanced-launch

CHANGELOG.md

@@ -6,6 +6,47 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+## [2.45.16](https://github.com/rokucommunity/vscode-brightscript-language/compare/v2.45.15...v2.45.16) - 2024-01-31
+### Changed
+ - upgrade to [[email protected]](https://github.com/rokucommunity/brighterscript/blob/master/CHANGELOG.md#06521---2024-01-31). Notable changes since 0.65.20:
+     - Fix parsing issues with multi-index IndexedSet and IndexedGet ([brighterscript#1050](https://github.com/rokucommunity/brighterscript/pull/1050))
+
+
+
+## [2.45.15](https://github.com/rokucommunity/vscode-brightscript-language/compare/v2.45.14...v2.45.15) - 2024-01-30
+### Changed
+ - upgrade to [[email protected]](https://github.com/rokucommunity/brighterscript/blob/master/CHANGELOG.md#06520---2024-01-30). Notable changes since 0.65.19:
+     - Add plugin hooks for getDefinition ([brighterscript#1045](https://github.com/rokucommunity/brighterscript/pull/1045))
+
+
+
+## [2.45.14](https://github.com/rokucommunity/vscode-brightscript-language/compare/v2.45.13...v2.45.14) - 2024-01-30
+### Changed
+ - upgrade to [[email protected]](https://github.com/rokucommunity/roku-debug/blob/master/CHANGELOG.md#0213---2024-01-30)
+ - upgrade to [[email protected]](https://github.com/rokucommunity/brighterscript/blob/master/CHANGELOG.md#06519---2024-01-30). Notable changes since 0.65.18:
+     - Backport v1 syntax changes ([brighterscript#1034](https://github.com/rokucommunity/brighterscript/pull/1034))
+ - upgrade to [[email protected]](https://github.com/rokucommunity/brighterscript-formatter/blob/master/CHANGELOG.md#1640---2024-01-30)
+
+
+
+## [2.45.13](https://github.com/rokucommunity/vscode-brightscript-language/compare/v2.45.12...v2.45.13) - 2024-01-28
+### Fixed
+ - Sets `stagingDir` properly in DebugConfigurationProvider ([#543](https://github.com/rokucommunity/vscode-brightscript-language/pull/543))
+
+
+
+## [2.45.12](https://github.com/rokucommunity/vscode-brightscript-language/compare/v2.45.11...v2.45.12) - 2024-01-26
+### Changed
+ - upgrade to [[email protected]](https://github.com/rokucommunity/roku-debug/blob/master/CHANGELOG.md#0212---2024-01-25). Notable changes since 0.21.1:
+     - Use `stagingDir` instead of stagingFolderPath ([roku-debug#185](https://github.com/rokucommunity/roku-debug/pull/185))
+ - upgrade to [[email protected]](https://github.com/rokucommunity/brighterscript/blob/master/CHANGELOG.md#06518---2024-01-25). Notable changes since 0.65.17:
+     - Prevent overwriting the Program._manifest if already set on startup ([brighterscript#1027](https://github.com/rokucommunity/brighterscript/pull/1027))
+     - Improving null safety: Add FinalizedBsConfig and tweak plugin events ([brighterscript#1000](https://github.com/rokucommunity/brighterscript/pull/1000))
+ - upgrade to [[email protected]](https://github.com/rokucommunity/brighterscript-formatter/blob/master/CHANGELOG.md#1639---2024-01-25). Notable changes since 1.6.38:
+     - allow spacing on dotted get paths ([brighterscript-formatter#83](https://github.com/rokucommunity/brighterscript-formatter/pull/83))
+
+
+
 ## [2.45.11](https://github.com/rokucommunity/vscode-brightscript-language/compare/v2.45.10...v2.45.11) - 2024-01-17
 ### Changed
  - upgrade to [[email protected]](https://github.com/rokucommunity/roku-debug/blob/master/CHANGELOG.md#0211---2024-01-16). Notable changes since 0.21.0:

package.json

@@ -1,7 +1,7 @@
 {
     "name": "brightscript",
     "displayName": "BrightScript Language",
-    "version": "2.45.11",
+    "version": "2.45.16",
     "publisher": "RokuCommunity",
     "description": "Language support for Roku's BrightScript language.",
     "author": {
@@ -56,8 +56,8 @@
         "@vscode/extension-telemetry": "^0.4.7",
         "array-sort": "^1.0.0",
         "backoff": "^2.5.0",
-        "brighterscript": "^0.65.17",
-        "brighterscript-formatter": "^1.6.38",
+        "brighterscript": "^0.65.21",
+        "brighterscript-formatter": "^1.6.40",
         "clone-deep": "^4.0.1",
         "debounce": "^1.2.0",
         "dotenv": "^6.2.0",
@@ -74,7 +74,7 @@
         "node-ssdp": "^4.0.0",
         "postman-request": "^2.88.1-postman.32",
         "pretty-bytes": "^5.6.0",
-        "roku-debug": "^0.21.1",
+        "roku-debug": "^0.21.3",
         "roku-deploy": "^3.11.2",
         "roku-test-automation": "2.0.0-beta.22",
         "semver": "^7.1.3",

src/DebugConfigurationProvider.ts

@@ -89,8 +89,9 @@ export class BrightScriptDebugConfigurationProvider implements DebugConfiguratio
             // merge user and workspace settings into the config
             result = this.processUserWorkspaceSettings(config);
 
-            //force a specific staging folder path because sometimes this conflicts with bsconfig.json
-            result.stagingFolderPath = path.join('${outDir}/.roku-deploy-staging');
+            //force a specific stagingDir because sometimes this conflicts with bsconfig.json
+            result.stagingDir = path.join('${outDir}/.roku-deploy-staging');
+            result.stagingFolderPath = result.stagingDir;
 
             result = await this.sanitizeConfiguration(result, folder);
             result = await this.processEnvFile(folder, result);
@@ -373,6 +374,14 @@ export class BrightScriptDebugConfigurationProvider implements DebugConfiguratio
             config.stagingFolderPath = path.normalize(config.stagingFolderPath.replace('${workspaceFolder}', folderUri.fsPath));
         }
 
+        if (config.stagingDir.includes('${outDir}')) {
+            config.stagingDir = path.normalize(config.stagingDir.replace('${outDir}', config.outDir));
+        }
+        if (config.stagingDir.includes('${workspaceFolder}')) {
+            config.stagingDir = path.normalize(config.stagingDir.replace('${workspaceFolder}', folderUri.fsPath));
+        }
+
+
         // Make sure that directory paths end in a trailing slash
         if (config.debugRootDir) {
             config.debugRootDir = this.util.ensureTrailingSlash(config.debugRootDir);