Skip to content

Commit c5da26d

Browse files
committed
Incompatible with reedline 0.44 until ratatui uses crossterm 0.29.
1 parent b21fa90 commit c5da26d

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,8 @@ updates:
2020
- dependency-name: "phf"
2121
update-types:
2222
["version-update:semver-minor", "version-update:semver-major"]
23+
- dependency-name: "reedline"
24+
update-types:
25+
["version-update:semver-minor", "version-update:semver-major"]
2326
- dependency-name: "*"
2427
update-types: ["version-update:semver-patch"]

demo/iter_ryo.rs

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
clap = { version = "4.5", features = ["cargo", "derive"] }
55
nu-ansi-term = { version = "0.50", features = ["derive_serde_style"] }
66
ratatui = { version = "0.29", features = ["crossterm"] }
7+
reedline = "0.43"
78
strum = { version = "0.27", features = ["derive"] }
89
tui-textarea = { version = "0.7", features = ["crossterm", "search"] }
910
@@ -27,12 +28,11 @@ use clap::{CommandFactory, Parser};
2728
use edit::edit_file;
2829
use nu_ansi_term::Color as NuColor;
2930
use ratatui::crossterm::event::{KeyEvent, KeyEventKind};
30-
use ratatui::style::Color;
3131
use reedline::{
32-
default_emacs_keybindings, ColumnarMenu, DefaultCompleter, DefaultHinter, DefaultValidator,
33-
EditCommand, Emacs, ExampleHighlighter, FileBackedHistory, HistoryItem, KeyCode, KeyModifiers,
34-
Keybindings, MenuBuilder, Prompt, PromptEditMode, PromptHistorySearch,
35-
PromptHistorySearchStatus, Reedline, ReedlineEvent, ReedlineMenu, Signal,
32+
default_emacs_keybindings, Color as ReedLineColor, ColumnarMenu, DefaultCompleter,
33+
DefaultHinter, DefaultValidator, EditCommand, Emacs, ExampleHighlighter, FileBackedHistory,
34+
HistoryItem, KeyCode, KeyModifiers, Keybindings, MenuBuilder, Prompt, PromptEditMode,
35+
PromptHistorySearch, PromptHistorySearchStatus, Reedline, ReedlineEvent, ReedlineMenu, Signal,
3636
};
3737
use regex::Regex;
3838
use std::{
@@ -67,8 +67,7 @@ use thag_rs::{
6767
};
6868
use thag_styling::{
6969
display_terminal_attributes, display_theme_details, display_theme_roles, ColorInitStrategy,
70-
Role::{self, Success},
71-
Style, TermAttributes,
70+
Role, Style, TermAttributes, ThemedStyle,
7271
};
7372
use tui_textarea::{Input, TextArea};
7473

@@ -369,12 +368,7 @@ impl Prompt for ReplPrompt {
369368

370369
#[profiled]
371370
fn get_prompt_color(&self) -> reedline::Color {
372-
if let Some(color_info) = Style::for_role(Success).foreground {
373-
Color::Indexed(color_info.index).into()
374-
} else {
375-
vprtln!(V::VV, "defaulting to Green");
376-
Color::Green.into()
377-
}
371+
lazy_static_var!(ReedLineColor, deref, ReedLineColor::themed(Role::Success))
378372
}
379373
}
380374

0 commit comments

Comments
 (0)