Перенос переменных в attach, доработка нормализации

Author: Bayselonarrend

src/VSCode.DebugAdapter/PathHandlingStrategy.cs

@@ -72,22 +72,47 @@ public string ConvertClientPathToDebugger(string clientPath)
 			string hostWorkspace = Environment.GetEnvironmentVariable("OSCRIPT_DEBUGWORKSPACE_HOST");
 			string remoteWorkspace = Environment.GetEnvironmentVariable("OSCRIPT_DEBUGWORKSPACE_REMOTE");
 
-			if (!string.IsNullOrEmpty(hostWorkspace) && !string.IsNullOrEmpty(remoteWorkspace))
+			if (!string.IsNullOrWhiteSpace(hostWorkspace) && !string.IsNullOrWhiteSpace(remoteWorkspace))
 			{
-				string normalizedClientPath = clientPath.Replace('/', '\\');
-				string normalizedHostWorkspace = hostWorkspace.Replace('/', '\\');
+
+				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.Replace('\\', '/');
-					string normalizedRelative = relativePath.Replace('\\', '/');
+					string normalizedRemote = remoteWorkspace.Trim().Replace('\\', '/');
+					normalizedRemote = normalizedRemote.TrimEnd('/');
 
-					string result = normalizedRemote.TrimEnd('/') + "/" + normalizedRelative.TrimStart('/');
-
+					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) {

src/VSCode.DebugAdapter/package.json

@@ -86,10 +86,7 @@
                     "type": "string"
                   }
                 },
-                "default": {
-                  "OSCRIPT_DEBUGWORKSPACE_HOST": "",
-                  "OSCRIPT_DEBUGWORKSPACE_REMOTE": ""
-                }
+                "default": null
               },
               "runtimeExecutable": {
                 "type": [
@@ -135,6 +132,19 @@
                 "type": "string",
                 "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": ""
+                }
               }
             }
           }