From 4e2a226809b7d602d05160ba3c7cc5b098d921fb Mon Sep 17 00:00:00 2001 From: Simon Klee Date: Fri, 6 Nov 2026 23:32:35 +0100 Subject: [PATCH] test(cli-rs): drop P16, Markdown diff headings match TS opentui-rust now highlights a Markdown heading that ends the text without a line ending (opentui-rust branch rs-diff-markdown), so the new docs/lexer.md in the E.7b/blocks patch row shows its heading as TS does. The P-TUI checkpoint is equal and the deviation is gone. --- .../deviations/P16-diff-markdown-heading.md | 13 ----------- .../fixtures/E.7b/blocks.sim/open.rs.json | 23 ++++++++++--------- .../fixtures/E.7b/blocks.sim/report.json | 15 ++++-------- .../parity/scenarios/E.7b/blocks.sim.ts | 7 +----- 4 files changed, 17 insertions(+), 41 deletions(-) delete mode 100644 packages/cli-rs/parity/deviations/P16-diff-markdown-heading.md diff --git a/packages/cli-rs/parity/deviations/P16-diff-markdown-heading.md b/packages/cli-rs/parity/deviations/P16-diff-markdown-heading.md deleted file mode 100644 index 3d4e9029ff5..00000000000 --- a/packages/cli-rs/parity/deviations/P16-diff-markdown-heading.md +++ /dev/null @@ -1,13 +0,0 @@ -# P16: a Markdown heading in a diff keeps the plain diff color - -TypeScript: the `patch` row of a created `docs/lexer.md` shows its added line `# Lexer` in the heading color -(`#9d7cd8ff`, bold and italic) on the added-line background. - -Rust: the same seven cells show the added-line text color (`#eeeeeeff`, no attributes). The background matches. -Rust code in a diff is highlighted the same on both sides (P-TUI `E.7a/tools`), and Markdown outside a diff matches -(`U.4b/markdown`), so the difference is Markdown in the diff view, which Core highlights with the inline grammar -injected and opentui-rust's `Diff` apparently does not. - -P-TUI `E.7b/blocks` (`open` row 24) shows it. - -Reason: an open Rust defect, found by `rs-sim-scenarios`, not yet fixed. The fix removes this file. diff --git a/packages/cli-rs/parity/fixtures/E.7b/blocks.sim/open.rs.json b/packages/cli-rs/parity/fixtures/E.7b/blocks.sim/open.rs.json index 9994f53fe68..530bfb54e22 100644 --- a/packages/cli-rs/parity/fixtures/E.7b/blocks.sim/open.rs.json +++ b/packages/cli-rs/parity/fixtures/E.7b/blocks.sim/open.rs.json @@ -96,6 +96,7 @@ "#fab283ff #20303bff 0", "#ffffffff #20303bff 0", "#c53b53ff #141414ff 0", + "#9d7cd8ff #20303bff 9", "#e06c75ff #0a0a0aff 0", "#eeeeeeff #0a0a0aff 0", "#3c70b8ff #0a0a0aff 0", @@ -130,7 +131,7 @@ [[3,2],[7,1],[5,95],[3,2]], [[3,2],[7,1],[5,2],[8,9],[5,1],[8,13],[5,70],[3,2]], [[3,2],[7,1],[5,95],[3,2]], - [[3,2],[7,1],[5,3],[23,1],[24,1],[25,2],[23,1],[26,7],[30,77],[5,3],[3,2]], + [[3,2],[7,1],[5,3],[23,1],[24,1],[25,2],[23,1],[32,7],[30,77],[5,3],[3,2]], [[3,2],[7,1],[5,95],[3,2]], [[3,100]], [[3,2],[7,1],[5,95],[3,2]], @@ -140,15 +141,15 @@ [[3,2],[7,1],[5,2],[8,15],[5,78],[3,2]], [[3,2],[7,1],[5,95],[3,2]], [[3,100]], - [[3,5],[32,1],[3,1],[32,7],[3,86]], - [[3,5],[32,13],[3,82]], + [[3,5],[33,1],[3,1],[33,7],[3,86]], + [[3,5],[33,13],[3,82]], [[3,100]], [[3,5],[2,1],[3,1],[2,27],[3,66]], [[3,5],[2,1],[3,1],[2,24],[3,69]], [[3,100]], - [[3,5],[33,16],[3,79]], + [[3,5],[34,16],[3,79]], [[3,100]], - [[3,5],[34,5],[2,19],[35,71]], + [[3,5],[35,5],[2,19],[36,71]], [[3,100]], [[3,100]], [[3,100]], @@ -159,12 +160,12 @@ [[3,100]], [[3,100]], [[3,100]], - [[3,2],[34,1],[0,95],[3,2]], - [[3,2],[34,1],[0,95],[3,2]], - [[3,2],[34,1],[0,95],[3,2]], - [[3,2],[34,1],[0,2],[36,5],[0,1],[37,1],[0,1],[38,15],[0,1],[37,10],[0,59],[3,2]], - [[3,2],[34,1],[39,95],[3,2]], - [[3,2],[2,21],[35,22],[2,5],[3,15],[33,10],[2,6],[3,2],[33,7],[2,8],[3,2]], + [[3,2],[35,1],[0,95],[3,2]], + [[3,2],[35,1],[0,95],[3,2]], + [[3,2],[35,1],[0,95],[3,2]], + [[3,2],[35,1],[0,2],[37,5],[0,1],[38,1],[0,1],[39,15],[0,1],[38,10],[0,59],[3,2]], + [[3,2],[35,1],[40,95],[3,2]], + [[3,2],[2,21],[36,22],[2,5],[3,15],[34,10],[2,6],[3,2],[34,7],[2,8],[3,2]], [[3,100]] ] } diff --git a/packages/cli-rs/parity/fixtures/E.7b/blocks.sim/report.json b/packages/cli-rs/parity/fixtures/E.7b/blocks.sim/report.json index a21c0dbce72..ec9be4078ba 100644 --- a/packages/cli-rs/parity/fixtures/E.7b/blocks.sim/report.json +++ b/packages/cli-rs/parity/fixtures/E.7b/blocks.sim/report.json @@ -5,16 +5,10 @@ "rs" ], "open": { - "equal": false, - "differences": 7, - "colorOnly": 6, - "deviation": [ - { - "file": "P16-diff-markdown-heading", - "cells": 7, - "styleOnly": true - } - ] + "equal": true, + "differences": 0, + "colorOnly": 0, + "deviation": [] }, "requests": { "equal": true, @@ -33,7 +27,6 @@ ] }, "onlyA": [ - "GET /api/fs/list", "GET /api/plugin" ], "onlyB": [] diff --git a/packages/cli-rs/parity/scenarios/E.7b/blocks.sim.ts b/packages/cli-rs/parity/scenarios/E.7b/blocks.sim.ts index 46bb7f7581d..1ee536a34ee 100644 --- a/packages/cli-rs/parity/scenarios/E.7b/blocks.sim.ts +++ b/packages/cli-rs/parity/scenarios/E.7b/blocks.sim.ts @@ -48,11 +48,6 @@ export default defineSim({ { type: "Fix the lexer and track it" }, { until: "track it" }, { enter: true }, - { - checkpoint: "open", - until: "Fixed the lexer.", - masks: [duration], - deviation: [{ file: "P16-diff-markdown-heading", cells: 7, styleOnly: true }], - }, + { checkpoint: "open", until: "Fixed the lexer.", masks: [duration] }, ], })