Перенос создание PathsMapper в Attach, проверки на null

Author: Bayselonarrend

src/VSCode.DebugAdapter/DebugeeProcess.cs

@@ -290,9 +290,11 @@ public Breakpoint[] SetBreakpoints(IEnumerable<Breakpoint> breakpoints)
         {
             var breakpointsArray = breakpoints.ToArray();
 
-            for (int i = 0; i < breakpointsArray.Length; i++)
-            {
-                breakpointsArray[i].Source = PathsMapper.LocalToRemote(breakpointsArray[i].Source);
+            if (PathsMapper != null) {
+                for (int i = 0; i < breakpointsArray.Length; i++)
+                {
+                    breakpointsArray[i].Source = PathsMapper.LocalToRemote(breakpointsArray[i].Source);
+                }
             }
 
             var confirmedBreaks = _debugger.SetMachineBreakpoints(breakpointsArray);
@@ -308,6 +310,7 @@ public void BeginExecution(int threadId)
         public StackFrame[] GetStackTrace(int threadId, int firstFrameIdx, int limit)
         {
             var allFrames = _debugger.GetStackFrames(threadId);
+            var pathsMapperInit = PathsMapper != null;
 
             if (limit == 0)
                 limit = allFrames.Length;
@@ -318,8 +321,13 @@ public StackFrame[] GetStackTrace(int threadId, int firstFrameIdx, int limit)
             var result = new List<StackFrame>();
             for (int i = firstFrameIdx; i < limit && i < allFrames.Length; i++)
             {
+
                 allFrames[i].ThreadId = threadId;
-                allFrames[i].Source = PathsMapper.RemoteToLocal(allFrames[i].Source);
+
+                if (pathsMapperInit) {
+                    allFrames[i].Source = PathsMapper.RemoteToLocal(allFrames[i].Source);
+                }
+
                 result.Add(allFrames[i]);
             }
 

src/VSCode.DebugAdapter/OscriptDebugSession.cs

@@ -35,8 +35,7 @@ public override void Initialize(Response response, dynamic args)
             LogCommandReceived();
             AdapterID = (string) args.adapterID;
 
-            _debuggee = DebugeeFactory.CreateProcess(AdapterID, PathStrategy);
-            _debuggee.InitPathsMapper(args);        
+            _debuggee = DebugeeFactory.CreateProcess(AdapterID, PathStrategy);      
 
             SendResponse(response, new Capabilities
             {
@@ -140,6 +139,7 @@ public override void Attach(Response response, dynamic arguments)
             SubscribeForDebuggeeProcessEvents();
 
             _debuggee.DebugPort = GetFromContainer(arguments, "debugPort", 2801);
+            _debuggee.InitPathsMapper(arguments);  
 
             DebugClientFactory debugClientFactory;
             try