added sourceBasePath, separated from workingDirectory

Author: lee-seungjae

DebugAdapter/DebugSession.cs

@@ -31,6 +31,7 @@ public class DebugSession : ICDPListener, IDebuggeeListener, IRemoteControllerLi
         RemoteController giderosRemoteController;
         string giderosStdoutBuffer = "";
         string workingDirectory;
+        string sourceBasePath;
         Tuple<string, int> fakeBreakpointMode = null;
         string startCommand;
         int startSeq;
@@ -63,7 +64,7 @@ void ICDPListener.X_FromVSCode(string command, int seq, dynamic args, string req
                     }
                     else if (command == "stackTrace")
                     {
-                        var src = new Source(Path.Combine(workingDirectory, fakeBreakpointMode.Item1));
+                        var src = new Source(Path.Combine(sourceBasePath, fakeBreakpointMode.Item1));
                         var f = new StackFrame(9999, "fake-frame", src, fakeBreakpointMode.Item2, 0);
                         SendResponse(command, seq, new StackTraceResponseBody(
                             new List<StackFrame>() { f }));
@@ -221,7 +222,6 @@ void Launch(string command, int seq, dynamic args)
                 }
 
                 //--------------------------------
-                // validate argument 'workingDirectory'
                 if (!ReadBasicConfiguration(command, seq, args)) { return; }
 
                 //--------------------------------
@@ -374,7 +374,7 @@ bool ReadBasicConfiguration(string command, int seq, dynamic args)
             workingDirectory = workingDirectory.Trim();
             if (workingDirectory.Length == 0)
             {
-                SendErrorResponse(command, seq, 3003, "Property 'cwd' is empty.");
+                SendErrorResponse(command, seq, 3003, "Property 'workingDirectory' is empty.");
                 return false;
             }
             if (!Directory.Exists(workingDirectory))
@@ -395,6 +395,15 @@ bool ReadBasicConfiguration(string command, int seq, dynamic args)
                 stopGiderosWhenDebuggerStops = true;
             }
 
+            if (args.sourceBasePath != null)
+            {
+                sourceBasePath = (string)args.sourceBasePath;
+            }
+            else
+            {
+                sourceBasePath = workingDirectory;
+            }
+
             return true;
         }
 
@@ -408,7 +417,7 @@ void IDebuggeeListener.X_DebuggeeArrived(IDebuggeeSender toDebuggee)
                 var welcome = new
                 {
                     command = "welcome",
-                    sourceBasePath = workingDirectory
+                    sourceBasePath = sourceBasePath
                 };
                 toDebuggee.Send(JsonConvert.SerializeObject(welcome));
 

Extension/package.json

@@ -85,6 +85,11 @@
                                 "description": "Working directory",
                                 "default": "${workspaceRoot}"
                             },
+                            "sourceBasePath": {
+                                "type": "string",
+                                "description": "Base path of lua source files",
+                                "default": "${workspaceRoot}"
+                            },
                             "executable": {
                                 "type": "string",
                                 "description": "An exe file to launch",
@@ -147,6 +152,11 @@
                                 "description": "Working directory",
                                 "default": "${workspaceRoot}"
                             },
+                            "sourceBasePath": {
+                                "type": "string",
+                                "description": "Base path of lua source files",
+                                "default": "${workspaceRoot}"
+                            },
                             "listenPublicly": {
                                 "type": "boolean",
                                 "description": "Set this to true if the debuggee will run in different computer.",