mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-04 19:37:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

feat: simplify PR to only use static strings

Browse source 
_
This commit is contained in:
Nik Revenco 2025-03-26 22:38:44 +00:00
parent bc836ca34e
commit a81a7994fd
5 changed files with 26 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

10
helix-term/src/commands.rs
View file

@ -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".into());
.with_title("Search");
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".into());
.with_title("Buffers");
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".into());
.with_title("Jump List");
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".into());
.with_title("Changed Files");
let injector = picker.injector();
cx.editor
@ -3446,7 +3446,7 @@ pub fn command_palette(cx: &mut Context) {
}
}
})
.with_title("Command Palette".into());
.with_title("Command Palette");
compositor.push(Box::new(overlaid(picker)));
},
));

57
helix-term/src/commands/lsp.rs
View file

@ -209,24 +209,16 @@ fn diag_picker(
) -> DiagnosticsPicker {
// TODO: drop current_path comparison and instead use workspace: bool flag?
let mut title: Vec<Span> = vec!["Diagnostics".into()];
let mut errors_count = 0;
let mut warnings_count = 0;
// flatten the map to a vec of (url, diag) pairs
let mut flat_diag = Vec::new();
for (uri, diags) in diagnostics {
flat_diag.reserve(diags.len());
for (diag, ls) in diags {
match diag.severity {
Some(DiagnosticSeverity::ERROR) => errors_count += 1,
Some(DiagnosticSeverity::WARNING) => warnings_count += 1,
_ => (),
}
if let Some(ls) = cx.editor.language_server_by_id(ls) {
for (diag, provider) in diags {
if let Some(ls) = provider
.language_server_id()
.and_then(|id| cx.editor.language_server_by_id(id))
{
flat_diag.push(PickerDiagnostic {
location: Location {
uri: uri.clone(),
@ -246,23 +238,6 @@ fn diag_picker(
error: cx.editor.theme.get("error"),
};
if warnings_count != 0 || errors_count != 0 {
title.push(": ".into());
}
if warnings_count != 0 {
title.push(Span::styled("● ", styles.warning));
title.push(warnings_count.to_string().into());
}
if errors_count != 0 {
if warnings_count != 0 {
title.push(" ".into())
}
title.push(Span::styled("● ", styles.error));
title.push(errors_count.to_string().into());
}
let mut columns = vec![
ui::PickerColumn::new(
"severity",
@ -321,7 +296,7 @@ fn diag_picker(
},
)
.with_preview(move |_editor, diag| location_to_file_location(&diag.location))
.with_title(title.into())
.with_title("Diagnostics")
.truncate_start(false)
}
@ -450,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".into())
.with_title("Document Symbols")
.truncate_start(false);
compositor.push(Box::new(overlaid(picker)))
@ -578,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".into())
.with_title("Workspace Symbols")
.truncate_start(false);
cx.push_layer(Box::new(overlaid(picker)));
@ -871,11 +846,9 @@ impl Display for ApplyEditErrorKind {
/// Precondition: `locations` should be non-empty.
fn goto_impl(
title: &'static str,
editor: &mut Editor,
compositor: &mut Compositor,
locations: Vec<Location>,
offset_encoding: OffsetEncoding,
) {
let cwdir = helix_stdx::env::current_working_dir();
@ -901,8 +874,8 @@ fn goto_impl(
let picker = Picker::new(columns, 0, locations, cwdir, |cx, location, action| {
jump_to_location(cx.editor, location, action)
})
.with_title(title.into())
.with_preview(move |_editor, location| location_to_file_location(location));
.with_preview(|_editor, location| location_to_file_location(location))
.with_title(title);
compositor.push(Box::new(overlaid(picker)));
}
}
@ -961,13 +934,7 @@ where
if locations.is_empty() {
editor.set_error("No definition found.");
} else {
goto_impl(
"Goto Implementation",
editor,
compositor,
items,
offset_encoding,
);
goto_impl("Goto Implementation", editor, compositor, locations);
}
};
Ok(Callback::EditorCompositor(Box::new(call)))
@ -1044,7 +1011,7 @@ pub fn goto_reference(cx: &mut Context) {
if locations.is_empty() {
editor.set_error("No references found.");
} else {
goto_impl("Goto Reference", editor, compositor, items, offset_encoding);
goto_impl("Goto Reference", editor, compositor, locations);
}
};
Ok(Callback::EditorCompositor(Box::new(call)))

2
helix-term/src/commands/typed.rs
View file

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

14
helix-term/src/ui/mod.rs
View file

@ -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".into());
.with_title("Files");
let injector = picker.injector();
let timeout = std::time::Instant::now() + std::time::Duration::from_millis(30);
@ -306,16 +306,6 @@ type FileExplorer = Picker<(PathBuf, bool), (PathBuf, Style)>;
pub fn file_explorer(root: PathBuf, editor: &Editor) -> Result<FileExplorer, std::io::Error> {
let directory_style = editor.theme.get("ui.text.directory");
let directory_content = directory_content(&root)?;
let mut title: Vec<tui::text::Span> = vec!["File Explorer".into()];
let path = helix_stdx::path::get_relative_path(&root);
// if Helix's working directory is the same as the File Explorer's
// working directory, then we don't want to render a
// File Explorer: <empty>, but rather only render the picker title
if path.to_string_lossy() != "" {
title.push(": ".into());
title.push(Span::styled(path.display().to_string(), directory_style));
}
let columns = [PickerColumn::new(
"path",
@ -357,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(title.into());
.with_title("File Explorer");
Ok(picker)
}

11
helix-term/src/ui/picker.rs
View file

@ -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<Spans<'static>>,
title: Option<&'static str>,
}
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: Spans<'static>) -> Self {
pub fn with_title(mut self, title: &'static str) -> Self {
self.title = Some(title);
self
}
@ -681,9 +681,10 @@ 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.title.as_ref().map_or(Block::bordered(), |title| {
Block::bordered().title(title.clone())
});
let block: Block<'_> = self
.title
.as_ref()
.map_or(Block::bordered(), |title| Block::bordered().title(title));
// calculate the inner area inside the box
let inner = block.inner(area);