aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPascal Kuthe2022-10-13 18:10:10 +0000
committerBlaž Hrastnik2022-10-21 01:03:00 +0000
commit189aa0bfcfb6841ced946289e112cc9cdd4919a5 (patch)
tree21ea62e50048de9faad3877c4cc9d3627096352f
parentdc3527f52df27ae20294ca14bac60994725519aa (diff)
never sort menu items when no fuzzy matching is possible
-rw-r--r--helix-term/src/commands/lsp.rs45
-rw-r--r--helix-term/src/ui/completion.rs2
-rw-r--r--helix-term/src/ui/menu.rs15
3 files changed, 26 insertions, 36 deletions
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index ecaab169..100fa196 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -490,35 +490,34 @@ pub fn code_action(cx: &mut Context) {
_ => 7,
});
- let mut picker =
- ui::Menu::new(actions, false, (), move |editor, code_action, event| {
- if event != PromptEvent::Validate {
- return;
- }
+ let mut picker = ui::Menu::new(actions, (), move |editor, code_action, event| {
+ if event != PromptEvent::Validate {
+ return;
+ }
- // always present here
- let code_action = code_action.unwrap();
+ // always present here
+ let code_action = code_action.unwrap();
- match code_action {
- lsp::CodeActionOrCommand::Command(command) => {
- log::debug!("code action command: {:?}", command);
- execute_lsp_command(editor, command.clone());
+ match code_action {
+ lsp::CodeActionOrCommand::Command(command) => {
+ log::debug!("code action command: {:?}", command);
+ execute_lsp_command(editor, command.clone());
+ }
+ lsp::CodeActionOrCommand::CodeAction(code_action) => {
+ log::debug!("code action: {:?}", code_action);
+ if let Some(ref workspace_edit) = code_action.edit {
+ log::debug!("edit: {:?}", workspace_edit);
+ apply_workspace_edit(editor, offset_encoding, workspace_edit);
}
- lsp::CodeActionOrCommand::CodeAction(code_action) => {
- log::debug!("code action: {:?}", code_action);
- if let Some(ref workspace_edit) = code_action.edit {
- log::debug!("edit: {:?}", workspace_edit);
- apply_workspace_edit(editor, offset_encoding, workspace_edit);
- }
- // if code action provides both edit and command first the edit
- // should be applied and then the command
- if let Some(command) = &code_action.command {
- execute_lsp_command(editor, command.clone());
- }
+ // if code action provides both edit and command first the edit
+ // should be applied and then the command
+ if let Some(command) = &code_action.command {
+ execute_lsp_command(editor, command.clone());
}
}
- });
+ }
+ });
picker.move_down(); // pre-select the first item
let popup = Popup::new("code-action", picker);
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 2e555e4b..7348dcf4 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -97,7 +97,7 @@ impl Completion {
start_offset: usize,
trigger_offset: usize,
) -> Self {
- let menu = Menu::new(items, true, (), move |editor: &mut Editor, item, event| {
+ let menu = Menu::new(items, (), move |editor: &mut Editor, item, event| {
fn item_to_transaction(
doc: &Document,
item: &CompletionItem,
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index f7712e4d..4b1155e3 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -74,15 +74,15 @@ impl<T: Item> Menu<T> {
// rendering)
pub fn new(
options: Vec<T>,
- sort: bool,
editor_data: <T as Item>::Data,
callback_fn: impl Fn(&mut Editor, Option<&T>, MenuEvent) + 'static,
) -> Self {
- let mut menu = Self {
+ let matches = (0..options.len()).map(|i| (i, 0)).collect();
+ Self {
options,
editor_data,
matcher: Box::new(Matcher::default()),
- matches: Vec::new(),
+ matches,
cursor: None,
widths: Vec::new(),
callback_fn: Box::new(callback_fn),
@@ -90,16 +90,7 @@ impl<T: Item> Menu<T> {
size: (0, 0),
viewport: (0, 0),
recalculate: true,
- };
-
- if sort {
- // TODO: scoring on empty input should just use a fastpath
- menu.score("");
- } else {
- menu.matches = (0..menu.options.len()).map(|i| (i, 0)).collect();
}
-
- menu
}
pub fn score(&mut self, pattern: &str) {