Jean-Pierre MartineauandClaude Opus 5
38d9ffacc5
The curated narrow and wide sets are gone, with the probe that decided when to apply them and the add-narrow-emoji skill that fed them. They lined up the rows somebody had already looked at and none of the rows nobody had, and a contact's name arrives off the air carrying whatever its owner typed. In their place, one structural rule: a glyph built from several codepoints (a selector sequence, a ZWJ sequence, a keycap, a flag) or a lone text-default emoji or Regional Indicator is reserved two cells, the most a single glyph draws. Pinned into two cells, a glyph the font draws in two fills them and one it draws in one leaves a blank beside it, so the text after any emoji starts in the same column on every row. Pinning alone could only hold the lanes after it. Two exceptions keep their one cell: Rich's single-cell ranges, which its fast path measures without asking, and the nine text-default emoji the app draws itself as marks. That list is closed by a test over the package's source, so a new mark cannot slip into the reserve unnoticed. Rich measures in three places and prompt_toolkit in a fourth, and all four are patched from the same rule at once: Rich's segment splitter walks a string until a whole-string width meets its cut, and a character measured differently from the string around it is a cut that walk never meets. Every multi-codepoint glyph is also merged into one fragment before layout, so a mark followed by a selector is not folded into a one-cell slot. Installed only by the full-screen app on a platform that draws emoji. The command line keeps the stock tables, because nothing pins its output. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
85 lines
3.4 KiB
Python
85 lines
3.4 KiB
Python
# SPDX-License-Identifier: Apache-2.0
|
|
"""Tests for the private Windows DLL handles.
|
|
|
|
These pin a crash that only ever appeared in a frozen build on Windows, which is the
|
|
worst place for a bug to live: no traceback survived, because the window it was printed
|
|
in was destroyed by the same exit that printed it.
|
|
|
|
``ctypes.windll.kernel32`` is a cache shared by the whole process. MeshTerm's emoji-width
|
|
probe declared ``GetConsoleScreenBufferInfo`` as taking a pointer to its own copy of the
|
|
screen-buffer struct; prompt_toolkit then called that same function object with a pointer
|
|
to *its* copy — same layout, different class — and ctypes refused the call while the app
|
|
was building its screen.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import ctypes
|
|
import sys
|
|
|
|
import pytest
|
|
|
|
from meshterm.core import win32dll
|
|
|
|
pytestmark = pytest.mark.skipif(sys.platform != "win32", reason="Windows libraries")
|
|
|
|
|
|
def test_each_handle_is_its_own() -> None:
|
|
"""Two callers get two objects, so neither can see the other's declarations."""
|
|
assert win32dll.kernel32() is not win32dll.kernel32()
|
|
assert win32dll.user32() is not win32dll.user32()
|
|
|
|
|
|
def test_the_shared_windll_is_the_thing_being_avoided() -> None:
|
|
"""The premise: ``ctypes.windll`` hands the same function object to every caller.
|
|
|
|
If this ever stops being true the module is unnecessary — but until then it is the
|
|
reason it exists, so it is worth asserting rather than assuming.
|
|
"""
|
|
first = ctypes.windll.kernel32.GetConsoleScreenBufferInfo
|
|
second = ctypes.windll.kernel32.GetConsoleScreenBufferInfo
|
|
assert first is second
|
|
|
|
|
|
def test_declaring_a_signature_does_not_reach_the_shared_one() -> None:
|
|
"""The regression itself: our declarations must not be visible to anyone else.
|
|
|
|
Before this module existed, the assignment below rewrote the signature that
|
|
prompt_toolkit's console output later called through, and the application died on
|
|
startup with ``expected LP__CSBI instance instead of pointer to
|
|
CONSOLE_SCREEN_BUFFER_INFO``.
|
|
"""
|
|
|
|
class _MineAlone(ctypes.Structure):
|
|
_fields_ = [("whatever", ctypes.c_int)]
|
|
|
|
shared = ctypes.windll.kernel32.GetConsoleScreenBufferInfo
|
|
before = shared.argtypes
|
|
|
|
private = win32dll.kernel32()
|
|
private.GetConsoleScreenBufferInfo.argtypes = [
|
|
ctypes.c_void_p,
|
|
ctypes.POINTER(_MineAlone),
|
|
]
|
|
|
|
assert ctypes.windll.kernel32.GetConsoleScreenBufferInfo.argtypes == before
|
|
assert private.GetConsoleScreenBufferInfo is not shared
|
|
|
|
|
|
def test_the_console_probe_leaves_the_shared_signature_alone() -> None:
|
|
"""End to end: a real call site declaring the function must not disturb the shared one.
|
|
|
|
The narrow assertion above can pass while a call site still reaches for
|
|
``ctypes.windll``, so this exercises one. The emoji-width probe that crashed is gone, but
|
|
the classic-console check declares the very same ``GetConsoleScreenBufferInfo`` with a
|
|
struct of its own, which is the same crash waiting in a different module.
|
|
"""
|
|
from meshterm.ui import termfont
|
|
|
|
shared = ctypes.windll.kernel32.GetConsoleScreenBufferInfo
|
|
before = shared.argtypes
|
|
# No console under pytest, so this returns None rather than answering. That is fine:
|
|
# the declarations happen before the first call either way, which is what matters.
|
|
termfont._is_classic_console() # noqa: SLF001 - the point is this private path
|
|
assert ctypes.windll.kernel32.GetConsoleScreenBufferInfo.argtypes == before
|