Перенос замены пути в DebugeeProcess, обработка приема

Author: Bayselonarrend

src/VSCode.DebugAdapter/DebugeeProcess.cs

@@ -198,6 +198,41 @@ private void RaiseOutputReceivedEvent(string category, string data)
             OutputReceived?.Invoke(this, new DebugeeOutputEventArgs(category, data));
         }
 
+        private string ApplyRemoteWorkspaceString(string path)
+        {
+            var clientPath = path;
+
+			if (!string.IsNullOrWhiteSpace(HostWorkspace) && !string.IsNullOrWhiteSpace(RemoteWorkspace))
+			{
+
+                var hostWorkspace = HostWorkspace;
+                var remoteWorkspace = RemoteWorkspace;
+
+				string normalizedClientPath = clientPath.Replace('/', '\\').Trim();
+				string normalizedHostWorkspace = hostWorkspace.Replace('/', '\\').Trim();
+				
+				if (!normalizedHostWorkspace.EndsWith("\\"))
+					normalizedHostWorkspace += "\\";
+					
+				if (normalizedClientPath.StartsWith(normalizedHostWorkspace, StringComparison.OrdinalIgnoreCase))
+				{
+
+					string relativePath = normalizedClientPath.Substring(normalizedHostWorkspace.Length);
+					
+					string normalizedRemote = remoteWorkspace.Trim().Replace('\\', '/');
+					normalizedRemote = normalizedRemote.TrimEnd('/');
+					
+					clientPath = string.IsNullOrEmpty(relativePath) 
+						? normalizedRemote
+						: normalizedRemote + "/" + relativePath.Replace('\\', '/');
+					
+				}
+			}
+		
+            return clientPath;
+
+        }
+
         private void Terminate()
         {
             if (!_terminated)
@@ -273,7 +308,14 @@ public void SetExceptionsBreakpoints((string Id, string Condition)[] filters)
 
         public Breakpoint[] SetBreakpoints(IEnumerable<Breakpoint> breakpoints)
         {
-            var confirmedBreaks = _debugger.SetMachineBreakpoints(breakpoints.ToArray());
+            var breakpointsArray = breakpoints.ToArray();
+            
+            for (int i = 0; i < breakpointsArray.Length; i++)
+            {
+                breakpointsArray[i].Source = ApplyRemoteWorkspaceString(breakpointsArray[i].Source);
+            }
+            
+            var confirmedBreaks = _debugger.SetMachineBreakpoints(breakpointsArray);
 
             return confirmedBreaks;
         }
@@ -297,6 +339,7 @@ public StackFrame[] GetStackTrace(int threadId, int firstFrameIdx, int limit)
             for (int i = firstFrameIdx; i < limit && i < allFrames.Length; i++)
             {
                 allFrames[i].ThreadId = threadId;
+                allFrames[i].Source = ApplyRemoteWorkspaceString(allFrames[i].Source);
                 result.Add(allFrames[i]);
             }
 

src/VSCode.DebugAdapter/OscriptDebugSession.cs

@@ -268,40 +268,10 @@ public override void SetBreakpoints(Response response, dynamic arguments)
 
         private string NormalizeDriveLetter(string path)
         {
-            var clientPath = path;
-            
             if (Path.IsPathRooted(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.StartsWith(normalizedHostWorkspace, StringComparison.OrdinalIgnoreCase))
-				{
-
-					string relativePath = normalizedClientPath.Substring(normalizedHostWorkspace.Length);
-					
-					string normalizedRemote = remoteWorkspace.Trim().Replace('\\', '/');
-					normalizedRemote = normalizedRemote.TrimEnd('/');
-					
-					string result = string.IsNullOrEmpty(relativePath) 
-						? normalizedRemote
-						: normalizedRemote + "/" + relativePath.Replace('\\', '/');
-					
-					return result;
-				}
-			}
-		
-            return clientPath;
+                return path[0].ToString().ToUpperInvariant() + path.Substring(1);
+            else
+                return path;
 
         }