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

Author: isc-bsaviano

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## [3.0.4] 30-Jun-2025
+- Enhancements
+  - Shorten server-side error messages (#1587)
+  - Make it more clear when a server connection failed due to a timeout (#1592)
+- Fixes
+  - Fix mapping of breakpoints when debugging a local file on Windows (#1586)
+  - Fix routine location status bar item flickering while typing (#1590)
+  - Fix comparing of local and server versions of web app files (#1599)
+
 ## [3.0.3] 16-Jun-2025
 - Enhancements
   - Cache the contents of files fetched during a debug session (#1579)

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.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.
+	- Locate the beta immediately above the release you installed from Marketplace. For instance, if you installed `3.0.4`, look for `3.0.5-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.5-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.4-SNAPSHOT",
+  "version": "3.0.5-SNAPSHOT",
   "icon": "images/logo.png",
   "aiKey": "9cd75d51-697c-406c-a929-2bcf46e97c64",
   "categories": [

src/commands/compile.ts

@@ -168,6 +168,7 @@ What do you want to do?`,
                     vscode.Uri.file(file.name).with({
                       scheme: OBJECTSCRIPT_FILE_SCHEMA,
                       authority: file.workspaceFolder,
+                      query: file.name.includes("/") ? "csp" : "",
                     }),
                     file.uri,
                     `Server • ${file.name} ↔ Local • ${file.fileName}`

src/debug/debugSession.ts

@@ -361,7 +361,11 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
     try {
       await this._waitForDebugTarget();
 
-      const uri = vscode.Uri.parse(args.source.path);
+      // args.source.path is a file path if the file is local and is a stringified Uri if the file is virtual
+      const uri =
+        (this._workspaceFolderUri ?? vscode.workspace.workspaceFolders[0]?.uri)?.scheme == "file"
+          ? vscode.Uri.file(args.source.path)
+          : vscode.Uri.parse(args.source.path);
       const wsFolder = vscode.workspace.getWorkspaceFolder(uri);
       if (!wsFolder || (this._workspaceFolderUri && wsFolder.uri.toString() != this._workspaceFolderUri.toString())) {
         response.body = {

src/extension.ts

@@ -298,7 +298,7 @@ async function resolvePassword(serverSpec, ignoreUnauthenticated = false): Promi
       });
     }
     if (session) {
-      // If original spec lacked username use the one obtained by the authprovider
+      // If original spec lacked username use the one obtained from the user by the authprovider (exact case)
       serverSpec.username = serverSpec.username || session.scopes[1];
       serverSpec.password = session.accessToken;
     }
@@ -562,6 +562,10 @@ export async function checkConnection(
         }
         if (success) return;
       }
+      if (["ECONNABORTED", "ERR_CANCELED"].includes(error?.code)) {
+        error = `Request timed out; server took longer than ${serverInfoTimeout} ms to respond.`;
+        message = `Request timed out after ${serverInfoTimeout} ms`;
+      }
       handleError(
         errorMessage ?? error,
         `Failed to connect to server '${api.serverId}'. Check your server configuration.`
@@ -843,9 +847,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
       continue;
     }
   }
-  for await (const workspaceFolder of vscode.workspace.workspaceFolders ?? []) {
-    await addWsServerRootFolderData(workspaceFolder.uri);
-  }
+  await Promise.allSettled(
+    vscode.workspace.workspaceFolders?.map((wsFolder) => addWsServerRootFolderData(wsFolder.uri)) || []
+  );
 
   xmlContentProvider = new XmlContentProvider();
 
@@ -1383,9 +1387,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
         const serverName = notIsfs(uri) ? config("conn", configName).server : configName;
         await resolveConnectionSpec(serverName);
       }
-      for await (const workspaceFolder of added) {
-        await addWsServerRootFolderData(workspaceFolder.uri);
-      }
+      await Promise.allSettled(added.map((wsFolder) => addWsServerRootFolderData(wsFolder.uri)));
     }),
     vscode.workspace.onDidChangeConfiguration(async ({ affectsConfiguration }) => {
       if (affectsConfiguration("objectscript.conn") || affectsConfiguration("intersystems.servers")) {
@@ -1440,39 +1442,33 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
     }),
     vscode.window.onDidChangeActiveTextEditor(async (textEditor: vscode.TextEditor) => {
       if (!textEditor) return;
-      posPanel.text = "";
       await checkConnection(false, textEditor.document.uri);
       if (textEditor.document.uri.path.toLowerCase().endsWith(".xml") && config("autoPreviewXML")) {
         return previewXMLAsUDL(textEditor, true);
       }
     }),
-    vscode.window.onDidChangeTextEditorSelection((event: vscode.TextEditorSelectionChangeEvent) => {
+    vscode.window.onDidChangeTextEditorSelection(async (event: vscode.TextEditorSelectionChangeEvent) => {
       const document = event.textEditor.document;
-
-      // Avoid losing position indicator if event came from output channel
-      if (document.uri.scheme == "output") {
-        return;
-      }
-      posPanel.text = "";
-      if (![macLangId, intLangId].includes(document.languageId)) {
-        return;
-      }
-      if (event.selections.length > 1 || !event.selections[0].isEmpty) {
-        return;
-      }
-
-      const file = currentFile(document);
-      const nameMatch = file.name.match(/(.*)\.(int|mac)$/i);
-      if (!nameMatch) {
-        return;
-      }
-      const [, routine] = nameMatch;
-      let label = "";
-      let pos = 0;
-      vscode.commands
-        .executeCommand<vscode.DocumentSymbol[]>("vscode.executeDocumentSymbolProvider", document.uri)
-        .then((symbols) => {
-          if (symbols != undefined) {
+      // Avoid losing position indicator if event came from output channel or a non-active editor
+      if (document.uri.scheme == "output" || vscode.window.activeTextEditor != event.textEditor) return;
+      try {
+        if (
+          ![macLangId, intLangId].includes(document.languageId) ||
+          event.selections.length > 1 ||
+          !event.selections[0].isEmpty
+        ) {
+          throw undefined;
+        }
+        const file = currentFile(document);
+        const nameMatch = file.name.match(/(.*)\.(int|mac)$/i);
+        if (!nameMatch) throw undefined;
+        const [, routine] = nameMatch;
+        let label = "";
+        let pos = 0;
+        await vscode.commands
+          .executeCommand<vscode.DocumentSymbol[]>("vscode.executeDocumentSymbolProvider", document.uri)
+          .then((symbols) => {
+            if (!symbols) throw undefined;
             const cursor = event.selections[0].active;
             if (symbols.length == 0 || cursor.isBefore(symbols[0].range.start)) {
               pos = cursor.line - 1;
@@ -1486,8 +1482,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
               }
             }
             posPanel.text = `${label}${pos > 0 ? "+" + pos : ""}^${routine}`;
-          }
-        });
+          });
+      } catch {
+        // If we couldn't resolve the cursor location to a label+offset^routine
+        // for any reason, hide the status bar item
+        posPanel.text = "";
+      }
     }),
     vscode.commands.registerCommand("vscode-objectscript.loadStudioSnippets", loadStudioSnippets),
     vscode.commands.registerCommand("vscode-objectscript.loadStudioColors", () => {

src/providers/FileSystemProvider/FileSystemProvider.ts

@@ -504,7 +504,8 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
             })
             .catch((error) => {
               // Throw all failures
-              throw vscode.FileSystemError.Unavailable(stringifyError(error) || uri);
+              const errorStr = stringifyError(error);
+              throw errorStr ? errorStr : vscode.FileSystemError.Unavailable(uri);
             });
         },
         (error) => {
@@ -527,7 +528,8 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
             )
             .catch((error) => {
               // Throw all failures
-              throw vscode.FileSystemError.Unavailable(stringifyError(error) || uri);
+              const errorStr = stringifyError(error);
+              throw errorStr ? errorStr : vscode.FileSystemError.Unavailable(uri);
             })
             .then((data) => {
               // New file has been written
@@ -771,7 +773,8 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
       )
       .catch((error) => {
         // Throw all failures
-        throw vscode.FileSystemError.Unavailable(stringifyError(error) || newUri);
+        const errorStr = stringifyError(error);
+        throw errorStr ? errorStr : vscode.FileSystemError.Unavailable(newUri);
       })
       .then(async (response) => {
         // New file has been written
@@ -985,9 +988,12 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
       )
       .catch((error) => {
         if (error?.statusCode == 304 && cachedFile) return cachedFile;
-        const errArg = stringifyError(error) || uri;
-        if (error?.statusCode == 404) throw vscode.FileSystemError.FileNotFound(errArg);
-        throw vscode.FileSystemError.Unavailable(errArg);
+        const errorStr = stringifyError(error);
+        throw error?.statusCode == 404
+          ? vscode.FileSystemError.FileNotFound(uri)
+          : errorStr
+            ? errorStr
+            : vscode.FileSystemError.Unavailable(uri);
       });
   }