nextpytk 0.4.6__tar.gz → 0.4.7__tar.gz

{nextpytk-0.4.6 → nextpytk-0.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextpytk
-Version: 0.4.6
+Version: 0.4.7
 Summary: Accessible, declarative Tkinter applications from ordinary Python functions.
 Project-URL: Homepage, https://github.com/nishimotz/nextpytk
 Project-URL: Repository, https://github.com/nishimotz/nextpytk
@@ -495,6 +495,11 @@ panes and both gutters share a **single vertical scrollbar**, so the gutters
 stay in lock-step with the content (no drift). Logical line numbers
 (`1..n`) follow the pane content; the right pane's numbers update as you edit.
 
+> **Note:** `line_numbers=True` takes precedence over `sync_yscroll`. The
+> shared-scrollbar layout it installs keeps both panes (and both gutters)
+> scrolled in lock-step, so passing `sync_yscroll=False` together with
+> `line_numbers=True` has no effect. If the panes must scroll independently,
+> leave `line_numbers` off.
 
 ### Wrap layout
 

{nextpytk-0.4.6 → nextpytk-0.4.7}/README.md

@@ -471,6 +471,11 @@ panes and both gutters share a **single vertical scrollbar**, so the gutters
 stay in lock-step with the content (no drift). Logical line numbers
 (`1..n`) follow the pane content; the right pane's numbers update as you edit.
 
+> **Note:** `line_numbers=True` takes precedence over `sync_yscroll`. The
+> shared-scrollbar layout it installs keeps both panes (and both gutters)
+> scrolled in lock-step, so passing `sync_yscroll=False` together with
+> `line_numbers=True` has no effect. If the panes must scroll independently,
+> leave `line_numbers` off.
 
 ### Wrap layout
 

{nextpytk-0.4.6 → nextpytk-0.4.7}/ROADMAP.md

@@ -299,7 +299,56 @@ visual row-major order). Planned to generalize for `side="bottom"` sections.
 
 ---
 
-## Near term (post-0.4.5)
+## Snapshot (v0.4.7) — paired gutter logical-line fix
+
+### Bug fix: line-number gutters count logical lines, not display lines
+
+- `Layout.paired(..., line_numbers=True)` gutters numbered **physical**
+  (wrapped) rows: `_reconcile_gutter` / `_populate_gutters` used
+  `text.index("end-1c")`, which counts display rows. With `wrap="word"` /
+  `"char"`, a long line that wrapped inflated the gutter count beyond the
+  real line count.
+- Added `_logical_line_count(text)`, which counts newline characters (a
+  wrapped row adds no newline), adjusted for whether the buffer ends in a
+  newline. The gutter now mirrors true logical lines regardless of wrapping.
+
+### Bug fix: re-entry recursion in gutter sync
+
+- Rewriting a gutter calls `update_idletasks()`, which fires the shared
+  scrollbar's `yscrollcommand` and re-enters `_reconcile_gutter` /
+  `_populate_gutters` through `_chain_yview` — an infinite recursion that
+  surfaced once the gutter logic changed.
+- Added a per-gutter `_syncing_gutter` re-entry guard to both helpers.
+
+### Bug fix: `on_text_set` hook leak across re-runs
+
+- `app.on_text_set()` hooks were never cleared by `clear_runtime()`, so
+  hooks (e.g. gutter line-number sync) accumulated across re-runs — such as
+  swap variants rebuilt at runtime — causing the gutter sync to run multiple
+  times per `text_set`.
+- `clear_runtime()` now also clears `_text_set_hooks`.
+
+### Tests
+
+- Added `test_paired_gutters_count_logical_lines_when_wrapped` (a long,
+  wrapping line must not inflate the gutter line numbers).
+- Added `test_paired_gutter_sync_does_not_recursively_loop` (multiple
+  `text_set` calls do not recurse infinitely through the shared scrollbar).
+- Added `test_clear_runtime_clears_text_set_hooks` (hooks are dropped on
+  `clear_runtime()`).
+- `tests/test_paired.py` grew; full suite green.
+
+### Docs: `line_numbers=True` takes precedence over `sync_yscroll`
+
+- Documented that enabling `line_numbers` installs a shared scrollbar that
+  always keeps both panes (and both gutters) in lock-step, so
+  `sync_yscroll=False` is ignored when `line_numbers=True`. Callers needing
+  independent pane scrolling must leave `line_numbers` off. Clarified in the
+  `Layout.paired` docstring and README (EN / JA).
+
+---
+
+## Near term (post-0.4.7)
 
 ### A11y
 

