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

Author: isc-bsaviano

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Change Log
 
+## [3.0.3] 16-Jun-2025
+- Enhancements
+  - Cache the contents of files fetched during a debug session (#1579)
+- Fixes
+  - Fix `objectscript.autoAdjustName` behavior with `Save As...` (#1562)
+  - Fix detection of duplicate file change events (#1564)
+  - Attempt to use existing line endings when replacing a file's contents post-compile (#1567)
+  - Exempt files created due to server export from `objectscript.autoAdjustName` behavior (#1571)
+  - Prevent rare case where a file may be compiled twice due to concurrency issues (#1571)
+  - Improve code that exempts post-save compile from the batching behavior (#1571)
+  - Update the VS Code editor UI if a server-side document was changed during save (#1573)
+  - Don't show `Show Plan` CodeLenses inside string literals (#1574)
+  - Fix timeout of connection requests on activation (#1577)
+  - Fix the automatic termination of REST and unit test debug sessions (#1579)
+  - Prevent VS Code from showing a `Create File` button for files that are deployed when debugging (#1579)
+  - Don't attempt to set a breakpoint that's from a file in a different workspace folder (#1579)
+  - Fix debugging files in a client-side virtual workspace folder (#1579)
+  - Explicitly report failure to set a breakpoint (#1579)
+  - Use the document index to get determine the name of a document in a local file when debugging (#1579)
+  - Handle errors when fetching server-side source control menu options fails (#1580)
+  - Fix saving and re-opening of server-side documents on VS Code 1.101.0 (#1584)
+
 ## [3.0.2] 20-May-2025
 - Enhancements
   - Allow `objectscript.multilineMethodArgs` to be set per workspace folder (#1534)

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.2`, look for `3.0.3-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.3-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.0.3`, look for `3.0.4-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.4-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.json

@@ -2,7 +2,7 @@
   "name": "vscode-objectscript",
   "displayName": "InterSystems ObjectScript",
   "description": "InterSystems ObjectScript language support for Visual Studio Code",
-  "version": "3.0.3-SNAPSHOT",
+  "version": "3.0.4-SNAPSHOT",
   "icon": "images/logo.png",
   "aiKey": "9cd75d51-697c-406c-a929-2bcf46e97c64",
   "categories": [

src/api/index.ts

@@ -40,14 +40,6 @@ interface ConnectionSettings {
   dockerService?: string;
 }
 
-// Needed to fix a TS error
-declare let AbortSignal: {
-  prototype: AbortSignal;
-  new (): AbortSignal;
-  abort(reason?: any): AbortSignal;
-  timeout(milliseconds: number): AbortSignal;
-};
-
 export class AtelierAPI {
   private _config: ConnectionSettings;
   private namespace: string;
@@ -369,7 +361,7 @@ export class AtelierAPI {
     } else if (!cookies.length) {
       if (!authRequest) {
         // Recursion point
-        authRequest = this.request(0, "HEAD");
+        authRequest = this.request(0, "HEAD", undefined, undefined, undefined, undefined, options);
         authRequestMap.set(target, authRequest);
       }
       auth = authRequest;
@@ -408,7 +400,6 @@ export class AtelierAPI {
         data: body,
         withCredentials: true,
         httpsAgent,
-        timeout: options?.timeout ? options.timeout : 0,
         signal: options?.timeout ? AbortSignal.timeout(options.timeout) : undefined,
         validateStatus: (status) => status < 504,
       });
@@ -524,6 +515,25 @@ export class AtelierAPI {
 
       return data;
     } catch (error) {
+      if (
+        error?.message?.includes("Connection: close") &&
+        path?.includes("/doc/") &&
+        headers &&
+        headers["IF-NONE-MATCH"]
+      ) {
+        // This "Parse Error: Data after `Connection: close`" error is caused by
+        // stricter behavior in the llhttp library introduced in Node 22/VS Code 1.101.0.
+        // This only affects servers that use IIS as a web server, and it only occurs
+        // when a 304 Not Modified response is sent from the server.
+        // See https://github.com/intersystems-community/vscode-objectscript/issues/1583
+        if (outputTraffic) {
+          outputRequest();
+          outputChannel.appendLine(`+- RESPONSE -----------------------------------------`);
+          outputChannel.appendLine("304 Not Modified");
+          outputChannel.appendLine(`+- END ----------------------------------------------`);
+        }
+        throw { statusCode: 304, message: "Not Modified" };
+      }
       if (outputTraffic && !error.statusCode) {
         // Only output errors here if they were "hard" errors, not HTTP response errors
         outputRequest();
@@ -571,7 +581,6 @@ export class AtelierAPI {
         return Promise.all([
           workspaceState.update(this.configName.toLowerCase() + ":apiVersion", apiVersion),
           workspaceState.update(this.configName.toLowerCase() + ":serverVersion", serverVersion),
-          workspaceState.update(this.configName.toLowerCase() + ":iris", data.version.startsWith("IRIS")),
         ]).then(() => info);
       }
     });

src/commands/studio.ts

@@ -424,13 +424,13 @@ export class StudioActions {
 
     const query = "select * from %Atelier_v1_Utils.Extension_GetMenus(?,?,?)";
     const parameters = [menuType, this.name, selectedText];
+    const noun = sourceControl ? "source control action" : "command";
 
     return this.api
       .actionQuery(query, parameters)
       .then((data) => data.result.content)
       .then((menus) => this.prepareMenuItems(menus, sourceControl))
       .then((menuItems) => {
-        const noun = sourceControl ? "source control action" : "command";
         const suffix = this.name ? ` on ${this.name}` : "";
         if (menuItems.length == 0) {
           vscode.window.showInformationMessage(`There are no server-side ${noun}s to execute${suffix}.`, "Dismiss");
@@ -441,7 +441,10 @@ export class StudioActions {
           title: `Pick a server-side ${noun} to execute${suffix}`,
         });
       })
-      .then((action) => this.userAction(action));
+      .then((action) => this.userAction(action))
+      .catch((error) => {
+        handleError(error, `Failed to get the server-side ${noun} menu options.`);
+      });
   }
 
   public fireOtherStudioAction(action: OtherStudioAction, userAction?: UserAction): void {