Start handling eval temp file remapping better

Author: rocky

trepan/lib/core.py

@@ -193,16 +193,23 @@ def canonic_filename(self, frame: Optional[FrameType]) -> str:
         canonic() value, a string."""
         if frame is None:
             return "?? - No frame"
+
+        filename = frame.f_code.co_filename
+        if "<string>" == filename:
+            if (new_filename := pyficache.main.code2_tempfile.get(frame.f_code)):
+                filename = new_filename
         return self.canonic(frame.f_code.co_filename)
 
-    def filename(self, filename=None):
+    def filename(self, filename=None) -> Optional[str]:
         """Return filename or the basename of that depending on the
         basename setting"""
         if filename is None:
             if self.debugger.mainpyfile:
                 filename = self.debugger.mainpyfile
             else:
                 return None
+
+        filename = pyficache.unmap_file(filename)
         if self.debugger.settings["basename"]:
             return osp.basename(filename)
         return filename

trepan/lib/stack.py

@@ -335,17 +335,9 @@ def format_stack_entry(
 
 def frame2file(core_obj, frame, canonic=True):
     if canonic:
-        filename = core_obj.filename(core_obj.canonic_filename(frame))
+        return core_obj.filename(core_obj.canonic_filename(frame))
     else:
-        filename = core_obj.filename(frame.f_code.co_filename)
-
-    print("WOOT")
-    # if frame_info := FrameInfo.get(frame):
-    #     if canonic:
-    #         return core_obj.filename(frame_info.filename)
-    #     return frame_info.filename
-
-    return filename
+        return core_obj.filename(frame.f_code.co_filename)
 
 
 def frame2filesize(frame):

trepan/processor/print.py

@@ -206,9 +206,11 @@ def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
                         dbgr_obj.eval_string,
                         tempdir=proc_obj.settings("tempdir"),
                     )
-                    pyficache.remap_file(filename, remapped_file)
+                    # pyficache.remap_file(filename, remapped_file)
+                    pyficache.main.code2_tempfile[frame.f_code] = filename
+                    print(f"XXX1 WOOT {pyficache.main.code2_tempfile}")
                     filename, line_number = pyficache.unmap_file_line(
-                        filename, line_number
+                        remapped_file, line_number
                     )
                     pass
                 pass
@@ -327,6 +329,7 @@ def prefix_for_source_text(source_text: str, maxwidth: int) -> str:
                         pyficache.remap_file(remapped_file, filename)
                     fd.close()
                     if source_text:
+                        pyficache.main.code2_tempfile[frame.f_code] = remapped_file
                         intf_obj.msg(
                             f"remapped string {prefix_for_source_text(source_text, 10)} to file {remapped_file}"
                         )