fix: use Spans<&'static>

helix-term/src/commands.rs

@@ -2641,7 +2641,7 @@ fn global_search(cx: &mut Context) {
     })
     .with_history_register(Some(reg))
     .with_dynamic_query(get_files, Some(275))
-    .with_title("Search");
+    .with_title("Search".into());
 
     cx.push_layer(Box::new(overlaid(picker)));
 }
@@ -3178,7 +3178,7 @@ fn buffer_picker(cx: &mut Context) {
         });
         Some((meta.id.into(), lines))
     })
-    .with_title("Buffers");
+    .with_title("Buffers".into());
     cx.push_layer(Box::new(overlaid(picker)));
 }
 
@@ -3270,7 +3270,7 @@ fn jumplist_picker(cx: &mut Context) {
         let line = meta.selection.primary().cursor_line(doc.text().slice(..));
         Some((meta.id.into(), Some((line, line))))
     })
-    .with_title("Jump List");
+    .with_title("Jump List".into());
     cx.push_layer(Box::new(overlaid(picker)));
 }
 
@@ -3353,7 +3353,7 @@ fn changed_file_picker(cx: &mut Context) {
         },
     )
     .with_preview(|_editor, meta| Some((meta.path().into(), None)))
-    .with_title("Changed Files");
+    .with_title("Changed Files".into());
     let injector = picker.injector();
 
     cx.editor
@@ -3446,7 +3446,7 @@ pub fn command_palette(cx: &mut Context) {
                     }
                 }
             })
-            .with_title("Command Palette");
+            .with_title("Command Palette".into());
             compositor.push(Box::new(overlaid(picker)));
         },
     ));

helix-term/src/commands/lsp.rs

@@ -296,7 +296,7 @@ fn diag_picker(
         },
     )
     .with_preview(move |_editor, diag| location_to_file_location(&diag.location))
-    .with_title("Diagnostics")
+    .with_title("Diagnostics".into())
     .truncate_start(false)
 }
 
@@ -425,7 +425,7 @@ pub fn symbol_picker(cx: &mut Context) {
                 },
             )
             .with_preview(move |_editor, item| location_to_file_location(&item.location))
-            .with_title("Document Symbols")
+            .with_title("Document Symbols".into())
             .truncate_start(false);
 
             compositor.push(Box::new(overlaid(picker)))
@@ -553,7 +553,7 @@ pub fn workspace_symbol_picker(cx: &mut Context) {
     )
     .with_preview(|_editor, item| location_to_file_location(&item.location))
     .with_dynamic_query(get_symbols, None)
-    .with_title("Workspace Symbols")
+    .with_title("Workspace Symbols".into())
     .truncate_start(false);
 
     cx.push_layer(Box::new(overlaid(picker)));
@@ -875,7 +875,7 @@ fn goto_impl(
                 jump_to_location(cx.editor, location, action)
             })
             .with_preview(|_editor, location| location_to_file_location(location))
-            .with_title(title);
+            .with_title(title.into());
             compositor.push(Box::new(overlaid(picker)));
         }
     }

helix-term/src/commands/typed.rs

@@ -1459,7 +1459,7 @@ fn lsp_workspace_command(
                             cx.editor.execute_lsp_command(command.clone(), *ls_id);
                         },
                     )
-                    .with_title("LSP Commands");
+                    .with_title("LSP Commands".into());
                     compositor.push(Box::new(overlaid(picker)))
                 },
             ));

helix-term/src/ui/mod.rs

@@ -275,7 +275,7 @@ pub fn file_picker(editor: &Editor, root: PathBuf) -> FilePicker {
         }
     })
     .with_preview(|_editor, path| Some((path.as_path().into(), None)))
-    .with_title("Files");
+    .with_title("Files".into());
     let injector = picker.injector();
     let timeout = std::time::Instant::now() + std::time::Duration::from_millis(30);
 
@@ -347,7 +347,7 @@ pub fn file_explorer(root: PathBuf, editor: &Editor) -> Result<FileExplorer, std
         },
     )
     .with_preview(|_editor, (path, _is_dir)| Some((path.as_path().into(), None)))
-    .with_title("File Explorer");
+    .with_title("File Explorer".into());
 
     Ok(picker)
 }

helix-term/src/ui/picker.rs

@@ -268,7 +268,7 @@ pub struct Picker<T: 'static + Send + Sync, D: 'static> {
     /// An event handler for syntax highlighting the currently previewed file.
     preview_highlight_handler: Sender<Arc<Path>>,
     dynamic_query_handler: Option<Sender<DynamicQueryChange>>,
-    title: Option<&'static str>,
+    title: Option<Spans<'static>>,
 }
 
 impl<T: 'static + Send + Sync, D: 'static + Send + Sync> Picker<T, D> {
@@ -410,7 +410,7 @@ impl<T: 'static + Send + Sync, D: 'static + Send + Sync> Picker<T, D> {
         self
     }
 
-    pub fn with_title(mut self, title: &'static str) -> Self {
+    pub fn with_title(mut self, title: Spans<'static>) -> Self {
         self.title = Some(title);
         self
     }
@@ -681,10 +681,9 @@ impl<T: 'static + Send + Sync, D: 'static + Send + Sync> Picker<T, D> {
         let background = cx.editor.theme.get("ui.background");
         surface.clear_with(area, background);
 
-        let block: Block<'_> = self
+        let block: Block<'_> = self.title.as_ref().map_or(Block::bordered(), |title| {
-            .title
+            Block::bordered().title(title.clone())
-            .as_ref()
+        });
-            .map_or(Block::bordered(), |title| Block::bordered().title(title));
 
         // calculate the inner area inside the box
         let inner = block.inner(area);