Merge remote-tracking branch 'upstream/master' into statReadonly

Author: gjsjohnmurray

package.json

@@ -1609,6 +1609,19 @@
           ],
           "default": "//",
           "scope": "machine"
+        },
+        "objectscript.debug.stepGranularity": {
+          "markdownDescription": "Controls the granularity of the debugger's [step action buttons](https://code.visualstudio.com/docs/editor/debugging#_debug-actions). Changing this setting while a debugging session is active will not change the behavior of the active session. **NOTE:** Only supported on IRIS 2023.1.5, 2024.1.1+, 2024.2 and subsequent versions! On all other versions, line stepping will be used.",
+          "type": "string",
+          "enum": [
+            "command",
+            "line"
+          ],
+          "enumDescriptions": [
+            "The step buttons execute a single command.",
+            "The step buttons execute an entire line."
+          ],
+          "default": "command"
         }
       }
     },

src/commands/compile.ts

@@ -725,6 +725,7 @@ export async function importLocalFilesToServerSideFolder(wsFolderUri: vscode.Uri
     return;
   }
   // Get the name and content of the files to import
+  const textDecoder = new TextDecoder();
   const docs = await Promise.allSettled<{ name: string; content: string; uri: vscode.Uri }>(
     uris.map((uri) =>
       vscode.workspace.fs
@@ -768,11 +769,12 @@ export async function importLocalFilesToServerSideFolder(wsFolderUri: vscode.Uri
     docs.map((e) => e.name)
   );
   // Import the files
-  const textDecoder = new TextDecoder();
   return Promise.allSettled<string>(
     docs.map(
       throttleRequests((doc: { name: string; content: string; uri: vscode.Uri }) => {
-        return importFileFromContent(doc.name, doc.content, api).then(() => {
+        // Allow importing over deployed classes since the XML import
+        // command and SMP, terminal, and Studio imports allow it
+        return importFileFromContent(doc.name, doc.content, api, false, true).then(() => {
           outputChannel.appendLine("Imported file: " + doc.uri.path.split("/").pop());
           return doc.name;
         });

src/debug/debugSession.ts

@@ -205,6 +205,10 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
       await this._connection.sendFeatureSetCommand("max_children", 32);
       await this._connection.sendFeatureSetCommand("max_depth", 2);
       await this._connection.sendFeatureSetCommand("notify_ok", 1);
+      await this._connection.sendFeatureSetCommand(
+        "step_granularity",
+        vscode.workspace.getConfiguration("objectscript.debug").get<string>("stepGranularity")
+      );
 
       this.sendResponse(response);
 
@@ -599,6 +603,7 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
         const place = `${stackFrame.method}+${stackFrame.methodOffset}`;
         const stackFrameId = this._stackFrameIdCounter++;
         const fileText: string | undefined = await getFileText(fileUri).catch(() => undefined);
+        const hasCmdLoc = typeof stackFrame.cmdBeginLine == "number";
         if (fileText == undefined) {
           // Can't get the source for the document
           this._stackFrames.set(stackFrameId, stackFrame);
@@ -611,7 +616,7 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
               presentationHint: "deemphasize",
             },
             line,
-            column: 1,
+            column: 0,
           };
         }
         let noSource = false;
@@ -656,12 +661,20 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
         } catch (ex) {
           noSource = true;
         }
+        const lineDiff = line - stackFrame.line;
         return {
           id: stackFrameId,
           name: place,
           source: noSource ? null : source,
           line,
-          column: 1,
+          column: hasCmdLoc ? stackFrame.cmdBeginPos + 1 : 0,
+          endLine: hasCmdLoc ? stackFrame.cmdEndLine + lineDiff : undefined,
+          endColumn: hasCmdLoc
+            ? (stackFrame.cmdEndPos == 0
+                ? // A command that ends at position zero means "rest of this line"
+                  fileText.split(/\r?\n/)[stackFrame.cmdEndLine + lineDiff - 1].length
+                : stackFrame.cmdEndPos) + 1
+            : undefined,
         };
       })
     );

src/debug/xdebugConnection.ts

@@ -391,6 +391,14 @@ export class StackFrame {
   public line: number;
   /** The line number inside of method of class */
   public methodOffset: number;
+  /** The start line number of the current command */
+  public cmdBeginLine?: number;
+  /** The start position of the current command within the line */
+  public cmdBeginPos?: number;
+  /** The end line number of the current command */
+  public cmdEndLine?: number;
+  /** The end position of the current command within the line */
+  public cmdEndPos?: number;
   /** The level (index) inside the stack trace at which the stack frame receides */
   public level: number;
   /** The connection this stackframe belongs to */
@@ -406,6 +414,16 @@ export class StackFrame {
     this.line = parseInt(stackFrameNode.getAttribute("lineno"), 10);
     this.methodOffset = parseInt(stackFrameNode.getAttribute("methodoffset"), 10);
     this.level = parseInt(stackFrameNode.getAttribute("level"), 10);
+    const cmdBegin = stackFrameNode.getAttribute("cmdbegin");
+    const cmdEnd = stackFrameNode.getAttribute("cmdend");
+    if (cmdBegin && cmdEnd) {
+      const [cmdBeginLine, cmdBeginPos] = cmdBegin.split(":");
+      const [cmdEndLine, cmdEndPos] = cmdEnd.split(":");
+      this.cmdBeginLine = parseInt(cmdBeginLine, 10);
+      this.cmdBeginPos = parseInt(cmdBeginPos, 10);
+      this.cmdEndLine = parseInt(cmdEndLine, 10);
+      this.cmdEndPos = parseInt(cmdEndPos, 10);
+    }
     this.connection = connection;
   }
   /** Returns the available contexts (scopes, such as "Local" and "Superglobals") by doing a context_names command */

src/extension.ts

@@ -138,7 +138,6 @@ import { FileDecorationProvider } from "./providers/FileDecorationProvider";
 import { RESTDebugPanel } from "./commands/restDebugPanel";
 import { modifyWsFolder } from "./commands/addServerNamespaceToWorkspace";
 import { WebSocketTerminalProfileProvider, launchWebSocketTerminal } from "./commands/webSocketTerminal";
-import { getCSPToken } from "./utils/getCSPToken";
 import { setUpTestController } from "./commands/unitTest";
 
 const packageJson = vscode.extensions.getExtension(extensionId).packageJSON;
@@ -1384,20 +1383,24 @@ export async function activate(context: vscode.ExtensionContext): Promise<any> {
     vscode.commands.registerCommand(
       "vscode-objectscript.openPathInBrowser",
       async (path: string, docUri: vscode.Uri) => {
-        if (typeof path == "string" && docUri && docUri instanceof vscode.Uri) {
+        if (typeof path == "string" && docUri instanceof vscode.Uri) {
           const api = new AtelierAPI(docUri);
-          let uri = vscode.Uri.parse(
-            `${api.config.https ? "https" : "http"}://${api.config.host}:${api.config.port}${
-              api.config.pathPrefix
-            }${path}`
+          // Get the default web application for this namespace.
+          // If it can't be determined, fall back to the /csp/<namespace> web application.
+          const app: string =
+            (await api
+              .getCSPApps(true)
+              .then((data) => data.result.content.find((a) => a.default)?.name)
+              .catch(() => {
+                // Swallow errors
+              })) ?? `/csp/${api.ns}`;
+          vscode.env.openExternal(
+            vscode.Uri.parse(
+              `${api.config.https ? "https" : "http"}://${api.config.host}:${api.config.port}${
+                api.config.pathPrefix
+              }${app}${path}`
+            )
           );
-          const token = await getCSPToken(api, path.split("?")[0]).catch(() => "");
-          if (token.length > 0) {
-            uri = uri.with({
-              query: uri.query.length ? `${uri.query}&CSPCHD=${token}` : `CSPCHD=${token}`,
-            });
-          }
-          vscode.env.openExternal(uri);
         }
       }
     ),

src/providers/ObjectScriptCodeLensProvider.ts

@@ -70,7 +70,7 @@ export class ObjectScriptCodeLensProvider implements vscode.CodeLensProvider {
             command: "vscode-objectscript.openPathInBrowser",
             tooltip: "Open graphical editor in an external browser",
             arguments: [
-              `/csp/${api.config.ns.toLowerCase()}/EnsPortal.${
+              `/EnsPortal.${
                 xdataName == "BPL" ? `BPLEditor.zen?BP=${className}.BPL` : `DTLEditor.zen?DT=${className}.DTL`
               }`,
               document.uri,
@@ -87,7 +87,7 @@ export class ObjectScriptCodeLensProvider implements vscode.CodeLensProvider {
             title: "Test KPI",
             command: "vscode-objectscript.openPathInBrowser",
             tooltip: "Open testing page in an external browser",
-            arguments: [`/csp/${api.config.ns.toLowerCase()}/${className}.cls`, document.uri],
+            arguments: [`/${className}.cls`, document.uri],
           };
         }
         if (cmd) result.push(new vscode.CodeLens(new vscode.Range(i, 0, i, 80), cmd));