Address more review comments

Author: vogelsgesang

lldb/tools/lldb-dap/README.md

@@ -178,15 +178,17 @@ The default hostname being used `localhost`.
 
 Debugging sessions can also be starting using special URIs.
 
-The `vscode://llvm-vs-code-extensions.lldb-dap/launch/config?config={launch-config}`
+The `vscode://llvm-vs-code-extensions.lldb-dap/start?config={launch-config}`
 URI accepts a [URL-encoded](https://en.wikipedia.org/wiki/Percent-encoding)
 JSON launch config.
 
 This is useful for integration with custom scripts to start debugging
 sessions. The URI might be printed to the terminal, potentially using
 [OSC-8 hyperlinks](https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda),
-or passed to `vscode --open-url` or `xdg-open`, although mileage may vary
-depending on your specific debugging setup.
+or passed to `code --open-url` or `xdg-open`, although mileage may vary depending
+on your specific debugging setup. E.g., `code --open-url` will not work when using a
+SSH remote session. Furthermore, placeholders such as `${workspaceFolder}` are not
+supported within launch URLs.
 
 ### Configuration Settings Reference
 

lldb/tools/lldb-dap/src-ts/uri-launch-handler.ts

@@ -4,7 +4,7 @@ export class LaunchUriHandler implements vscode.UriHandler {
     async handleUri(uri: vscode.Uri) {
         try {
             const params = new URLSearchParams(uri.query);
-            if (uri.path == '/launch/config') {
+            if (uri.path == '/start') {
                 const configJson = params.get("config");
                 if (configJson === null) {
                     throw new Error("Missing `config` URI parameter");
@@ -16,7 +16,8 @@ export class LaunchUriHandler implements vscode.UriHandler {
                     name: '',
                 };
                 Object.assign(debugConfig, JSON.parse(configJson));
-                debugConfig.name = debugConfig.name || debugConfig.program || "Adhoc Launch";
+                const defaultName = debugConfig.request == 'launch' ? "URL-based Launch" : "URL-based Attach";
+                debugConfig.name = debugConfig.name || debugConfig.program || defaultName;
                 // Force the type to `lldb-dap`. We don't want to allow launching any other
                 // Debug Adapters using this URI scheme.
                 if (debugConfig.type != "lldb-dap") {
@@ -30,8 +31,8 @@ export class LaunchUriHandler implements vscode.UriHandler {
             if (err instanceof Error) {
                 await vscode.window.showErrorMessage(`Failed to handle lldb-dap URI request: ${err.message}`);
             } else {
-                await vscode.window.showErrorMessage(`Failed to handle lldb-dap URI request`);
+                await vscode.window.showErrorMessage(`Failed to handle lldb-dap URI request: ${JSON.stringify(err)}`);
             }
         }
     }
-}
+}