Integrate from LLVM at llvm/llvm-project@73ab0c0

Author: github-actions[bot]

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "lldb-dap",
   "displayName": "LLDB DAP",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "publisher": "llvm-vs-code-extensions",
   "homepage": "https://lldb.llvm.org",
   "description": "LLDB debugging from VSCode",
@@ -27,7 +27,7 @@
     "Debuggers"
   ],
   "devDependencies": {
-    "@types/node": "^18.11.18",
+    "@types/node": "^18.19.41",
     "@types/vscode": "1.75.0",
     "@vscode/vsce": "^3.2.2",
     "prettier-plugin-curly": "^0.3.1",
@@ -86,7 +86,7 @@
           "default": {},
           "description": "The environment of the lldb-dap process.",
           "additionalProperties": {
-             "type": "string"
+            "type": "string"
           }
         }
       }
@@ -152,6 +152,10 @@
               "program"
             ],
             "properties": {
+              "debugAdapterExecutable": {
+                "type": "string",
+                "markdownDescription": "The absolute path to the LLDB debug adapter executable to use."
+              },
               "program": {
                 "type": "string",
                 "description": "Path to the program to debug."
@@ -338,6 +342,10 @@
           },
           "attach": {
             "properties": {
+              "debugAdapterExecutable": {
+                "type": "string",
+                "markdownDescription": "The absolute path to the LLDB debug adapter executable to use."
+              },
               "program": {
                 "type": "string",
                 "description": "Path to the program to attach to."

package.json

@@ -50,13 +50,13 @@ async function findDAPExecutable(): Promise<string | undefined> {
   const executable = process.platform === "win32" ? "lldb-dap.exe" : "lldb-dap";
 
   // Prefer lldb-dap from Xcode on Darwin.
-  const xcrun_dap = findWithXcrun(executable);
+  const xcrun_dap = await findWithXcrun(executable);
   if (xcrun_dap) {
     return xcrun_dap;
   }
 
   // Find lldb-dap in the user's path.
-  const path_dap = findInPath(executable);
+  const path_dap = await findInPath(executable);
   if (path_dap) {
     return path_dap;
   }
@@ -67,12 +67,17 @@ async function findDAPExecutable(): Promise<string | undefined> {
 async function getDAPExecutable(
   session: vscode.DebugSession,
 ): Promise<string | undefined> {
+  // Check if the executable was provided in the launch configuration.
+  const launchConfigPath = session.configuration["debugAdapterExecutable"];
+  if (typeof launchConfigPath === "string" && launchConfigPath.length !== 0) {
+    return launchConfigPath;
+  }
+
+  // Check if the executable was provided in the extension's configuration.
   const config = vscode.workspace.getConfiguration(
     "lldb-dap",
     session.workspaceFolder,
   );
-
-  // Prefer the explicitly specified path in the extension's configuration.
   const configPath = config.get<string>("executable-path");
   if (configPath && configPath.length !== 0) {
     return configPath;