Repository navigation
fix(core): 失效的回放文本坐标不再复用(#29 的路线无关部分) - #263
Merged
Merged
Conversation
This was referenced Oct 31, 2026
5 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
问题与最终行为
#29的四层堆叠 PR(#108 → #113)无法按"重基"处理:它们与 main 已经落地的是两条并行路线。证据:
experiments/core/history_view.hppowned/anchor语义view_mapping/ViewMapping/origin语义experiments/core/view_mapping.hppgit cherry -v origin/main origin/fix/history-viewport-r29显示 20 个提交全部+(未应用),而 main 上已有另一套history_view。逐个重放时,13 个提交在candidate_terminal.cpp、history_view.hpp、candidate_resize_map_test.cpp等处与 main 的实现语义冲突。本 PR 只取其中与路线无关的那一个修复:
fbcbe38(invalidate stale replay text coordinates)。最终行为:
same_replay_line由"比较文本跨度长度"改为"必须首末列相同"——同字节出现在不同列时不再被判为可复用版本(选择与 Find 依赖该版本)replay_key把首列纳入键,只有尾部填充是惰性的其余 19 个提交(含
view_mapping路线实现与依赖它的证据文档)不在本 PR 内,需要先决定路线归属。验证
candidate_terminal.cpp零冲突应用(replay_bounds、same_replay_line等符号在 main 仍存在)history_view.hpp或view_mapping.hppcandidate_core测试由 CI 执行(本 worktree 无构建产物)性能影响(如适用)
不适用。只影响回放文本坐标的复用判定,不改变绘制或调度路径。
来源与限制
fix/history-viewport-r29栈中的fbcbe38view_mapping路线与 main 的owned/anchor路线必须择一,属 [R2-11][架构] 提交核心、GUI/平台方案并取得用户确认 #34 类的架构裁决,需要你决定后我再推进剩下 19 个提交