eb9c378 · helix · git.iko.soy

on master help sign in

fix syntax highlights in dynamic picker (#8206)

eb9c378Pascal Kuthe3 years ago

helix-term/src/ui/picker.rs+7−3

@@ -474,9 +474,13 @@ impl<T: Item + 'static> Picker<T> {

474 log::info!("highlighting picker item failed");

475 return;

476 };

477− let Some(Overlay {

478− content: picker, ..

479− }) = compositor.find::<Overlay<Self>>()

477+ let picker = match compositor.find::<Overlay<Self>>() {

478+ Some(Overlay { content, .. }) => Some(content),

479+ None => compositor

480+ .find::<Overlay<DynamicPicker<T>>>()

481+ .map(|overlay| &mut overlay.content.file_picker),

482+ };

483+ let Some(picker) = picker

480 else {

484 else {

481 log::info!("picker closed before syntax highlighting finished");

485 log::info!("picker closed before syntax highlighting finished");

482 return;

486 return;