jarjar/rustlings
1
0
Fork 0
mirror of https://github.com/rust-lang/rustlings.git synced 2026-05-15 09:48:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2381 from senekor/senekor/soqukxyvzplr

Browse Source 
Emphasize hotkeys in footer with color
This commit is contained in:
Mo Bitar 2026-04-25 14:14:15 +02:00 committed by GitHub
commit 4f1a440962
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/list/state.rs
View File

@ -237,12 +237,24 @@ impl<'a> ListState<'a> {
if self.message.is_empty() { if self.message.is_empty() {
// Help footer message // Help footer message
if self.scroll_state.selected().is_some() { if self.scroll_state.selected().is_some() {
writer writer.write_str("↓/")?;
.write_str("↓/j ↑/k home/g end/G | ↩️/<c>ontinue at | <r>eset exercise")?; hotkey(&mut writer, b"j")?;
writer.write_str(" ↑/")?;
hotkey(&mut writer, b"k")?;
writer.write_ascii(b" home/")?;
hotkey(&mut writer, b"g")?;
writer.write_ascii(b" end/")?;
hotkey(&mut writer, b"G")?;
writer.write_str(" | ↩️/")?;
hotkey(&mut writer, b"c")?;
writer.write_ascii(b"ontinue at | ")?;
hotkey(&mut writer, b"r")?;
writer.write_ascii(b"eset exercise")?;
next_ln(stdout)?; next_ln(stdout)?;
writer = MaxLenWriter::new(stdout, self.term_width as usize); writer = MaxLenWriter::new(stdout, self.term_width as usize);
writer.write_ascii(b"<s>earch | filter ")?; hotkey(&mut writer, b"s")?;
writer.write_ascii(b"earch | filter ")?;
} else { } else {
// Nothing selected (and nothing shown), so only display filter and quit. // Nothing selected (and nothing shown), so only display filter and quit.
writer.write_ascii(b"filter ")?; writer.write_ascii(b"filter ")?;
@ -250,27 +262,41 @@ impl<'a> ListState<'a> {
match self.filter { match self.filter {
Filter::Done => { Filter::Done => {
writer.stdout.queue(SetAttribute(Attribute::Underlined))?;
hotkey(&mut writer, b"d")?;
writer writer
.stdout .stdout
.queue(SetForegroundColor(Color::Magenta))? .queue(SetForegroundColor(Color::Magenta))?
.queue(SetAttribute(Attribute::Underlined))?; .queue(SetAttribute(Attribute::Underlined))?;
writer.write_ascii(b"<d>one")?; writer.write_str("one")?;
writer.stdout.queue(ResetColor)?; writer.stdout.queue(ResetColor)?;
writer.write_ascii(b"/<p>ending")?; writer.write_ascii(b"/")?;
hotkey(&mut writer, b"p")?;
writer.write_ascii(b"ending")?;
} }
Filter::Pending => { Filter::Pending => {
writer.write_ascii(b"<d>one/")?; hotkey(&mut writer, b"d")?;
writer.write_ascii(b"one/")?;
writer.stdout.queue(SetAttribute(Attribute::Underlined))?;
hotkey(&mut writer, b"p")?;
writer writer
.stdout .stdout
.queue(SetForegroundColor(Color::Magenta))? .queue(SetForegroundColor(Color::Magenta))?
.queue(SetAttribute(Attribute::Underlined))?; .queue(SetAttribute(Attribute::Underlined))?;
writer.write_ascii(b"<p>ending")?; writer.write_ascii(b"ending")?;
writer.stdout.queue(ResetColor)?; writer.stdout.queue(ResetColor)?;
} }
Filter::None => writer.write_ascii(b"<d>one/<p>ending")?, Filter::None => {
hotkey(&mut writer, b"d")?;
writer.write_ascii(b"one/")?;
hotkey(&mut writer, b"p")?;
writer.write_ascii(b"ending")?;
}
} }
writer.write_ascii(b" | <q>uit list")?; writer.write_ascii(b" | ")?;
hotkey(&mut writer, b"q")?;
writer.write_ascii(b"uit list")?;
} else { } else {
writer.stdout.queue(SetForegroundColor(Color::Magenta))?; writer.stdout.queue(SetForegroundColor(Color::Magenta))?;
writer.write_str(&self.message)?; writer.write_str(&self.message)?;
@ -410,3 +436,14 @@ impl<'a> ListState<'a> {
Ok(true) Ok(true)
} }
} }
/// Draw an emphasized hotkey in the list footer.
fn hotkey(writer: &mut MaxLenWriter, hotkey: &[u8]) -> io::Result<()> {
writer
.stdout
.queue(SetForegroundColor(Color::Yellow))?
.queue(SetAttribute(Attribute::Bold))?;
writer.write_ascii(hotkey)?;
writer.stdout.queue(ResetColor)?;
Ok(())
}