{nextpytk-0.4.6 → nextpytk-0.4.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nextpytk"
-version = "0.4.6"
+version = "0.4.7"
 description = "Accessible, declarative Tkinter applications from ordinary Python functions."
 readme = "README.md"
 requires-python = ">=3.13"

{nextpytk-0.4.6 → nextpytk-0.4.7}/src/nextpytk/app.py

@@ -356,6 +356,7 @@ class TkApp:
         self._text_inner.clear()
         self._text_scrollbars.clear()
         self._text_scroll_sync.clear()
+        self._text_set_hooks.clear()
         self._a11y_last_toggle.clear()
         self._current_view = None
         self._current_stage = None

{nextpytk-0.4.6 → nextpytk-0.4.7}/src/nextpytk/layout.py

@@ -783,6 +783,25 @@ def _place_paired_with_gutters(
     _bind_gutter_edit_sync(app, text_b, gutter_b)
 
 
+def _logical_line_count(text: tk.Text) -> int:
+    """Return the number of logical (non-wrapped) lines in *text*.
+
+    ``index("end-1c")`` counts *display* lines: a long line that wraps to
+    several rows inflates the count when ``wrap`` is ``word``/``char``. We
+    count newline characters instead, which is wrap-independent. The last
+    logical line may or may not carry a trailing newline (``text_set`` omits
+    it; a hand-inserted buffer may keep it), so the count is adjusted by
+    whether the content ends with a newline.
+    """
+    try:
+        content = text.get("1.0", "end-1c")
+    except tk.TclError:
+        return 0
+    if not content:
+        return 0
+    return content.count("\n") + (0 if content.endswith("\n") else 1)
+
+
 def _reconcile_gutter(gutter: tk.Text, text: tk.Text) -> None:
     """Fill a gutter with logical line numbers, matching the text line count.
 
@@ -790,17 +809,26 @@ def _reconcile_gutter(gutter: tk.Text, text: tk.Text) -> None:
     gutter is rewritten so its scroll range matches the pane. Idempotent:
     rewriting only happens when the count differs.
     """
-    n = int(text.index("end-1c").split(".")[0])
+    # Re-entry guard: rewriting the gutter fires yscrollcommand on the shared
+    # scrollbar (via update_idletasks below), which re-enters this function
+    # through _chain_yview. Without a guard that recursion never terminates.
+    if getattr(gutter, "_syncing_gutter", False):
+        return
+    n = _logical_line_count(text)
     gutter_lines = int(gutter.index("end-1c").split(".")[0])
     if gutter_lines == n:
         return
     lines = "\n".join(str(i) for i in range(1, n + 1))
-    gutter.configure(state="normal")
-    gutter.delete("1.0", "end")
-    gutter.insert("1.0", lines)
-    gutter.configure(state="disabled")
-    # Ensure the new content is reflected in the shared scrollbar range.
-    gutter.update_idletasks()
+    gutter._syncing_gutter = True  # type: ignore[attr-defined]
+    try:
+        gutter.configure(state="normal")
+        gutter.delete("1.0", "end")
+        gutter.insert("1.0", lines)
+        gutter.configure(state="disabled")
+        # Ensure the new content is reflected in the shared scrollbar range.
+        gutter.update_idletasks()
+    finally:
+        gutter._syncing_gutter = False  # type: ignore[attr-defined]
 
 
 def _chain_yview(
@@ -857,14 +885,20 @@ def _make_gutter(parent: tk.Misc, name: str) -> tk.Text:
 
 def _populate_gutters(gutter: tk.Text, text: tk.Text) -> None:
     """Fill a gutter with logical line numbers (1..n)."""
-    n = int(text.index("end-1c").split(".")[0])
+    if getattr(gutter, "_syncing_gutter", False):
+        return
+    n = _logical_line_count(text)
     lines = "\n".join(str(i) for i in range(1, n + 1))
-    gutter.configure(state="normal")
-    gutter.delete("1.0", "end")
-    gutter.insert("1.0", lines)
-    gutter.configure(state="disabled")
-    # Ensure the new content is reflected in the shared scrollbar range.
-    gutter.update_idletasks()
+    gutter._syncing_gutter = True  # type: ignore[attr-defined]
+    try:
+        gutter.configure(state="normal")
+        gutter.delete("1.0", "end")
+        gutter.insert("1.0", lines)
+        gutter.configure(state="disabled")
+        # Ensure the new content is reflected in the shared scrollbar range.
+        gutter.update_idletasks()
+    finally:
+        gutter._syncing_gutter = False  # type: ignore[attr-defined]
 
 
 def _bind_gutter_edit_sync(app: TkApp, text: tk.Text, gutter: tk.Text) -> None:
@@ -1347,6 +1381,14 @@ class Layout:
         the gutters always stay in lock-step with the content (no drift). Line
         numbers are logical rows of the text widget (``1..n``).
 
+        .. note::
+           ``line_numbers=True`` takes precedence over ``sync_yscroll``: the
+           shared-scrollbar layout it installs always keeps the two panes (and
+           both gutters) scrolled in lock-step, so passing
+           ``sync_yscroll=False`` with ``line_numbers=True`` has no effect. If
+           you need the panes to scroll independently, do **not** enable
+           ``line_numbers``.
+
         Example::
 
             app.text("left", readonly=True, sync_yscroll_with="right")