Add live preview to theme picker

helix-term/src/application.rs

@@ -38,6 +38,17 @@ use {
 #[cfg(windows)]
 type Signals = futures_util::stream::Empty<()>;
 
+fn default_theme(theme_loader: Arc<theme::Loader>, true_color: bool) -> (String, theme::Theme) {
+    if true_color {
+        (String::from("default"), theme_loader.default())
+    } else {
+        (
+            String::from("base16_default"),
+            theme_loader.base16_default(),
+        )
+    }
+}
+
 pub struct Application {
     compositor: Compositor,
     editor: Editor,
@@ -67,26 +78,24 @@ impl Application {
             std::sync::Arc::new(theme::Loader::new(&conf_dir, &helix_loader::runtime_dir()));
 
         let true_color = config.editor.true_color || crate::true_color();
-        let theme = config
-            .theme
-            .as_ref()
-            .and_then(|theme| {
-                theme_loader
-                    .load(theme)
+
+        let (theme_name, theme) = match config.theme.as_ref() {
+            Some(theme_name) => {
+                match theme_loader
+                    .load(theme_name)
                     .map_err(|e| {
-                        log::warn!("failed to load theme `{}` - {}", theme, e);
+                        log::warn!("failed to load theme `{}` - {}", theme_name, e);
                         e
                     })
                     .ok()
                     .filter(|theme| (true_color || theme.is_16_color()))
-            })
-            .unwrap_or_else(|| {
-                if true_color {
-                    theme_loader.default()
-                } else {
-                    theme_loader.base16_default()
+                {
+                    Some(theme) => (theme_name.clone(), theme),
+                    None => default_theme(theme_loader.clone(), true_color),
                 }
-            });
+            }
+            None => default_theme(theme_loader.clone(), true_color),
+        };
 
         let syn_loader_conf = user_syntax_loader().unwrap_or_else(|err| {
             eprintln!("Bad language config: {}", err);
@@ -103,6 +112,7 @@ impl Application {
             theme_loader.clone(),
             syn_loader.clone(),
             config.editor.clone(),
+            theme_name.clone(),
         );
 
         let editor_view = Box::new(ui::EditorView::new(std::mem::take(&mut config.keys)));
@@ -159,7 +169,7 @@ impl Application {
                 .unwrap_or_else(|_| editor.new_file(Action::VerticalSplit));
         }
 
-        editor.set_theme(theme);
+        editor.set_theme(theme, theme_name);
 
         #[cfg(windows)]
         let signals = futures_util::stream::empty();

helix-term/src/commands.rs

@@ -1794,7 +1794,7 @@ fn global_search(cx: &mut Context) {
 
                 let picker = FilePicker::new(
                     all_matches,
-                    move |(_line_num, path)| {
+                    move |_, (_line_num, path)| {
                         let relative_path = helix_core::path::get_relative_path(path)
                             .to_string_lossy()
                             .into_owned();
@@ -2077,7 +2077,7 @@ fn buffer_picker(cx: &mut Context) {
             .iter()
             .map(|(_, doc)| new_meta(doc))
             .collect(),
-        BufferMeta::format,
+        |_, a| BufferMeta::format(a),
         |cx, meta, action| {
             cx.editor.switch(meta.id, action);
         },
@@ -2127,7 +2127,7 @@ pub fn command_palette(cx: &mut Context) {
 
             let picker = Picker::new(
                 commands,
-                move |command| match command {
+                move |_, command| match command {
                     MappableCommand::Typable { doc, name, .. } => match keymap.get(name as &String)
                     {
                         Some(bindings) => format!("{} ({})", doc, fmt_binding(bindings)).into(),

helix-term/src/commands/dap.rs

@@ -118,7 +118,7 @@ fn thread_picker(
             let thread_states = debugger.thread_states.clone();
             let picker = FilePicker::new(
                 threads,
-                move |thread| {
+                move |_, thread| {
                     format!(
                         "{} ({})",
                         thread.name,
@@ -320,7 +320,7 @@ pub fn dap_launch(cx: &mut Context) {
 
     cx.push_layer(Box::new(overlayed(Picker::new(
         templates,
-        |template| template.name.as_str().into(),
+        |_, template| template.name.as_str().into(),
         |cx, template, _action| {
             let completions = template.completion.clone();
             let name = template.name.clone();
@@ -792,7 +792,7 @@ pub fn dap_switch_stack_frame(cx: &mut Context) {
 
     let picker = FilePicker::new(
         frames,
-        |frame| frame.name.as_str().into(), // TODO: include thread_states in the label
+        |_, frame| frame.name.as_str().into(), // TODO: include thread_states in the label
         move |cx, frame, _action| {
             let debugger = debugger!(cx.editor);
             // TODO: this should be simpler to find

helix-term/src/commands/lsp.rs

@@ -73,7 +73,7 @@ fn sym_picker(
     let current_path2 = current_path.clone();
     let mut picker = FilePicker::new(
         symbols,
-        move |symbol| {
+        move |_, symbol| {
             if current_path.as_ref() == Some(&symbol.location.uri) {
                 symbol.name.as_str().into()
             } else {
@@ -455,7 +455,7 @@ fn goto_impl(
         _locations => {
             let picker = FilePicker::new(
                 locations,
-                move |location| {
+                move |_, location| {
                     let file: Cow<'_, str> = (location.uri.scheme() == "file")
                         .then(|| {
                             location