import json import os import re import sublime # the stub, via conftest from vdiff import commands, git, listeners, parse, render, state # noqa: F401 DIFF = """--- a/x.py +++ b/x.py @@ -1,6 +1,7 @@ def f(): - return 1 - + return 10 + # added + # more def g(): pass """ def make_state(diff_text=DIFF): st = state.ViewState("/repo") st.change = git.FileChange("x.py", "M", False, 3, 2, None) diff = parse.parse_unified(diff_text) st.lines, st.binary = diff.lines, diff.binary st.blocks = parse.change_blocks(diff.lines) return st def header(view): return view.phantoms[render.PHANTOM_KEY][0].content def test_render_text_regions_and_header(): view = sublime.View() render.init_view(view) st = make_state() render.render(view, st) assert view.text.split("\n") == ["", "def f():", " return 1", "", " return 10", " # added", " # more", "", "def g():", " pass"] assert view.is_read_only() assert view.syntax.endswith("Python.sublime-syntax") deleted, scope, _, flags = view.regions[render.KEY_DEL] assert scope == "diff.deleted" and flags == sublime.DRAW_NO_OUTLINE # rows 2-3 merged into one region, newline included; offsets match the view's own row arithmetic assert deleted == [sublime.Region(view.text_point(2, 0), view.text_point(4, 0))] inserted = view.regions[render.KEY_INS][0] assert inserted == [sublime.Region(view.text_point(4, 0), view.text_point(7, 0))] marks = view.regions[render.KEY_INS_GUTTER] assert [r.a for r in marks[0]] == [view.text_point(4, 0), view.text_point(5, 0), view.text_point(6, 0)] assert marks[2] == "dot" # 2 deleted vs 3 inserted lines: not a paired block, no char marks assert view.regions[render.KEY_INS_CHAR][0] == [] html = header(view) assert "x.py" in html and "-2" in html and "+3" in html and 'href="stage"' in html and "modified" in html assert len(view.phantoms[render.PHANTOM_KEY]) == 1 assert view.name() == "⟐ x.py" assert view.settings().get(state.VIEW_DATA) == {"repo": "/repo", "sha": None, "path": "x.py", "status": "M", "staged": False} assert view.sel()[0].a == view.text_point(1, 0) def test_last_line_region_stops_at_buffer_end(): view = sublime.View() render.init_view(view) st = make_state("--- a/y\n+++ b/y\n@@ -1,2 +1,2 @@\n a\n-b\n+c\n") render.render(view, st) assert view.text == "\na\nb\nc" assert view.regions[render.KEY_INS][0] == [sublime.Region(view.text_point(3, 0), len(view.text))] render.render(view, st) # re-render replaces, never duplicates, the header assert len(view.phantoms[render.PHANTOM_KEY]) == 1 def test_char_marks_for_paired_lines(): view = sublime.View() render.init_view(view) st = make_state("--- a/y\n+++ b/y\n@@ -1 +1 @@\n-foo = bar\n+foo = baz\n") render.render(view, st) assert view.regions[render.KEY_DEL_CHAR][0] == [sublime.Region(view.text_point(1, 8), view.text_point(1, 9))] assert view.regions[render.KEY_INS_CHAR][0] == [sublime.Region(view.text_point(2, 8), view.text_point(2, 9))] def test_commit_header_and_message(): view = sublime.View() render.init_view(view) st = make_state() st.enter("abc", git.CommitInfo("abc", "abc1234", "Ann ", "2026-09-23 10:00", "Fix things", "details\nmore")) st.change = git.FileChange("x.py", "M", False, 3, 2, None) render.render(view, st) html = header(view) assert "abc1234" in html and "Ann <x>" in html and "Fix things" in html and "details" in html assert 'href="stage"' not in html and 'href="open"' in html render.render_message(view, st, "nothing") assert view.text == "\nnothing" and st.change is None and view.name() == "vDiff" def test_binary_and_caret_index(): view = sublime.View() render.init_view(view) st = make_state() st.binary, st.lines, st.blocks = True, [], [] render.render(view, st) assert view.text == "\n(binary file)" and render.KEY_DEL not in view.regions view.sel().clear() view.sel().add(sublime.Region(render.index_point(view, 0))) assert render.caret_index(view) == 0 view.sel().clear() view.sel().add(sublime.Region(0)) assert render.caret_index(view) == -1 # --- key help popup --------------------------------------------------------- def help_popup(st): """Open the popup through the action registry and return (view, html)""" view = sublime.View() render.init_view(view) commands.ACTIONS["help"](view, None, st) return view, view.popup def test_help_popup_lists_every_key(): st = make_state() view, html = help_popup(st) assert view.is_popup_visible() for group in ("Navigate", "Panels", "Actions", "View"): assert ">{}<".format(group) in html for keys in ("] [", "n p", "o ⏎", "j k", "f", "c", "s", "u", "d", "C m", "r", "?", "esc"): assert ">{}<".format(keys) in html assert "next / previous change" in html and "open the real file at this line" in html # working-tree mode: nothing dimmed, every single-action row is a link assert 'class="dim"' not in html and "uncommitted only" not in html assert 'href="stage"' in html and 'href="files"' in html and 'href="close"' in html # rows covering two actions stay plain text assert 'href="next_change"' not in html # the status bar advertises it too assert "? keys" in view.status[render.STATUS_KEY] def test_help_popup_dims_file_actions_in_commit_mode(): st = make_state() st.enter("abc", git.CommitInfo("abc", "abc1234", "Ann", "2026-09-23 10:00", "Fix things", "")) _, html = help_popup(st) assert "uncommitted only" in html assert html.count('class="dim"') == 4 assert 'href="stage"' not in html and 'href="unstage"' not in html and 'href="discard"' not in html assert 'href="commit"' not in html # everything that still applies stays clickable assert 'href="files"' in html and 'href="open"' in html and 'href="refresh"' in html def test_help_popup_toggles_and_navigates(): st = make_state() view, _ = help_popup(st) commands.ACTIONS["help"](view, None, st) assert not view.is_popup_visible() commands.ACTIONS["help"](view, None, st) assert view.is_popup_visible() view.popup_navigate("files") assert not view.is_popup_visible() assert view.commands[-1] == ("vdiff_action", {"action": "files"}) # keymap spellings that the popup shows as a symbol DISPLAY_KEYS = {"enter": "⏎", "escape": "esc"} def keymap_bindings(): path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "Default.sublime-keymap") with open(path, encoding="utf-8") as f: return json.load(f) def test_keymap_matches_help_table(): """The keymap, ACTIONS and the popup agree on both the actions and the keys that reach them""" bindings = keymap_bindings() assert all(b["command"] == "vdiff_action" for b in bindings) bound = {b["args"]["action"] for b in bindings} listed = {action for k in render.KEYS for action in k.actions} assert bound == set(commands.ACTIONS) == listed # rebinding a key without updating the table would leave the popup and status bar lying bound_keys = {DISPLAY_KEYS.get(key, key) for b in bindings for key in b["keys"]} assert bound_keys == {token for k in render.KEYS for token in k.keys.split()} def test_no_binding_yields_to_vintage_command_mode(): """The review view is read-only, so its letters are vdiff commands in either vim mode init_view opens the view in command mode; a binding that still carried the old `command_mode: false` context would go dead there, which is what broke n / p. """ guard = {"key": "setting.command_mode", "operand": False} for binding in keymap_bindings(): assert guard not in binding["context"], binding["keys"] view = sublime.View() render.init_view(view) assert view.settings().get("command_mode") is True def test_minihtml_stylesheets_reject_unsupported_selectors(): """minihtml drops the rest of a stylesheet at a selector it cannot parse; these are the forms that silently broke HELP_CSS, so no stylesheet constant may use them""" # descendant/child/sibling combinators, pseudo-classes, attribute selectors, compound classes unsupported = re.compile(r"[\s:>~+\[]|[.#][^.#]*[.#]") sheets = [(name, css) for name, css in vars(render).items() if name.endswith("_CSS") and isinstance(css, str)] assert len(sheets) >= 2, sheets for name, css in sheets: for rule in css.split("}"): head = rule.split("{")[0].strip() for selector in filter(None, (s.strip() for s in head.split(","))): assert not unsupported.search(selector), "{}: {}".format(name, selector) # --- header summary line ---------------------------------------------------- def test_summary_counts_staged_and_unstaged_files(): view = sublime.View() render.init_view(view) st = make_state() st.files = [ git.FileChange("a.py", "M", True, 1, 1, None), git.FileChange("b.py", "M", False, 1, 1, None), git.FileChange("c.py", "?", False, 1, 0, None), ] render.render(view, st) assert '
1 staged, 2 unstaged
' in header(view) def test_summary_totals_a_commit_and_owns_the_date(): view = sublime.View() render.init_view(view) st = make_state() st.enter("abc", git.CommitInfo("abc", "abc1234", "Ann", "2026-09-23 10:00", "Fix things", "")) st.change = git.FileChange("x.py", "M", False, 3, 2, None) st.files = [ git.FileChange("x.py", "M", False, 3, 2, None), git.FileChange("y.py", "M", False, 7, 0, None), git.FileChange("logo.png", "M", False, None, None, None), # binary: no counts, still a file ] render.render(view, st) html = header(view) # hash, author, date, totals and message all live on the one summary line summary = html.split('
')[1].split("
")[0] for part in ("abc1234", "Ann", "2026-09-23 10:00", "3 files changed", "-2", "+10", "Fix things"): assert part in summary, part # and nowhere else: there is no second commit line any more assert html.count("abc1234") == 1 and html.count("2026-09-23 10:00") == 1 assert 'class="commit"' not in html def test_summary_is_omitted_without_a_file_list(): view = sublime.View() render.init_view(view) st = make_state() render.render(view, st) assert 'class="summary"' not in header(view)