Skip to content

Commit af9b719

Browse files
committed
Merge remote-tracking branch 'upstream/master' into fix-1278
2 parents 1ad112d + 5255bac commit af9b719

File tree

5 files changed

+31
-8
lines changed

5 files changed

+31
-8
lines changed

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
# Change Log
22

3+
## [2.12.6] 23-Jul-2024
4+
- Enhancements
5+
- Support command stepping in debugger (requires InterSystems IRIS 2023.1.5, 2024.1.1+, or 2024.2+) (#1385)
6+
- Add `Compile` command to server-side file explorer (#1389)
7+
- Associate unit test debug sessions with the test runs (#1395)
8+
- Add command for opening InterSystems documents (#1398)
9+
- Make server-side class readonly if it's deployed (#1399)
10+
- Add new `objectscript.serverSourceControl.respectEditableStatus` setting to make server-side file readonly if source control reports it is not editable (#1399)
11+
- Fixes
12+
- Improve triggering of `AttemptedEdit` source control action (#1380)
13+
- Use hyphen instead of underscore in HTTP request header names (#1384)
14+
- [Open symbol by name](https://code.visualstudio.com/docs/editor/editingevolved#_open-symbol-by-name) (`Ctrl/Cmd-T`) should match case-insensitively (#1386)
15+
- XML Import/Export commands shouldn't assume a server connection in a multi-root workspace (#1387)
16+
- Hide file explorer context commands when multiple items are selected (#1390)
17+
- Use default web application for CodeLens links (#1393)
18+
- Don't log error when attempting a debug attach in a non-Interoperability namespace (#1394)
19+
- Fix `Import Local Files...` command (#1396)
20+
- Provide Project and User parameters to Studio add-ins (#1402)
21+
322
## [2.12.5] 29-May-2024
423
- Enhancements
524
- [Open symbol by name](https://code.visualstudio.com/docs/editor/editingevolved#_open-symbol-by-name) (`Ctrl/Cmd-T`) improvements (#1366):

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ To unlock these features (optional):
5555

5656
1. Download and install a beta version from GitHub. This is necessary because Marketplace does not allow publication of extensions that use proposed APIs.
5757
- Go to https://github.com/intersystems-community/vscode-objectscript/releases
58-
- Locate the beta immediately above the release you installed from Marketplace. For instance, if you installed `2.12.5`, look for `2.12.6-beta.1`. This will be functionally identical to the Marketplace version apart from being able to use proposed APIs.
59-
- Download the VSIX file (for example `vscode-objectscript-2.12.6-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.
58+
- 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.
59+
- 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.
6060

6161
2. From [Command Palette](https://code.visualstudio.com/docs/getstarted/tips-and-tricks#_command-palette) choose `Preferences: Configure Runtime Arguments`.
6262
3. In the argv.json file that opens, add this line (required for both Stable and Insiders versions of VS Code):

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "vscode-objectscript",
33
"displayName": "InterSystems ObjectScript",
44
"description": "InterSystems ObjectScript language support for Visual Studio Code",
5-
"version": "2.12.6-SNAPSHOT",
5+
"version": "2.12.7-SNAPSHOT",
66
"icon": "images/logo.png",
77
"aiKey": "9cd75d51-697c-406c-a929-2bcf46e97c64",
88
"categories": [

src/commands/serverActions.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,13 @@ export async function serverActions(): Promise<void> {
245245
});
246246
if (addin) {
247247
const token = await getCSPToken(api, addin.id);
248-
vscode.env.openExternal(
249-
vscode.Uri.parse(`${serverUrl}${addin.id}?Namespace=${nsEncoded}&CSPCHD=${token}`)
250-
);
248+
let params = `Namespace=${nsEncoded}`;
249+
params += `&User=${encodeURIComponent(username)}`;
250+
if (project !== "") {
251+
params += `&Project=${encodeURIComponent(project)}`;
252+
}
253+
params += `&CSPCHD=${token}`;
254+
vscode.env.openExternal(vscode.Uri.parse(`${serverUrl}${addin.id}?${params}`));
251255
}
252256
}
253257
break;

0 commit comments

Comments
 (0)