Skip to content

Commit 6be335e

Browse files
TwitchBronBronTwitchBronBron
committed
Merge branch 'master' of https://github.com/rokucommunity/vscode-brightscript-language into embedded-brs-in-scenegraph
2 parents cce39b0 + 65abb6f commit 6be335e

37 files changed

Lines changed: 3138 additions & 1970 deletions

‎.github/workflows/create-vsix.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: create-vsix
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
branch:
6+
description: 'The branch name which should be used to build the vsix'
7+
required: true
8+
jobs:
9+
create-vsix:
10+
runs-on: ubuntu-18.04
11+
steps:
12+
- uses: actions/checkout@master
13+
- uses: actions/setup-node@master
14+
with:
15+
node-version: "14.16.1"
16+
- run: npm ci
17+
- run: node scripts/create-vsix.js ${{ github.event.inputs.branch }}
18+
- uses: actions/upload-artifact@v2
19+
with:
20+
name: vscode-brightscript-language.vsix
21+
path: .vsix-building/vscode-brightscript-language/*.vsix

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ coverage
88
*.vsix
99
brsconfig.schema.json
1010
.history
11+
.vsix-building

‎.vscode/launch.json‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@
55
"type": "extensionHost",
66
"request": "launch",
77
"name": "Extension",
8-
"preLaunchTask": "watch",
8+
"preLaunchTask": "svelte-watch",
99
"runtimeExecutable": "${execPath}",
1010
"args": [
1111
"--extensionDevelopmentPath=${workspaceFolder}"
1212
],
1313
"outFiles": [
14-
"${workspaceFolder}/dist/**/*.js"
14+
"${workspaceFolder}/dist/**/*.js",
15+
"${workspaceFolder}/../brighterscript-formatter/dist/**/*.js",
16+
"${workspaceFolder}/../roku-debug/dist/**/*.js",
17+
"${workspaceFolder}/../roku-deploy/dist/**/*.js",
18+
"${workspaceFolder}/../brighterscript/dist/**/*.js"
1519
]
1620
},
1721
{
@@ -25,7 +29,8 @@
2529
],
2630
"outFiles": [
2731
"${workspaceFolder}/dist/**/*.js",
28-
"${workspaceFolder}/../roku-debug/dist/**/*.js"
32+
"${workspaceFolder}/../roku-debug/dist/**/*.js",
33+
"${workspaceFolder}/../roku-deploy/dist/**/*.js"
2934
],
3035
"stopOnEntry": false
3136
},
@@ -35,7 +40,12 @@
3540
"request": "attach",
3641
"port": 6009,
3742
"restart": true,
38-
"timeout": 120000
43+
"timeout": 120000,
44+
"outFiles": [
45+
"${workspaceFolder}/dist/**/*.js",
46+
"${workspaceFolder}/../brighterscript/dist/**/*.js",
47+
"${workspaceFolder}/../roku-deploy/dist/**/*.js"
48+
],
3949
},
4050
{
4151
"name": "Debug Tests",
@@ -50,7 +60,8 @@
5060
"source-map-support/register",
5161
"--timeout",
5262
"999999",
53-
"./src/**/*.spec.ts"
63+
"./src/**/*.spec.ts",
64+
"./ui/**/*.spec.ts"
5465
],
5566
"internalConsoleOptions": "openOnSessionStart"
5667
}
@@ -68,8 +79,7 @@
6879
"name": "Extension + Debug Server",
6980
"configurations": [
7081
"Extension",
71-
"Debug Server",
72-
"Language Server"
82+
"Debug Server"
7383
]
7484
},
7585
{
@@ -80,4 +90,4 @@
8090
]
8191
}
8292
]
83-
}
93+
}

‎.vscode/settings.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
2-
"files.trimTrailingWhitespace": false,
2+
"files.trimTrailingWhitespace": true,
3+
"[markdown]": {
4+
"files.trimTrailingWhitespace": false
5+
},
36
"files.exclude": {
47
"**/.nyc_output": true,
58
"**/.roku-deploy-staging": false,

‎.vscode/tasks.json‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,44 @@
1212
"silent"
1313
],
1414
"presentation": {
15+
"group": "watch",
1516
"echo": true,
1617
"reveal": "silent",
1718
"focus": false,
1819
"panel": "shared"
1920
},
2021
"isBackground": true,
2122
"problemMatcher": "$tsc-watch"
23+
}, {
24+
"label": "svelte-watch",
25+
"type": "shell",
26+
"command": "npm",
27+
"args": [
28+
"run",
29+
"svelte-watch"
30+
],
31+
"presentation": {
32+
"group": "watch",
33+
"echo": true,
34+
"reveal": "silent",
35+
"focus": false,
36+
"panel": "shared"
37+
},
38+
"isBackground": true,
39+
"problemMatcher": [{
40+
"pattern": {
41+
"regexp": "^\\[!\\]"
42+
},
43+
"severity": "error"
44+
}, {
45+
"base": "$tsc-watch",
46+
"background": {
47+
"activeOnStart": true,
48+
"beginsPattern": "^\\s*\\[\\d{1,2}:\\d{1,2}:\\d{1,2}(?: AM| PM)?\\] Validating project",
49+
"endsPattern": "waiting for changes..."
50+
},
51+
}],
52+
"dependsOn": ["watch"]
2253
},
2354
{
2455
"label": "test",
@@ -74,4 +105,4 @@
74105
"problemMatcher": []
75106
}
76107
]
77-
}
108+
}

