improve debugger

Author: waruqi

src/debugger.ts

@@ -53,13 +53,13 @@ export class Debugger implements vscode.Disposable {
 
         // get target arguments
         let args = [];
-        if (targetName in config.debuggingTargetsArguments)
+        if (config.debuggingTargetsArguments && targetName in config.debuggingTargetsArguments)
             args = config.debuggingTargetsArguments[targetName];
-        else if ("default" in config.debuggingTargetsArguments)
+        else if (config.debuggingTargetsArguments && "default" in config.debuggingTargetsArguments)
             args = config.debuggingTargetsArguments["default"];
-        else if (targetName in config.runningTargetsArguments)
+        else if (config.runningTargetsArguments && targetName in config.runningTargetsArguments)
             args = config.runningTargetsArguments[targetName];
-        else if ("default" in config.runningTargetsArguments)
+        else if (config.runningTargetsArguments && "default" in config.runningTargetsArguments)
             args = config.runningTargetsArguments["default"];
 
         // uses codelldb debugger?

src/launchDebugger.ts

@@ -211,13 +211,13 @@ class XmakeConfigurationProvider implements vscode.DebugConfigurationProvider {
         if (!config.args) {
             let args = [];
 
-            if (config.target in config.debuggingTargetsArguments)
+            if (config.debuggingTargetsArguments && config.target in config.debuggingTargetsArguments)
                 args = config.debuggingTargetsArguments[config.target];
-            else if ("default" in config.debuggingTargetsArguments)
+            else if (config.debuggingTargetsArguments && "default" in config.debuggingTargetsArguments)
                 args = config.debuggingTargetsArguments["default"];
-            else if (config.target in config.runningTargetsArguments)
+            else if (config.runningTargetsArguments && config.target in config.runningTargetsArguments)
                 args = config.runningTargetsArguments[config.target];
-            else if ("default" in config.runningTargetsArguments)
+            else if (config.runningTargetsArguments && "default" in config.runningTargetsArguments)
                 args = config.runningTargetsArguments["default"];
 
             config.args = args;

src/xmake.ts

@@ -901,9 +901,9 @@ export class XMake implements vscode.Disposable {
         // get target arguments
         let args = ["run"];
         let configArgs = [];
-        if (targetName && targetName in config.runningTargetsArguments)
+        if (targetName && config.runningTargetsArguments && targetName in config.runningTargetsArguments)
             configArgs = config.runningTargetsArguments[targetName];
-        else if ("default" in config.runningTargetsArguments)
+        else if (config.runningTargetsArguments && "default" in config.runningTargetsArguments)
             configArgs = config.runningTargetsArguments["default"];
 
         // make command
@@ -949,9 +949,9 @@ export class XMake implements vscode.Disposable {
         // get target arguments
         let args = ["run"];
         let configArgs = [];
-        if (targetName && targetName in config.runningTargetsArguments)
+        if (targetName && config.runningTargetsArguments && targetName in config.runningTargetsArguments)
             configArgs = config.runningTargetsArguments[targetName];
-        else if ("default" in config.runningTargetsArguments)
+        else if (config.runningTargetsArguments && "default" in config.runningTargetsArguments)
             configArgs = config.runningTargetsArguments["default"];
 
         // make command