diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fe7e71e..63f1a2b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.19.5] - 2019-09-20 +### Fixed + - issue where part of the debug crash output was not being logged to the console (see [#198](https://github.com/rokucommunity/vscode-brightscript-language/pull/198)) + + +## [1.19.4] - 2019-09-19 +### Changed + - upgraded to [brighterscript-formatter](https://www.npmjs.com/package/brighterscript-formatter)@1.0.2 +### Fixed + - formatting bug where, if a line ended with `end` (even property names), the following lines would all be de-indented + + ## [1.19.3] - 2019-09-18 ### Fixed @@ -334,6 +346,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 +[1.19.5]: https://github.com/RokuCommunity/vscode-brightscript-language/compare/v1.19.4...v1.19.5 +[1.19.4]: https://github.com/RokuCommunity/vscode-brightscript-language/compare/v1.19.3...v1.19.4 [1.19.3]: https://github.com/RokuCommunity/vscode-brightscript-language/compare/v1.19.2...v1.19.3 [1.19.2]: https://github.com/RokuCommunity/vscode-brightscript-language/compare/v1.19.1...v1.19.2 [1.19.1]: https://github.com/RokuCommunity/vscode-brightscript-language/compare/v1.19.0...v1.19.1 diff --git a/README.md b/README.md index fd8b7bd9..dfca7567 100644 --- a/README.md +++ b/README.md @@ -395,7 +395,7 @@ This process will REPLACE any existing version of the extension you have install ## Contributing -[![](https://sourcerer.io/fame/RokuCommunity/RokuCommunity/vscode-brightscript-language/images/0)](https://sourcerer.io/fame/RokuCommunity/RokuCommunity/vscode-brightscript-language/links/0)[![](https://sourcerer.io/fame/RokuCommunity/RokuCommunity/vscode-brightscript-language/images/1)](https://sourcerer.io/fame/RokuCommunity/RokuCommunity/vscode-brightscript-language/links/1)[![](https://sourcerer.io/fame/RokuCommunity/RokuCommunity/vscode-brightscript-language/images/2)](https://sourcerer.io/fame/RokuCommunity/RokuCommunity/vscode-brightscript-language/links/2)[![](https://sourcerer.io/fame/RokuCommunity/RokuCommunity/vscode-brightscript-language/images/3)](https://sourcerer.io/fame/RokuCommunity/RokuCommunity/vscode-brightscript-language/links/3)[![](https://sourcerer.io/fame/RokuCommunity/RokuCommunity/vscode-brightscript-language/images/4)](https://sourcerer.io/fame/RokuCommunity/RokuCommunity/vscode-brightscript-language/links/4)[![](https://sourcerer.io/fame/RokuCommunity/RokuCommunity/vscode-brightscript-language/images/5)](https://sourcerer.io/fame/RokuCommunity/RokuCommunity/vscode-brightscript-language/links/5)[![](https://sourcerer.io/fame/RokuCommunity/RokuCommunity/vscode-brightscript-language/images/6)](https://sourcerer.io/fame/RokuCommunity/RokuCommunity/vscode-brightscript-language/links/6)[![](https://sourcerer.io/fame/RokuCommunity/RokuCommunity/vscode-brightscript-language/images/7)](https://sourcerer.io/fame/RokuCommunity/RokuCommunity/vscode-brightscript-language/links/7) +[![](https://sourcerer.io/fame/TwitchBronBron/rokucommunity/vscode-brightscript-language/images/0)](https://sourcerer.io/fame/TwitchBronBron/rokucommunity/vscode-brightscript-language/links/0)[![](https://sourcerer.io/fame/TwitchBronBron/rokucommunity/vscode-brightscript-language/images/1)](https://sourcerer.io/fame/TwitchBronBron/rokucommunity/vscode-brightscript-language/links/1)[![](https://sourcerer.io/fame/TwitchBronBron/rokucommunity/vscode-brightscript-language/images/2)](https://sourcerer.io/fame/TwitchBronBron/rokucommunity/vscode-brightscript-language/links/2)[![](https://sourcerer.io/fame/TwitchBronBron/rokucommunity/vscode-brightscript-language/images/3)](https://sourcerer.io/fame/TwitchBronBron/rokucommunity/vscode-brightscript-language/links/3)[![](https://sourcerer.io/fame/TwitchBronBron/rokucommunity/vscode-brightscript-language/images/4)](https://sourcerer.io/fame/TwitchBronBron/rokucommunity/vscode-brightscript-language/links/4)[![](https://sourcerer.io/fame/TwitchBronBron/rokucommunity/vscode-brightscript-language/images/5)](https://sourcerer.io/fame/TwitchBronBron/rokucommunity/vscode-brightscript-language/links/5)[![](https://sourcerer.io/fame/TwitchBronBron/rokucommunity/vscode-brightscript-language/images/6)](https://sourcerer.io/fame/TwitchBronBron/rokucommunity/vscode-brightscript-language/links/6)[![](https://sourcerer.io/fame/TwitchBronBron/rokucommunity/vscode-brightscript-language/images/7)](https://sourcerer.io/fame/TwitchBronBron/rokucommunity/vscode-brightscript-language/links/7) 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. diff --git a/package-lock.json b/package-lock.json index 680c01c9..2a3a25af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "brightscript", - "version": "1.9.3", + "version": "1.19.5", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -700,11 +700,11 @@ } }, "brighterscript-formatter": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/brighterscript-formatter/-/brighterscript-formatter-1.0.1.tgz", - "integrity": "sha512-nlj2p9AXKZg6RKfE51AVDwizrLVTdR3FTaN6cWP1Ny17T+fcmCiplONYdF4tqU31zVcWgtDjhEQd4uLz90/V3A==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/brighterscript-formatter/-/brighterscript-formatter-1.0.2.tgz", + "integrity": "sha512-dNbI8exLqst9I9aRrY5MESHaxNLcBcluSKxsD8TdcQRZgBfqE//+xUV1WTSpaEldwtKtlIOzhMGAZB+IlKK3rw==", "requires": { - "brightscript-parser": "1.2.0", + "brightscript-parser": "^1.2.1", "child-process-promise": "^2.2.1", "fs-extra": "^8.1.0", "glob-promise": "^3.4.0", @@ -729,9 +729,9 @@ } }, "brightscript-parser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/brightscript-parser/-/brightscript-parser-1.2.0.tgz", - "integrity": "sha512-bAXJs5vtkaEVHf09/+Rk4gN9+dIZUR6nvjeNbQ8xD7Xo1lY9BsdfLD1PPRgvy0yn4iNoZsNCSrgVNEFgVgFgtA==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/brightscript-parser/-/brightscript-parser-1.2.1.tgz", + "integrity": "sha512-j905pnUMsN53NBvNYDCPw9cVoPSaO/vYkCu3QqXieItmCoooyD3yaraPFD2ZffQ3Mj+EZjVOnA/k5nAbmMmNuQ==" }, "browser-stdout": { "version": "1.3.0", diff --git a/package.json b/package.json index 2150bb58..08c0d87d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "brightscript", "displayName": "BrightScript Language", - "version": "1.9.3", + "version": "1.19.5", "publisher": "celsoaf", "description": "Language support for Roku's BrightScript language.", "author": { @@ -43,7 +43,7 @@ "@types/glob": "^7.1.1", "array-sort": "^1.0.0", "backoff": "^2.5.0", - "brighterscript-formatter": "^1.0.1", + "brighterscript-formatter": "^1.0.2", "dotenv": "^6.2.0", "eol": "^0.9.1", "fast-xml-parser": "^3.12.16", diff --git a/src/RokuAdapter.ts b/src/RokuAdapter.ts index fc5f7581..a1787256 100644 --- a/src/RokuAdapter.ts +++ b/src/RokuAdapter.ts @@ -224,11 +224,6 @@ export class RokuAdapter { this.requestPipeline.on('unhandled-console-output', async (responseText: string) => { //if there was a runtime error, handle it let hasRuntimeError = this.checkForRuntimeError(responseText); - if (hasRuntimeError) { - console.debug('hasRuntimeError!!'); - this.isAtDebuggerPrompt = true; - return; - } responseText = this.rendezvousTracker.processLogLine(responseText); //forward all unhandled console output @@ -237,6 +232,13 @@ export class RokuAdapter { this.emit('unhandled-console-output', responseText); } + // short circuit after the output has been sent as console output + if (hasRuntimeError) { + console.debug('hasRuntimeError!!'); + this.isAtDebuggerPrompt = true; + return; + } + this.processUnhandledLines(responseText); let match; @@ -363,6 +365,7 @@ export class RokuAdapter { break; case RokuAdapterStatus.none: this.startCompilingLine = this.getStartingCompilingLine(newLines); + this.compilingLines = this.compilingLines.concat(newLines); if (this.startCompilingLine !== -1) { console.debug('processUnhandledLines: entering state RokuAdapterStatus.compiling'); newLines.splice(0, this.startCompilingLine); diff --git a/src/extension.spec.ts b/src/extension.spec.ts index 12b26bd9..bd9b4d60 100644 --- a/src/extension.spec.ts +++ b/src/extension.spec.ts @@ -37,7 +37,7 @@ describe('extension', () => { it('registers formatter', () => { let spy = sinon.spy(vscode.languages, 'registerDocumentRangeFormattingEditProvider'); - expect(spy.calledOnce).to.be.false; + expect(spy.getCalls().length).to.equal(0); extension.activate({ subscriptions: [] }); expect(spy.getCalls().length).to.be.greaterThan(1); });