Merge pull request #27 from pbdm/master

support custom debug config for both lldb and other types
xmake-io · Mar 20, 2020 · 9de64db · 9de64db
2 parents 30402ef + b54dc54
commit 9de64db
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -338,9 +338,7 @@
                 },
                 "xmake.customDebugConfig": {
                     "type": "object",
-                    "default": {
-                        "type": "cppdbg"
-                    },
+                    "default": {},
                     "description": "The Custom Debugging Configurations when xmake.debugConfigType is custom"
                 }
             }

diff --git a/src/debugger.ts b/src/debugger.ts
@@ -108,14 +108,15 @@ export class Debugger implements vscode.Disposable {
                 };
             }
 
-            if (config.debugConfigType == "custom") {
-                var customcfg = config.customDebugConfig;
-                for (let key in customcfg) {
-                    debugConfig[key] = customcfg[key];
-                }
-            }
         }
 
+        var customcfg = config.customDebugConfig;
+        for (let key in customcfg) {
+            debugConfig[key] = customcfg[key];
+        }
+        // default type if not set yet
+        debugConfig.type = debugConfig.type || 'cppdbg';
+
         // start debugging
         if (debugConfig) {
             await vscode.debug.startDebugging(vscode.workspace.workspaceFolders[0], debugConfig);