‎CHANGELOG.md‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,45 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77

88

9+
## [2.23.1](https://github.com/RokuCommunity/vscode-brightscript-language/compare/v2.23.0...v2.23.1) - 2021-10-27
10+
### Changed
11+
- updated to [roku-debug@0.8.5](https://github.com/rokucommunity/roku-debug/blob/master/CHANGELOG.md#085---2021-01-27)
12+
- add additional logging to the "BrightScript Debug Server" output panel
13+
- fixed bug with boxed primitives for telnet debugger ([roku-debug#36](https://github.com/rokucommunity/roku-debug/pull/36))
14+
- send stdio lines as separate debug events which fixes focus bug in the output panel. ([roku-debug#51](https://github.com/rokucommunity/roku-debug/pull/51))
15+
- retain newlines in log output after tracker preprocessing ([roku-debug#50](https://github.com/rokucommunity/roku-debug/pull/50))
16+
- updated to [roku-deploy@3.5.0](https://github.com/rokucommunity/roku-deploy/blob/master/CHANGELOG.md#350---2021-10-27)
17+
- includes ability to use negated non-rootDir top-level patterns in the files array ([roku-deploy#78](https://github.com/rokucommunity/roku-deploy/pull/78))
18+
- updated to [brighterscript@0.41.3](https://github.com/rokucommunity/brighterscript/blob/master/CHANGELOG.md#0413---2021-10-27)
19+
- Allow diagnostic non-numeric disable code comments ([brighterscript#463](https://github.com/rokucommunity/brighterscript/pull/463))
20+
- updated to [brighterscript-formatter@1.6.3](https://github.com/rokucommunity/brighterscript-formatter/blob/master/CHANGELOG.md#163---2021-10-27)
21+
### Fixed
22+
- syntax highlighting issue related to `if` keyword that looked like a function call ([#331](https://github.com/rokucommunity/vscode-brightscript-language/pull/331))
23+
- `throw` keyword colorization ([#330](https://github.com/rokucommunity/vscode-brightscript-language/pull/330))
24+
25+
26+
27+
## [2.23.0](https://github.com/RokuCommunity/vscode-brightscript-language/compare/v2.22.3...v2.23.0) - 2021-09-17
28+
### Added
29+
- Initial RDB implementation ([#317](https://github.com/rokucommunity/vscode-brightscript-language/pull/317))
30+
### Fixed
31+
- deploy crashes when target Roku doesn't have an installed channel (roku-deploy#65)
32+
### Changed
33+
- updated to [brighterscript@0.40.1](https://github.com/rokucommunity/brighterscript/blob/master/CHANGELOG.md#0401---2021-09-17) which includes roku-deploy@3.4.2
34+
- updated to [roku-deploy@3.4.2](https://github.com/rokucommunity/roku-deploy/blob/master/CHANGELOG.md#342---2021-09-17)
35+
- updated to [brighterscript-formatter@1.6.2](https://github.com/rokucommunity/brighterscript-formatter/blob/master/CHANGELOG.md#162---2021-09-17)
36+
37+
38+
39+
## [2.22.3] - 2021-06-28
40+
[2.22.3]: https://github.com/RokuCommunity/vscode-brightscript-language/compare/v2.22.2...v2.22.3
41+
### Fixed
42+
- (Debugger) freeze when debugger prompt split across multiple telnet messages ([roku-debug#35](https://github.com/rokucommunity/roku-debug/pull/35))
43+
- (LanguageServer) allow up to 6 arguments in `CreateObject` function signature ([brighterscript#430](https://github.com/rokucommunity/brighterscript/pull/430))
44+
- (LanguageServer) add `v30/bslCore` library functions to global callables ([brighterscript#433](https://github.com/rokucommunity/brighterscript/pull/433))
45+
46+
47+
948
## [2.22.2] - 2021-06-01
1049
[2.22.2]: https://github.com/RokuCommunity/vscode-brightscript-language/compare/v2.22.1...v2.22.2
1150
### Fixed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ You only need to install local copies of projects you actually want to work on.
595595
596596
View our [developer guidelines](https://github.com/RokuCommunity/vscode-brightscript-language/blob/master/developer-guidelines.md) for more information on how to contribute to this extension.
597597
598-
You can also chat with us [on slack](http://tiny.cc/nrdf0y). (We're in the #vscode-bs-lang-ext channel).
598+
You can also chat with us [on slack](https://join.slack.com/t/rokudevelopers/shared_invite/zt-4vw7rg6v-NH46oY7hTktpRIBM_zGvwA). (We're in the #vscode-bs-lang-ext channel).
599599

600600
## Changelog
601601

0 commit comments

Comments
 (0)