fix insert_history modifier handling #1774
Merged
Conversation
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
nornagon-openai
commented
Aug 1, 2025
Comment on lines
-548
to
+558
| let (icon, style): (&str, Style) = match status { | ||
| StepStatus::Completed => ("✓", Style::default().fg(Color::Green)), | ||
| StepStatus::InProgress => ( | ||
| "▶", | ||
| Style::default() | ||
| .fg(Color::Yellow) | ||
| .add_modifier(Modifier::BOLD), | ||
| ), | ||
| StepStatus::Pending => ("○", Style::default().fg(Color::Gray)), | ||
| let icon_span: Span = match status { | ||
| StepStatus::Completed => Span::from("✓").fg(Color::Green), | ||
| StepStatus::InProgress => Span::from("▶").fg(Color::Yellow).bold(), | ||
| StepStatus::Pending => Span::from("○").fg(Color::Gray), | ||
| }; | ||
| let prefix = vec![ | ||
| Span::raw(format!("{num:>2}. [")), | ||
| Span::styled(icon.to_string(), style), | ||
| Span::raw("] "), | ||
| ]; | ||
| let mut spans = prefix; | ||
| spans.push(Span::raw(step)); | ||
| lines.push(Line::from(spans)); | ||
| lines.push(Line::from(vec![ | ||
| format!("{num:>2}. [").into(), | ||
| icon_span, | ||
| "] ".into(), | ||
| step.into(), | ||
| ])); |
There was a problem hiding this comment.
this is semantically unchanged, just refactored to be more readable.
nornagon-openai
commented
Aug 1, 2025
| next_modifier.insert(span.style.add_modifier); | ||
| next_modifier.remove(span.style.sub_modifier); | ||
| if next_modifier != modifier { | ||
| let mut modifier = Modifier::empty(); |
There was a problem hiding this comment.
this is the bugfix.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
easong-openai
approved these changes
Aug 1, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This fixes a bug in insert_history_lines where writing
Line::From(vec!["A".bold(), "B".into()])would write "B" as bold, because "B" didn't explicitly subtract bold.