Merge remote-tracking branch 'upstream/master' into fix-1278

Author: isc-bsaviano

package.json

@@ -1668,12 +1668,7 @@
                   "number",
                   "string"
                 ],
-                "description": "The CSP debug ID to use to identify the target process. If provided, 'processId' and 'stopOnEntry' are ignored."
-              },
-              "stopOnEntry": {
-                "type": "boolean",
-                "description": "Automatically stop target after attach. If not specified, target does not stop.",
-                "default": false
+                "description": "The CSP debug ID to use to identify the target process. If provided, 'processId' is ignored."
               }
             }
           }
@@ -1686,7 +1681,12 @@
             "type": "objectscript",
             "request": "launch",
             "name": "XDebug"
-          }
+          },
+          {
+            "type": "objectscript",
+            "request": "attach",
+            "name": "Attach to running process"
+          }    
         ],
         "configurationSnippets": [
           {

src/commands/project.ts

@@ -169,11 +169,14 @@ export async function deleteProject(node: ProjectNode | undefined): Promise<any>
     api = new AtelierAPI(vscode.Uri.parse(`isfs://${serverName}:${namespace}/`));
     project = await pickProject(api);
   }
-  if (project === undefined) {
+  if (project == undefined) {
     return;
   }
 
   try {
+    // Ask the user for confirmation
+    const answer = await vscode.window.showWarningMessage(`Delete project '${project}'?`, { modal: true }, "Yes", "No");
+    if (answer != "Yes") return;
     // Delete the project
     await api.actionQuery("DELETE FROM %Studio.Project WHERE Name = ?", [project]);
   } catch (error) {
@@ -446,7 +449,7 @@ async function pickAdditions(
             if (items.findIndex((pi) => pi.Type == "DIR" && pi.Name == app) == -1) {
               return {
                 label: "$(folder) " + app,
-                fullName: app,
+                fullName: i,
                 buttons: [
                   {
                     iconPath: new vscode.ThemeIcon("chevron-right"),
@@ -507,7 +510,7 @@ async function pickAdditions(
       if (category == "CLS" || !item.fullName.includes("/")) {
         tmpParams = [item.fullName + "/*.cls", sys, gen, project, item.fullName + ".", item.fullName + "."];
       } else {
-        tmpParams = [item.fullName + "/*", sys, gen, project, item.fullName + "/"];
+        tmpParams = [item.fullName + "/*", sys, gen, project, item.fullName.slice(1) + "/"];
       }
       if (category == undefined) {
         if (item.fullName.includes("/")) {
@@ -714,7 +717,11 @@ export async function modifyProject(
 
         let newAdd: ProjectItem[] = [];
         let newRemove: ProjectItem[] = [];
-        const addResult = addProjectItem(type == "CLS" || type == "PKG" ? pick.slice(0, -4) : pick, type, items);
+        const addResult = addProjectItem(
+          type == "CLS" || type == "PKG" ? pick.slice(0, -4) : type == "CSP" || type == "DIR" ? pick.slice(1) : pick,
+          type,
+          items
+        );
         newAdd = addResult.add;
         newRemove = addResult.remove;
 

src/debug/debugAdapterFactory.ts

@@ -5,33 +5,41 @@ import { ObjectScriptDebugSession } from "./debugSession";
 export class ObjectScriptDebugAdapterDescriptorFactory
   implements vscode.DebugAdapterDescriptorFactory, vscode.Disposable
 {
-  private server?: net.Server;
+  private serverMap = new Map<string, net.Server>();
 
   public createDebugAdapterDescriptor(
     session: vscode.DebugSession,
     executable: vscode.DebugAdapterExecutable | undefined
   ): vscode.ProviderResult<vscode.DebugAdapterDescriptor> {
-    if (!this.server) {
-      // start listening on a random port
-      const debugSession = new ObjectScriptDebugSession();
+    const debugSession = new ObjectScriptDebugSession();
+
+    // pickProcess may have added a suffix to inform us which folder's connection it used
+    const workspaceFolderIndex = (session.configuration.processId as string)?.split("@")[1];
+    const workspaceFolderUri = workspaceFolderIndex
+      ? vscode.workspace.workspaceFolders[parseInt(workspaceFolderIndex)]?.uri
+      : undefined;
+    debugSession.setupAPI(workspaceFolderUri);
 
-      this.server = net
+    const serverId = debugSession.serverId;
+    let server = this.serverMap.get(serverId);
+    if (!server) {
+      // start listening on a random port
+      server = net
         .createServer((socket) => {
           debugSession.setRunAsServer(true);
           debugSession.start(socket as NodeJS.ReadableStream, socket);
         })
         .listen(0);
+      this.serverMap.set(serverId, server);
     }
 
-    // make VS Code connect to debug server
-    const address = this.server.address();
+    // make VS Code connect to this debug server
+    const address = server.address();
     const port = typeof address !== "string" ? address.port : 9000;
     return new vscode.DebugAdapterServer(port);
   }
 
   public dispose(): void {
-    if (this.server) {
-      this.server.close();
-    }
+    this.serverMap.forEach((server) => server.close());
   }
 }

src/debug/debugSession.ts

@@ -63,6 +63,15 @@ async function convertClientPathToDebugger(uri: vscode.Uri, namespace: string):
 }
 
 export class ObjectScriptDebugSession extends LoggingDebugSession {
+  /** After setupAPI() has been called this will return the serverId string */
+  public get serverId(): string | undefined {
+    return this._api?.serverId;
+  }
+
+  private _api?: AtelierAPI;
+
+  private _workspaceFolderUri?: vscode.Uri;
+
   private _statuses = new Map<xdebug.Connection, xdebug.StatusResponse>();
 
   private _connection: xdebug.Connection;
@@ -89,8 +98,6 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
 
   private _workspace: string;
 
-  private cookies: string[] = [];
-
   /** If this is a CSPDEBUG session */
   private _isCsp = false;
 
@@ -106,9 +113,6 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
   /** If we're stopped at a breakpoint. */
   private _break = false;
 
-  /** If we should automatically stop target */
-  private _stopOnEntry: boolean;
-
   /** If this is a `launch` session */
   private _isLaunch = false;
 
@@ -127,6 +131,27 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
     } while (!this._debugTargetSet);
   }
 
+  /** To be called immediately after construction */
+  public setupAPI(workspaceFolderUri?: vscode.Uri): void {
+    // Only effective the first time
+    if (this._api) {
+      return;
+    }
+
+    this._workspaceFolderUri = workspaceFolderUri;
+    if (workspaceFolderUri) {
+      // The uri of the relevant workspace folder was set after construction
+      this._workspace = undefined;
+      this._api = new AtelierAPI(workspaceFolderUri);
+    } else {
+      // Fall back to old way of deciding where to connect
+      const file = currentFile();
+      this._workspace = file?.workspaceFolder;
+      this._api = new AtelierAPI(file?.uri);
+    }
+    return;
+  }
+
   /** Check if the target is stopped */
   private async _isStopped(): Promise<boolean> {
     return this._connection
@@ -164,21 +189,16 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
     };
 
     try {
-      const file = currentFile();
-      this._workspace = file?.workspaceFolder;
-
-      const api = new AtelierAPI(file?.uri);
-      this.cookies = api.cookies;
-      if (!api.active) {
+      if (!this._api.active) {
         throw new Error("Connection not active");
       }
-      this._namespace = api.ns;
-      this._url = api.xdebugUrl();
+      this._namespace = this._api.ns;
+      this._url = this._api.xdebugUrl();
 
       const socket = new WebSocket(this._url, {
         rejectUnauthorized: vscode.workspace.getConfiguration("http").get("proxyStrictSSL"),
         headers: {
-          cookie: this.cookies,
+          cookie: this._api.cookies,
         },
       });
 
@@ -228,7 +248,7 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
 
   protected async launchRequest(response: DebugProtocol.LaunchResponse, args: LaunchRequestArguments): Promise<void> {
     try {
-      this._debugTargetSet = this._stopOnEntry = false;
+      this._debugTargetSet = false;
       this._isLaunch = true;
       const debugTarget = `${this._namespace}:${args.program}`;
       await this._connection.sendFeatureSetCommand("debug_target", debugTarget, true);
@@ -243,8 +263,8 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
   protected async attachRequest(response: DebugProtocol.AttachResponse, args: AttachRequestArguments): Promise<void> {
     try {
       this._debugTargetSet = this._isLaunch = false;
-      this._stopOnEntry = args.stopOnEntry;
-      const debugTarget = args.cspDebugId != undefined ? `CSPDEBUG:${args.cspDebugId}` : `PID:${args.processId}`;
+      const debugTarget =
+        args.cspDebugId != undefined ? `CSPDEBUG:${args.cspDebugId}` : `PID:${args.processId.split("@")[0]}`;
       await this._connection.sendFeatureSetCommand("debug_target", debugTarget);
       if (args.cspDebugId != undefined) {
         if (args.isUnitTest) {
@@ -258,7 +278,6 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
           await this._connection.sendBreakpointSetCommand(new xdebug.Watchpoint("ok", this._cspWatchpointCondition));
           this._isCsp = true;
         }
-        this._stopOnEntry = false;
         this.sendResponse(response);
       } else {
         this._isCsp = false;
@@ -291,11 +310,9 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
     args: DebugProtocol.ConfigurationDoneArguments
   ): Promise<void> {
     if (!this._isLaunch && !this._isCsp) {
-      // The debug agent ignores the first run command for non-CSP attaches,
-      // so send one right away, regardless of the stopOnEntry value
+      // The debug agent ignores the first run command
+      // for non-CSP attaches, so send one right away
       await this._connection.sendRunCommand();
-    }
-    if (this._stopOnEntry && !this._isLaunch && !this._isCsp) {
       // Tell VS Code that we're stopped
       this.sendResponse(response);
       const event: DebugProtocol.StoppedEvent = new StoppedEvent("entry", this._connection.id);
@@ -597,7 +614,13 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
       stack.stack.map(async (stackFrame: xdebug.StackFrame, index): Promise<StackFrame> => {
         const [, namespace, name] = decodeURI(stackFrame.fileUri).match(/^dbgp:\/\/\|([^|]+)\|(.*)$/);
         const routine = name;
-        const fileUri = DocumentContentProvider.getUri(routine, this._workspace, namespace);
+        const fileUri = DocumentContentProvider.getUri(
+          routine,
+          this._workspace,
+          namespace,
+          undefined,
+          this._workspaceFolderUri
+        );
         const source = new Source(routine, fileUri.toString());
         let line = stackFrame.line + 1;
         const place = `${stackFrame.method}+${stackFrame.methodOffset}`;