tristan/rustlings
1
0
Fork 0
mirror of https://github.com/rust-lang/rustlings.git synced 2024-12-25 23:10:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't exit the list on "to current" if nothing is selected

Browse source
This commit is contained in:
mo8it 2024-08-24 00:23:45 +02:00
parent 570bc9f32d
commit 4e12725616
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/list.rs
View file

@ -63,7 +63,9 @@ fn handle_list(app_state: &mut AppState, stdout: &mut StdoutLock) -> Result<()>
list_state.reset_selected()?;
}
KeyCode::Char('c') => {
return list_state.selected_to_current_exercise();
if list_state.selected_to_current_exercise()? {
return Ok(());
}
}
// Redraw to remove the message.
KeyCode::Esc => (),

20
src/list/state.rs
View file

@ -250,25 +250,27 @@ impl<'a> ListState<'a> {
Ok(())
}
pub fn selected_to_current_exercise(&mut self) -> Result<()> {
// Return `true` if there was something to select.
pub fn selected_to_current_exercise(&mut self) -> Result<bool> {
let Some(selected) = self.selected else {
// TODO: Don't exit list
return Ok(());
self.message.push_str("Nothing selected to continue at!");
return Ok(false);
};
let ind = self
let (ind, _) = self
.app_state
.exercises()
.iter()
.enumerate()
.filter_map(|(ind, exercise)| match self.filter {
Filter::Done => exercise.done.then_some(ind),
Filter::Pending => (!exercise.done).then_some(ind),
Filter::None => Some(ind),
.filter(|(_, exercise)| match self.filter {
Filter::Done => exercise.done,
Filter::Pending => !exercise.done,
Filter::None => true,
})
.nth(selected)
.context("Invalid selection index")?;
self.app_state.set_current_exercise_ind(ind)
self.app_state.set_current_exercise_ind(ind)?;
Ok(true)
}
}