Fill in a column number for a breakpoint

Author: rocky

trepan/lib/stack.py

@@ -90,14 +90,14 @@ def get_column_start_from_frame(frame: FrameType) -> int:
     return get_column_start_from_code(frame.f_code, frame.f_lasti)
 
 
-def get_column_start_from_code(code: CodeType, f_lasti: int) -> int:
+def get_column_start_from_code(code: CodeType, code_offset: int) -> int:
     """
     Given a code object, return the start column for that
     frame. (The line number is found in frame.f_lineno).
     If we can't find a column number, return -1.
     """
     co_positions = code.co_positions()
-    instruction_number = f_lasti // 2
+    instruction_number = code_offset // 2
     position_list = list(co_positions)
     position_tuple = position_list[instruction_number]
     if position_tuple is not None:

trepan/processor/cmdbreak.py

@@ -18,6 +18,7 @@
 from dis import findlinestarts
 from pyficache import code_line_info
 from trepan.misc import wrapped_lines, pretty_modfunc_name
+from trepan.lib.stack import get_column_start_from_code
 from trepan.processor.parse.semantics import build_bp_expr
 from trepan.processor.parse.parser import LocationError
 from trepan.processor.parse.scanner import ScannerError
@@ -52,7 +53,7 @@ def set_break(
         if isinstance(func_or_code, str):
             func_or_code = code_map.get(func_or_code, func_or_code)
         if not line_info:
-            linestarts = dict(findlinestarts(cmd_obj.proc.curframe.f_code))
+            linestarts = dict(findlinestarts(cmd_obj.curframe.f_code))
             if line_number not in linestarts.values():
                 part1 = f"File {cmd_obj.core.filename(filename)}"
                 msg = wrapped_lines(
@@ -102,18 +103,23 @@ def set_break(
         )
         cmd_obj.msg(msg)
     else:
+        code = None
         if hasattr(func_or_code, "co_name"):
+            code = func_or_code
             code_name = func_or_code.co_name
             if not code_name.startswith("<"):
                 code_name += "()"
             func_str = f" in {code_name}"
         else:
             func_str = ""
         if bp.column is not None:
-            # Adjust 0-origin to 1-origin column numbers
-            column_str = f", column {bp.column + 1}"
+            column_str = f", column {bp.column}"
         else:
             column_str = ""
+            if offset is not None and offset >= 0:
+               if code is not None:
+                    column_start = get_column_start_from_code(code, offset)
+                    column_str = f", column {column_start}"
 
         part1 = (f"Breakpoint {bp.number} set at line "
                  f"{line_number}{column_str}{func_str} of file")
@@ -196,15 +202,15 @@ def parse_break_cmd(proc, args):
     cmdproc.setup()
     # FIXME: we should not need ot set setting
     cmdproc.settings = d.settings
-    set_break(cmdproc, "set_break", __file__, 50, True, False, [])
+    set_break(cmdproc, "set_break", __file__, 51, True, False, [])
     for cmd in (
         "break '''c:\\tmp\\foo.bat''':1",
         'break """/Users/My Documents/foo.py""":2',
         "break",
         "break 10",
         "break if True",
         f"break {__file__}:5",
-        f"break {__file__}:{cmdproc.frame.f_line_number}",
+        f"break {__file__}:{cmdproc.frame.f_lineno}",
         "break set_break()",
         "break 4 if i==5",
         "break cmdproc.setup()",

trepan/processor/command/break.py

@@ -74,13 +74,13 @@ class BreakCommand(DebuggerCommand):
     def run(self, args):
         force = True if args[0][-1] == "!" else False
 
-        (func, filename, lineno, condition, offset) = parse_break_cmd(self.proc, args)
+        (func, filename, line_number, condition, offset) = parse_break_cmd(self.proc, args)
         if not (func is None and filename is None):
             set_break(
                 self,
                 func,
                 filename,
-                lineno,
+                line_number,
                 condition,
                 False,
                 args,