feat(tui): color unified-diff lines inside code blocks - #135
Conversation
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Comment |
Deploying sivtr with
|
| Latest commit: |
96c84e5
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://2c3b81b8.sivtr.pages.dev |
| Branch Preview URL: | https://tui-content-diff.sivtr.pages.dev |
3324996 to
a7e1461
Compare
|
@codex review |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: a7e146162a
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| let trimmed = line.trim_start(); | ||
| if trimmed.starts_with("@@") { |
There was a problem hiding this comment.
当 unified diff 的上下文内容本身以 + 或 - 开头时，该行编码为 +... 或 -...；这里的 trim_start() 会移除必需的空格上下文标记，随后将其误判为新增或删除行。例如未修改的源码行 +value 会显示为绿色。应仅移除围栏自身的缩进，再按 diff 标记所在的第一列分类。
Useful? React with 👍 / 👎.
| fn is_diff_hunk_header(line: &str) -> bool { | ||
| line.trim_start().starts_with("@@") |
There was a problem hiding this comment.
当普通代码块包含以 @@ 开头但并非 hunk 头的代码时，这个宽松判断会把整个块识别成 diff。例如 Ruby 类变量声明 @@instances = 0 会触发 diff 模式，随后块内以 +/- 开头的源码被错误着色。应验证注释所述的 @@ -old +new @@ 结构，而不只是检查前缀。
Useful? React with 👍 / 👎.
| } else if trimmed.starts_with("+++") || trimmed.starts_with("---") { | ||
| Style::default() | ||
| .fg(crate::tui::theme::muted()) | ||
| .add_modifier(Modifier::BOLD) |
There was a problem hiding this comment.
当新增源码本身以 ++ 开头时，其 diff 行会是 +++...，这里会在新增分支之前将它误判为文件头；删除以 -- 开头的源码也同样受影响。例如新增 C/C++ 语句 ++counter; 会显示为灰色粗体而不是绿色。文件头判断应要求 +++/--- 后存在文件头分隔符，而不能只匹配三个字符的前缀。
Useful? React with 👍 / 👎.
Fenced code blocks that are git diffs now render change lines with diff colors: @@ hunk headers in accent, + additions in success green, - deletions in failure red, and file headers bold. A block is treated as a diff when its fence language is diff or its body contains an @@ hunk header, so raw tool output pasted as a diff colors up without any markup.
a7e1461 to
96c84e5
Compare
2 participants
Purpose
Color git-diff code blocks in the read view: @@\ hunk headers in accent, +\ additions in success green, -\ deletions in failure red, file headers bold.
Changes
Validation
Stacked on #134.