From 1f96937c491ca97b268320c3058f32d9d2e62493 Mon Sep 17 00:00:00 2001 From: Brett Saviano Date: Tue, 30 Jul 2024 11:21:01 -0400 Subject: [PATCH 1/5] Rename `InterSystems WebSocket Terminal` to `InterSystems Lite Terminal` (#1418) --- package.json | 8 ++++---- src/commands/webSocketTerminal.ts | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 3a37ae4e..50a8a82c 100644 --- a/package.json +++ b/package.json @@ -1162,11 +1162,11 @@ { "category": "ObjectScript", "command": "vscode-objectscript.launchWebSocketTerminal", - "title": "Launch WebSocket Terminal" + "title": "Launch Lite Terminal" }, { "command": "vscode-objectscript.intersystems-servermanager.webterminal", - "title": "Launch WebSocket Terminal", + "title": "Launch Lite Terminal", "icon": "$(terminal)" }, { @@ -1555,7 +1555,7 @@ "default": true }, "objectscript.webSocketTerminal.syntaxColoring": { - "description": "Enable syntax coloring for command input in the InterSystems WebSocket Terminal.", + "description": "Enable syntax coloring for command input in the InterSystems Lite Terminal.", "type": "boolean", "default": true }, @@ -1782,7 +1782,7 @@ "profiles": [ { "id": "vscode-objectscript.webSocketTerminal", - "title": "InterSystems WebSocket Terminal", + "title": "InterSystems Lite Terminal", "icon": "./images/fileIcon.svg" } ] diff --git a/src/commands/webSocketTerminal.ts b/src/commands/webSocketTerminal.ts index ff138793..caebe3fd 100644 --- a/src/commands/webSocketTerminal.ts +++ b/src/commands/webSocketTerminal.ts @@ -173,7 +173,7 @@ class WebSocketTerminal implements vscode.Pseudoterminal { outputChannel.appendLine("Check that the InterSystems server's web server supports WebSockets."); outputChannel.show(true); vscode.window.showErrorMessage( - "Failed to initialize WebSocket Terminal. Check 'ObjectScript' Output channel for details.", + "Failed to initialize Lite Terminal. Check 'ObjectScript' Output channel for details.", "Dismiss" ); this._closeEmitter.fire(); @@ -190,7 +190,7 @@ class WebSocketTerminal implements vscode.Pseudoterminal { outputChannel.appendLine(`WebSocket error: ${error.toString()}`); outputChannel.show(true); vscode.window.showErrorMessage( - "WebSocket Terminal failed. Check 'ObjectScript' Output channel for details.", + "Lite Terminal failed. Check 'ObjectScript' Output channel for details.", "Dismiss" ); this._closeEmitter.fire(); @@ -212,7 +212,7 @@ class WebSocketTerminal implements vscode.Pseudoterminal { outputChannel.appendLine(message.text); outputChannel.show(true); vscode.window.showErrorMessage( - "WebSocket Terminal failed. Check 'ObjectScript' Output channel for details.", + "Lite Terminal failed. Check 'ObjectScript' Output channel for details.", "Dismiss" ); this._closeEmitter.fire(); @@ -614,12 +614,12 @@ function terminalConfigForUri( ): vscode.ExtensionTerminalOptions | undefined { // Make sure the server connection is active if (!api.active || api.ns == "") { - reportError("WebSocket Terminal requires an active server connection.", throwErrors); + reportError("Lite Terminal requires an active server connection.", throwErrors); return; } // Make sure the server has the terminal endpoint if (api.config.apiVersion < 7) { - reportError("WebSocket Terminal requires InterSystems IRIS version 2023.2 or above.", throwErrors); + reportError("Lite Terminal requires InterSystems IRIS version 2023.2 or above.", throwErrors); return; } @@ -642,7 +642,7 @@ async function workspaceUriForTerminal(throwErrors = false) { let uri: vscode.Uri; const workspaceFolders = vscode.workspace.workspaceFolders || []; if (workspaceFolders.length == 0) { - reportError("WebSocket Terminal requires an open workspace.", throwErrors); + reportError("Lite Terminal requires an open workspace.", throwErrors); } else if (workspaceFolders.length == 1) { // Use the current connection uri = workspaceFolders[0].uri; @@ -696,7 +696,7 @@ export class WebSocketTerminalProfileProvider implements vscode.TerminalProfileP const terminalOpts = terminalConfigForUri(new AtelierAPI(uri), uri, true); return new vscode.TerminalProfile(terminalOpts); } else { - throw new Error("WebSocket Terminal requires a selected workspace folder."); + throw new Error("Lite Terminal requires a selected workspace folder."); } } } From 22cec963369b1768d5e7faf238fcf158f73eb2aa Mon Sep 17 00:00:00 2001 From: John Murray Date: Thu, 1 Aug 2024 16:35:40 +0100 Subject: [PATCH 2/5] Add CSPSHARE=1 to align add-in behaviour with Studio (#1419) --- src/commands/serverActions.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/commands/serverActions.ts b/src/commands/serverActions.ts index b84b517d..d95c71cb 100644 --- a/src/commands/serverActions.ts +++ b/src/commands/serverActions.ts @@ -261,6 +261,7 @@ export async function serverActions(): Promise { params += `&Project=${encodeURIComponent(project)}`; } params += `&CSPCHD=${token}`; + params += "&CSPSHARE=1"; vscode.env.openExternal(vscode.Uri.parse(`${serverUrl}${addin.id}?${params}`)); } } From c563d49a3e7288e6b4c90a702b0faca531ca6529 Mon Sep 17 00:00:00 2001 From: Brett Saviano Date: Thu, 1 Aug 2024 13:17:14 -0400 Subject: [PATCH 3/5] Don't append `CSPCHD` for web applications that don't support it by default (#1420) --- src/commands/serverActions.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/commands/serverActions.ts b/src/commands/serverActions.ts index d95c71cb..dd0d22f1 100644 --- a/src/commands/serverActions.ts +++ b/src/commands/serverActions.ts @@ -223,13 +223,11 @@ export async function serverActions(): Promise { } switch (action.id) { case "openPortal": { - const token = await getCSPToken(api, portalPath); - vscode.env.openExternal(vscode.Uri.parse(`${serverUrl}${portalPath}&CSPCHD=${token}`)); + vscode.env.openExternal(vscode.Uri.parse(`${serverUrl}${portalPath}`)); break; } case "openClassReference": { - const token = await getCSPToken(api, classRef); - vscode.env.openExternal(vscode.Uri.parse(`${serverUrl}${classRef}&CSPCHD=${token}`)); + vscode.env.openExternal(vscode.Uri.parse(`${serverUrl}${classRef}`)); break; } case "openStudioAddin": { From 4a96dd4cc829f15ca83e97971632806646c776d0 Mon Sep 17 00:00:00 2001 From: Brett Saviano Date: Mon, 5 Aug 2024 07:27:45 -0400 Subject: [PATCH 4/5] Prepare 2.12.7 release (#1421) --- CHANGELOG.md | 15 +++++++++++++++ README.md | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 461fafef..89ee1b17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,21 @@ # Change Log +## [2.12.7] 05-Aug-2024 +- Enhancements + - Fire source control hooks for opened and closed documents (#1414) + - Always stop the debug target process when attaching (#1415) + - Prompt user for workspace folder before process ID when attaching to a process in a multi-root workspace (#1417) + - Rename `InterSystems WebSocket Terminal` to `InterSystems Lite Terminal` (#1418) +- Fixes + - Fix showing of CSP files in project folders (#1408) + - Add confirmation dialog when deleting a project (#1410) + - Fix attach debugging when no file is open (#1412) + - Improve reliability of updating status bar panels (#1416) + - Add CSPSHARE=1 to Studio Add-In links to align behavior with Studio (#1419) + - Don't append CSPCHD for web applications that don't support it by default (#1420) + ## [2.12.6] 23-Jul-2024 +Minimum VS Code version is now 1.91.0. - Enhancements - Support command stepping in debugger (requires InterSystems IRIS 2023.1.5, 2024.1.1+, or 2024.2+) (#1385) - Add `Compile` command to server-side file explorer (#1389) diff --git a/README.md b/README.md index 87cd63ac..29d6bacd 100644 --- a/README.md +++ b/README.md @@ -55,8 +55,8 @@ To unlock these features (optional): 1. Download and install a beta version from GitHub. This is necessary because Marketplace does not allow publication of extensions that use proposed APIs. - Go to https://github.com/intersystems-community/vscode-objectscript/releases - - Locate the beta immediately above the release you installed from Marketplace. For instance, if you installed `2.12.6`, look for `2.12.7-beta.1`. This will be functionally identical to the Marketplace version apart from being able to use proposed APIs. - - Download the VSIX file (for example `vscode-objectscript-2.12.7-beta.1.vsix`) and install it. One way to install a VSIX is to drag it from your download folder and drop it onto the list of extensions in the Extensions view of VS Code. + - Locate the beta immediately above the release you installed from Marketplace. For instance, if you installed `2.12.7`, look for `2.12.8-beta.1`. This will be functionally identical to the Marketplace version apart from being able to use proposed APIs. + - Download the VSIX file (for example `vscode-objectscript-2.12.8-beta.1.vsix`) and install it. One way to install a VSIX is to drag it from your download folder and drop it onto the list of extensions in the Extensions view of VS Code. 2. From [Command Palette](https://code.visualstudio.com/docs/getstarted/tips-and-tricks#_command-palette) choose `Preferences: Configure Runtime Arguments`. 3. In the argv.json file that opens, add this line (required for both Stable and Insiders versions of VS Code): From 2de83fdeab7f2f103a76fb40d4782a75ce0b5dbb Mon Sep 17 00:00:00 2001 From: ProjectBot Date: Mon, 5 Aug 2024 11:35:24 +0000 Subject: [PATCH 5/5] auto bump version with release --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 50a8a82c..91007c5f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-objectscript", "displayName": "InterSystems ObjectScript", "description": "InterSystems ObjectScript language support for Visual Studio Code", - "version": "2.12.7-SNAPSHOT", + "version": "2.12.8-SNAPSHOT", "icon": "images/logo.png", "aiKey": "9cd75d51-697c-406c-a929-2bcf46e97c64", "categories": [ @@ -1724,7 +1724,7 @@ "type": "objectscript", "request": "attach", "name": "Attach to running process" - } + } ], "configurationSnippets": [ {