T19 round 2 fixes

- regions read their lines through TextMerge's accessors; conflicts and resolve
  split with similar's tokenize_lines, so a lone return ends a line everywhere
- the merged ending and line breaks know a lone return
- taking both sides separates them only when both hold text
- merge views split rows the same way
This commit is contained in:
ZacharyZhang-NY committed 2026-09-26 02:28:13 -04:00
1 parent 3abcd5cc87
commit b2c587546e
3 files changed
+48 -19

No files matched your search

+2 -1
View File
@@ -243,4 +243,5 @@ Per-component lines live in `tasks/`. Tags there:
| T18 | 2 | FAIL | a folder it could not enter still started the shell elsewhere; links read cluster cells as spaces |
| T18 | 3 | PASS | |
| T19 | 1 | FAIL | a merge rewrote line endings and added a last newline; the split view numbered its right side from the old file; an empty side started its hunk a line late; the subject counter covered long subjects; clipped code rows had no line height |
| T19 | 2 | — | pending review |
| T19 | 2 | FAIL | a lone return split lines for similar but not for regions, so a change was lost; taking both sides added a newline to an empty side |
| T19 | 3 | — | pending review |