From 08687daa6b88b8a199031ac04a1ab290c7011ceb Mon Sep 17 00:00:00 2001
From: fan wu <336798967+FanWu-ai@users.noreply.github.com>
Date: Fri, 9 Oct 2026 14:29:06 -0700
Subject: [PATCH] Handle empty content when rendering numbered margins

---
 src/prompt_toolkit/layout/margins.py |  6 +--
 tests/test_numbered_margin.py        | 67 ++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 tests/test_numbered_margin.py

diff --git a/src/prompt_toolkit/layout/margins.py b/src/prompt_toolkit/layout/margins.py
index 68e3e1190..85aab9196 100644
--- a/src/prompt_toolkit/layout/margins.py
+++ b/src/prompt_toolkit/layout/margins.py
@@ -102,7 +102,8 @@ def create_margin(
         result: StyleAndTextTuples = []
         last_lineno = None
 
-        for y, lineno in enumerate(window_render_info.displayed_lines):
+        displayed_lines = window_render_info.displayed_lines
+        for lineno in displayed_lines:
             # Only display line number if this line is not a continuation of the previous line.
             if lineno != last_lineno:
                 if lineno is None:
@@ -128,9 +129,8 @@ def create_margin(
 
         # Fill with tildes.
         if self.display_tildes():
-            while y < window_render_info.window_height:
+            for _ in range(window_render_info.window_height - len(displayed_lines)):
                 result.append(("class:tilde", "~\n"))
-                y += 1
 
         return result
 
diff --git a/tests/test_numbered_margin.py b/tests/test_numbered_margin.py
new file mode 100644
index 000000000..3ffe55896
--- /dev/null
+++ b/tests/test_numbered_margin.py
@@ -0,0 +1,67 @@
+from __future__ import annotations
+
+import pytest
+
+from prompt_toolkit.layout.containers import Window
+from prompt_toolkit.layout.controls import UIContent, UIControl
+from prompt_toolkit.layout.margins import NumberedMargin
+from prompt_toolkit.layout.mouse_handlers import MouseHandlers
+from prompt_toolkit.layout.screen import Screen, WritePosition
+
+
+class LinesControl(UIControl):
+    def __init__(self, lines):
+        self.lines = lines
+
+    def create_content(self, width, height):
+        return UIContent(
+            get_line=lambda i: [("", self.lines[i])],
+            line_count=len(self.lines),
+        )
+
+
+@pytest.mark.parametrize("relative", [False, True])
+@pytest.mark.parametrize("side", ["left_margins", "right_margins"])
+def test_numbered_margin_renders_empty_content(relative, side):
+    margin = NumberedMargin(relative=relative, display_tildes=True)
+    window = Window(content=LinesControl([]), **{side: [margin]})
+    screen = Screen()
+    window.write_to_screen(
+        screen, MouseHandlers(), WritePosition(0, 0, 10, 3), "", True, None
+    )
+    column = 0 if side == "left_margins" else 7
+    assert [screen.data_buffer[row][column].char for row in range(3)] == ["~"] * 3
+
+
+@pytest.mark.parametrize("line_count", [0, 1, 2, 3, 4])
+@pytest.mark.parametrize("display_tildes", [False, True])
+def test_numbered_margin_fills_only_remaining_rows(line_count, display_tildes):
+    margin = NumberedMargin(display_tildes=display_tildes)
+    window = Window(content=LinesControl(["text"] * line_count), left_margins=[margin])
+    window.write_to_screen(
+        Screen(), MouseHandlers(), WritePosition(0, 0, 10, 3), "", True, None
+    )
+    info = window.render_info
+    assert info is not None
+    fragments = margin.create_margin(info, 3, 3)
+    tilde_rows = sum(text == "~\n" for _, text in fragments)
+    assert tilde_rows == (max(0, 3 - line_count) if display_tildes else 0)
+    assert sum(text.count("\n") for _, text in fragments) == (
+        3 if display_tildes else min(line_count, 3)
+    )
+
+
+def test_numbered_margin_counts_wrapped_screen_rows():
+    margin = NumberedMargin(display_tildes=True)
+    window = Window(
+        content=LinesControl(["abcdefgh"]), left_margins=[margin], wrap_lines=True
+    )
+    window.write_to_screen(
+        Screen(), MouseHandlers(), WritePosition(0, 0, 7, 4), "", True, None
+    )
+    info = window.render_info
+    assert info is not None
+    assert info.displayed_lines == [0, 0]
+    fragments = margin.create_margin(info, 3, 4)
+    assert sum(text == "~\n" for _, text in fragments) == 2
+    assert sum(text.count("\n") for _, text in fragments) == 4