Skip to content

Commit

Permalink
Merge branch 'split_panel_scenegraph_inspector' of https://github.com…
Browse files Browse the repository at this point in the history
…/rokucommunity/vscode-brightscript-language into split_panel_scenegraph_inspector
  • Loading branch information
Brian Leighty committed Mar 27, 2024
2 parents e5befb2 + e403597 commit c00ae69
Show file tree
Hide file tree
Showing 4 changed files with 513 additions and 21 deletions.
55 changes: 39 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 20 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
"net": "^1.0.2",
"node-cache": "^4.2.0",
"node-ssdp": "^4.0.0",
"open": "^8.4.2",
"postman-request": "^2.88.1-postman.32",
"pretty-bytes": "^5.6.0",
"roku-debug": "^0.21.6",
Expand Down Expand Up @@ -175,7 +176,10 @@
"onCommand:extension.brightscript.sendRemoteText",
"onCommand:brighterscript.showPreview",
"onCommand:brighterscript.showPreviewToSide",
"onCommand:extension.brightscript.captureScreenshot"
"onCommand:extension.brightscript.captureScreenshot",
"onCommand:extension.brightscript.rekeyDevice",
"onCommand:extension.brightscript.createPackage",
"onCommand:extension.brightscript.rekeyAndPackage"
],
"contributes": {
"viewsContainers": {
Expand Down Expand Up @@ -2986,6 +2990,21 @@
"category": "BrighterScript",
"icon": "./images/icons/inspect-active.svg"
},
{
"command": "extension.brightscript.rekeyDevice",
"title": "Rekey Device",
"category": "BrightScript"
},
{
"command": "extension.brightscript.createPackage",
"title": "Create Package",
"category": "BrightScript"
},
{
"command": "extension.brightscript.rekeyAndPackage",
"title": "Rekey Device and Create Package",
"category": "BrightScript"
},
{
"command": "extension.brightscript.captureScreenshot",
"title": "Capture Screenshot",
Expand Down
10 changes: 6 additions & 4 deletions src/BrightScriptCommands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import BrightScriptFileUtils from './BrightScriptFileUtils';
import { GlobalStateManager } from './GlobalStateManager';
import { brighterScriptPreviewCommand } from './commands/BrighterScriptPreviewCommand';
import { captureScreenshotCommand } from './commands/CaptureScreenshotCommand';
import { rekeyAndPackageCommand } from './commands/RekeyAndPackageCommand';
import { languageServerInfoCommand } from './commands/LanguageServerInfoCommand';
import { util } from './util';
import { util as rokuDebugUtil } from 'roku-debug/dist/util';
Expand Down Expand Up @@ -37,6 +38,7 @@ export class BrightScriptCommands {
brighterScriptPreviewCommand.register(this.context);
languageServerInfoCommand.register(this.context);
captureScreenshotCommand.register(this.context, this);
rekeyAndPackageCommand.register(this.context, this, this.userInputManager);

this.registerGeneralCommands();

Expand Down Expand Up @@ -394,13 +396,13 @@ export class BrightScriptCommands {
}
}

public async getRemoteHost() {
public async getRemoteHost(showPrompt = true) {
this.host = await this.context.workspaceState.get('remoteHost');
if (!this.host) {
let config = vscode.workspace.getConfiguration('brightscript.remoteControl', null);
this.host = config.get('host');
// eslint-disable-next-line no-template-curly-in-string
if (!this.host || this.host === '${promptForHost}') {
if ((!this.host || this.host === '${promptForHost}') && showPrompt) {
this.host = await vscode.window.showInputBox({
placeHolder: 'The IP address of your Roku device',
value: ''
Expand All @@ -423,13 +425,13 @@ export class BrightScriptCommands {
return this.host;
}

public async getRemotePassword() {
public async getRemotePassword(showPrompt = true) {
this.password = await this.context.workspaceState.get('remotePassword');
if (!this.password) {
let config = vscode.workspace.getConfiguration('brightscript.remoteControl', null);
this.password = config.get('password');
// eslint-disable-next-line no-template-curly-in-string
if (!this.password || this.password === '${promptForPassword}') {
if ((!this.password || this.password === '${promptForPassword}') && showPrompt) {
this.password = await vscode.window.showInputBox({
placeHolder: 'The developer account password for your Roku device',
value: ''
Expand Down
Loading

0 comments on commit c00ae69

Please sign in to comment.