debugpy: Enhance path mapping handling in PDB adapter and debug session.

Store both folder mappings from the debugger, and 1:1 file mappings .

Signed-off-by: Jos Verlinde <[email protected]>

Author: Josverl

python-ecosys/debugpy/debugpy/server/debug_session.py

@@ -252,6 +252,15 @@ def _handle_attach(self, seq, args):
 
         self._debug_print(f"[DAP] Processing attach request with args: {args}")
         print(f"[DAP] Debug logging {'enabled' if self.debug_logging else 'disabled'} (logToFile={self.debug_logging})")
+        
+        # get debugger root and debugee root from pathMappings
+        for pm in args.get("pathMappings",[]):
+            # debugee - debugger
+            self.pdb.path_mappings.append(
+                (pm.get("remoteRoot", "./"),
+                 pm.get("localRoot", "./"))
+            )
+        # # TODO: justMyCode, debugOptions  , 
 
         # Enable trace function
         self.pdb.set_trace_function(self._trace_function)

python-ecosys/debugpy/debugpy/server/pdb_adapter.py

@@ -40,7 +40,8 @@ def __init__(self):
         self.continue_event = False
         self.variables_cache = {}  # frameId -> variables
         self.frame_id_counter = 1
-        self.path_mappings : dict[str,str] = {}  # runtime_path -> vscode_path mapping
+        self.path_mappings : list[tuple[str,str]] = []  # runtime_path -> vscode_path mapping
+        self.file_mappings : dict[str,str] = {}  # runtime_path -> vscode_path mapping
 
     def _debug_print(self, message):
         """Print debug message only if debug logging is enabled."""
@@ -68,7 +69,7 @@ def set_trace_function(self, trace_func):
         else:
             raise RuntimeError("sys.settrace not available")
 
-    def set_breakpoints(self, filename, breakpoints):
+    def set_breakpoints(self, filename, breakpoints:list[dict]):
         """Set breakpoints for a file."""
         self.breakpoints[filename] = {}
         actual_breakpoints = []
@@ -105,7 +106,7 @@ def should_stop(self, frame, event:str, arg):
             if lineno in self.breakpoints[filename]:
                 self._debug_print(f"[PDB] HIT BREAKPOINT (exact match) at {filename}:{lineno}")
                 # Record the path mapping (in this case, they're already the same)
-                self.path_mappings[filename] = filename
+                self.file_mappings[filename] = filename
                 self.hit_breakpoint = True
                 return True
 
@@ -119,7 +120,7 @@ def should_stop(self, frame, event:str, arg):
                 if lineno in self.breakpoints[bp_file]:
                     self._debug_print(f"[PDB] HIT BREAKPOINT (fallback basename match) at {filename}:{lineno} -> {bp_file}")
                     # Record the path mapping so we can report the correct path in stack traces
-                    self.path_mappings[filename] = bp_file
+                    self.file_mappings[filename] = bp_file
                     self.hit_breakpoint = True
                     return True
 
@@ -129,7 +130,7 @@ def should_stop(self, frame, event:str, arg):
                 if lineno in self.breakpoints[bp_file]:
                     self._debug_print(f"[PDB] HIT BREAKPOINT (relative path match) at {filename}:{lineno} -> {bp_file}")
                     # Record the path mapping so we can report the correct path in stack traces
-                    self.path_mappings[filename] = bp_file
+                    self.file_mappings[filename] = bp_file
                     self.hit_breakpoint = True
                     return True
 
@@ -216,7 +217,7 @@ def get_stack_trace(self):
                 hint = 'normal'
 
             # Use the VS Code path if we have a mapping, otherwise use the original path
-            display_path = self.path_mappings.get(filename, filename)
+            display_path = self.file_mappings.get(filename, filename)
             if filename != display_path:
                 self._debug_print(f"[PDB] Stack trace path mapping: {filename} -> {display_path}")
             # Create StackFrame info