Перенос значений workspace в поля класса

Author: Bayselonarrend

src/VSCode.DebugAdapter/DebugeeProcess.cs

@@ -59,6 +59,10 @@ public int ProtocolVersion
 
         public bool WaitOnStart { get; set; }
 
+        public string HostWorkspace { get; set; }
+
+        public string RemoteWorkspace { get; set; }
+
         public void Start()
         {
             _process = CreateProcess();
@@ -100,6 +104,7 @@ public void InitAttached()
             _attachMode = true;
             _process.EnableRaisingEvents = true;
             _process.Exited += Process_Exited;
+
         }
 
         public void Init(JObject args)

src/VSCode.DebugAdapter/OscriptDebugSession.cs

@@ -137,7 +137,10 @@ public override void Attach(Response response, dynamic arguments)
         {
             LogCommandReceived();
             SubscribeForDebuggeeProcessEvents();
+
             _debuggee.DebugPort = GetFromContainer(arguments, "debugPort", 2801);
+            _debuggee.HostWorkspace = GetFromContainer(arguments, "hostWorkspace", "");
+            _debuggee.RemoteWorkspace = GetFromContainer(arguments, "remoteWorkspace", "");
 
             DebugClientFactory debugClientFactory;
             try
@@ -265,10 +268,49 @@ public override void SetBreakpoints(Response response, dynamic arguments)
 
         private string NormalizeDriveLetter(string path)
         {
+            var clientPath = path;
+            
             if (Path.IsPathRooted(path))
-                return path[0].ToString().ToUpperInvariant() + path.Substring(1);
-            else
-                return path;
+                clientPath = path[0].ToString().ToUpperInvariant() + path.Substring(1);
+
+			if (!string.IsNullOrWhiteSpace(_debuggee.HostWorkspace) && !string.IsNullOrWhiteSpace(_debuggee.RemoteWorkspace))
+			{
+
+                var hostWorkspace = _debuggee.HostWorkspace;
+                var remoteWorkspace = _debuggee.RemoteWorkspace;
+
+				string normalizedClientPath = clientPath.Replace('/', '\\').Trim();
+				string normalizedHostWorkspace = hostWorkspace.Replace('/', '\\').Trim();
+				
+				if (!normalizedHostWorkspace.EndsWith("\\"))
+					normalizedHostWorkspace += "\\";
+					
+				if (!normalizedClientPath.EndsWith("\\"))
+					normalizedClientPath += "\\";
+
+				if (normalizedClientPath.StartsWith(normalizedHostWorkspace, StringComparison.OrdinalIgnoreCase))
+				{
+
+					string relativePath = normalizedClientPath.Substring(normalizedHostWorkspace.Length);
+					relativePath = relativePath.TrimStart('\\');
+					
+					string normalizedRemote = remoteWorkspace.Trim().Replace('\\', '/');
+					normalizedRemote = normalizedRemote.TrimEnd('/');
+					
+					string result = string.IsNullOrEmpty(relativePath) 
+						? normalizedRemote
+						: normalizedRemote + "/" + relativePath.Replace('\\', '/');
+					
+					Console.Error.WriteLine($"Path mapped: '{clientPath}' -> '{result}'");
+					return result;
+				}
+				else
+				{
+					Console.Error.WriteLine($"Path mapping skipped: '{clientPath}' doesn't start with '{hostWorkspace}'");
+				}
+			}
+		
+            return clientPath;
 
         }
 

src/VSCode.DebugAdapter/PathHandlingStrategy.cs

@@ -69,52 +69,6 @@ public string ConvertClientPathToDebugger(string clientPath)
 				return null;
 			}
 
-			string hostWorkspace = Environment.GetEnvironmentVariable("OSCRIPT_DEBUGWORKSPACE_HOST");
-			string remoteWorkspace = Environment.GetEnvironmentVariable("OSCRIPT_DEBUGWORKSPACE_REMOTE");
-
-			if (!string.IsNullOrWhiteSpace(hostWorkspace) && !string.IsNullOrWhiteSpace(remoteWorkspace))
-			{
-
-				string normalizedClientPath = clientPath.Replace('/', '\\').Trim();
-				string normalizedHostWorkspace = hostWorkspace.Replace('/', '\\').Trim();
-				
-				if (!normalizedHostWorkspace.EndsWith("\\"))
-					normalizedHostWorkspace += "\\";
-					
-				if (!normalizedClientPath.EndsWith("\\"))
-					normalizedClientPath += "\\";
-
-				if (normalizedClientPath.StartsWith(normalizedHostWorkspace, StringComparison.OrdinalIgnoreCase))
-				{
-
-					string relativePath = normalizedClientPath.Substring(normalizedHostWorkspace.Length);
-					relativePath = relativePath.TrimStart('\\');
-					
-					string normalizedRemote = remoteWorkspace.Trim().Replace('\\', '/');
-					normalizedRemote = normalizedRemote.TrimEnd('/');
-					
-					string result = string.IsNullOrEmpty(relativePath) 
-						? normalizedRemote
-						: normalizedRemote + "/" + relativePath.Replace('\\', '/');
-					
-					Console.Error.WriteLine($"Path mapped: '{clientPath}' -> '{result}'");
-					return result;
-				}
-				else
-				{
-					Console.Error.WriteLine($"Path mapping skipped: '{clientPath}' doesn't start with '{hostWorkspace}'");
-				}
-			}
-			else
-			{
-				if (string.IsNullOrWhiteSpace(hostWorkspace) && string.IsNullOrWhiteSpace(remoteWorkspace))
-					Console.Error.WriteLine("Path mapping: both OSCRIPT_DEBUGWORKSPACE_HOST and OSCRIPT_DEBUGWORKSPACE_REMOTE are not set");
-				else if (string.IsNullOrWhiteSpace(hostWorkspace))
-					Console.Error.WriteLine("Path mapping: OSCRIPT_DEBUGWORKSPACE_HOST is not set or empty");
-				else if (string.IsNullOrWhiteSpace(remoteWorkspace))
-					Console.Error.WriteLine("Path mapping: OSCRIPT_DEBUGWORKSPACE_REMOTE is not set or empty");
-			}
-
 			if (DebuggerPathsAreUri) {
 				if (ClientPathsAreUri) {
 					return clientPath;

src/VSCode.DebugAdapter/package.json

@@ -133,19 +133,17 @@
                 "description": "Кодировка вывода отлаживаемого приложения. Отладчик будет интерпретировать вывод приложения в указанной кодировке",
                 "default": ""
               },
-              "env": {
-                "type": "object",
-                "description": "Переменные окружения для debug adapter",
-                "patternProperties": {
-                  "[a-zA-Z_][0-9a-zA-Z_]+": {
-                    "type": "string"
-                  }
-                },
-                "default": {
-                  "OSCRIPT_DEBUGWORKSPACE_HOST": "",
-                  "OSCRIPT_DEBUGWORKSPACE_REMOTE": ""
-                }
+              "hostWorkspace": {
+                "type": "string",
+                "description": "Путь к каталогу проекта на локальной машине (при отладке удаленного процесса)",
+                "default": ""
+              },
+              "remoteWorkspace": {
+                "type": "string",
+                "description": "Путь к каталогу проекта на удаленной машине (при отладке удаленного процесса)",
+                "default": ""
               }
+
             }
           }
         }