Merge remote-tracking branch 'upstream/master' into client-side-compile-update

Author: isc-bsaviano

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## [3.2.0] 06-Oct-2025
+Minimum VS Code version is now 1.104.0.
+- Enhancements
+  - Better error handling when expanding InterSystems and Projects Explorers (#1652)
+  - Allow opening low-code editors from read-only file systems (#1655)
+  - Add command for showing all class members, including inherited (#1656)
+  - Allow commands to be re-run in the Lite Terminal from VS Code shell integration without user confirmation (#1654)
+  - Allow pasting of multi-line content into Lite Terminal `READ` prompts (#1654)
+- Fixes
+  - Fix stringification of `AggregateError` (#1651)
+  - Work around VS Code bug to allow re-running of multi-line commands in Lite Terminal from VS Code shell integration (#1654)
+  - Correctly capture Lite Terminal command output in shell integration (#1654)
+  - Fix some edge cases where the Lite Terminal cursor and text could get out of sync (#1654)
+  - Copy Windows filesystem file correctly to `isfs` filesystem (#1658)
+  - Upgrade dependencies (#1650, #1653)
+
 ## [3.0.6] 09-Sep-2025
 - Enhancements
   - Add `objectscript.unitTest.enabled` setting (#1627)

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 `3.0.6`, look for `3.0.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-3.0.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 `3.2.0`, look for `3.2.1-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-3.2.1-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):

package-lock.json

@@ -2,7 +2,7 @@
   "name": "vscode-objectscript",
   "displayName": "InterSystems ObjectScript",
   "description": "InterSystems ObjectScript language support for Visual Studio Code",
-  "version": "3.0.7-SNAPSHOT",
+  "version": "3.2.1-SNAPSHOT",
   "icon": "images/logo.png",
   "aiKey": "InstrumentationKey=9cd75d51-697c-406c-a929-2bcf46e97c64;IngestionEndpoint=https://eastus2-4.in.applicationinsights.azure.com/;LiveEndpoint=https://eastus2.livediagnostics.monitor.azure.com/;ApplicationId=a431c56f-8ccc-4b99-b5e9-fce3763215b1",
   "categories": [
@@ -48,7 +48,7 @@
     }
   ],
   "engines": {
-    "vscode": "^1.93.0"
+    "vscode": "^1.104.0"
   },
   "enabledApiProposals": [
     "fileSearchProvider",
@@ -225,7 +225,11 @@
         },
         {
           "command": "vscode-objectscript.showClassDocumentationPreview",
-          "when": "editorLangId == objectscript-class && activeCustomEditorId == ''"
+          "when": "false"
+        },
+        {
+          "command": "vscode-objectscript.showAllClassMembers",
+          "when": "false"
         },
         {
           "command": "vscode-objectscript.exportCurrentFile",
@@ -535,14 +539,14 @@
           "command": "vscode-objectscript.showClassDocumentationPreview",
           "group": "navigation@3",
           "when": "editorLangId == objectscript-class && activeCustomEditorId == ''"
+        },
+        {
+          "command": "vscode-objectscript.showAllClassMembers",
+          "group": "[email protected]",
+          "when": "vscode-objectscript.connectActive && editorLangId == objectscript-class && activeCustomEditorId == ''"
         }
       ],
       "editor/title/context": [
-        {
-          "command": "vscode-objectscript.showClassDocumentationPreview",
-          "group": "1_open",
-          "when": "resourceLangId == objectscript-class && activeCustomEditorId == ''"
-        },
         {
           "command": "vscode-objectscript.showRESTDebugWebview",
           "group": "1_open",
@@ -1194,6 +1198,12 @@
         "command": "vscode-objectscript.openISCDocument",
         "title": "Open InterSystems Document...",
         "icon": "$(go-to-file)"
+      },
+      {
+        "category": "ObjectScript",
+        "command": "vscode-objectscript.showAllClassMembers",
+        "title": "Show All Class Members",
+        "icon": "$(symbol-class)"
       }
     ],
     "keybindings": [
@@ -1805,7 +1815,7 @@
     "test": "node ./out/test/runTest.js",
     "lint": "eslint src/**",
     "lint-fix": "eslint --fix src/**",
-    "download-api": "dts dev 1.93.0",
+    "download-api": "dts dev 1.104.0",
     "postinstall": "npm run download-api"
   },
   "devDependencies": {
@@ -1816,7 +1826,7 @@
     "@types/mocha": "^7.0.2",
     "@types/node": "20.17.6",
     "@types/semver": "7.5.4",
-    "@types/vscode": "1.93.0",
+    "@types/vscode": "1.104.0",
     "@types/ws": "8.18.0",
     "@types/xmldom": "^0.1.34",
     "@typescript-eslint/eslint-plugin": "^8.15.0",
@@ -1846,7 +1856,7 @@
     "@vscode/debugprotocol": "^1.68.0",
     "@vscode/extension-telemetry": "^1.0.0",
     "@xmldom/xmldom": "^0.9.8",
-    "axios": "^1.8.4",
+    "axios": "^1.12.0",
     "core-js": "^3.41.0",
     "iconv-lite": "^0.6.3",
     "istextorbinary": "^7.0.0",

package.json

@@ -26,6 +26,7 @@ import {
   handleError,
   isClassDeployed,
   isClassOrRtn,
+  isCompilable,
   lastUsedLocalUri,
   notIsfs,
   notNull,
@@ -353,7 +354,7 @@ export async function importAndCompile(
       throw error;
     })
     .then(() => {
-      if (compileFile) compile([file], flags);
+      if (compileFile && isCompilable(file.name)) compile([file], flags);
     });
 }
 
@@ -389,7 +390,7 @@ export async function compileOnly(askFlags = false, document?: vscode.TextDocume
 
   const defaultFlags = config().compileFlags;
   const flags = askFlags ? await compileFlags() : defaultFlags;
-  if (!file.fileName.startsWith("\\.vscode\\")) {
+  if (isCompilable(file.name)) {
     compile([file], flags);
   }
 }
@@ -464,7 +465,7 @@ async function importFiles(files: vscode.Uri[], noCompile = false) {
           )
           .then((curFile) => {
             if (curFile) {
-              if (typeof curFile.content == "string") toCompile.push(curFile); // Only compile text files
+              if (typeof curFile.content == "string" && isCompilable(curFile.name)) toCompile.push(curFile);
               return importFile(curFile).then(() => outputChannel.appendLine("Imported file: " + curFile.fileName));
             }
           });

src/commands/compile.ts

@@ -38,9 +38,10 @@ export class DocumaticPreviewPanel {
    */
   public static currentPanel: DocumaticPreviewPanel | undefined;
 
-  public static create(): void {
+  public static create(uri: vscode.Uri): void {
     // Get the open document and check that it's an ObjectScript class
-    const openEditor = vscode.window.activeTextEditor;
+    const uriString = uri.toString();
+    const openEditor = vscode.window.visibleTextEditors.find((e) => e.document.uri.toString() == uriString);
     if (openEditor === undefined) {
       // Need an open document to preview
       return;

src/commands/documaticPreviewPanel.ts

@@ -274,9 +274,13 @@ Would you like to continue?`,
       return;
     }
   }
-  return Promise.all(nodes.map((node) => node.getItems4Export())).then((items) => {
-    return exportList(items.flat(), node.workspaceFolder, nodeNs).then(() => explorerProvider.refresh());
-  });
+  return Promise.all(nodes.map((node) => node.getItems4Export()))
+    .then((items) => {
+      return exportList(items.flat(), node.workspaceFolder, nodeNs).then(() => explorerProvider.refresh());
+    })
+    .catch((error) => {
+      handleError(error, "Error exporting Explorer items.");
+    });
 }
 
 export async function exportCurrentFile(): Promise<any> {