suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace if let with early return

pull/1636/head
Gokul Soumya 2022-02-07 21:31:11 +05:30 committed by Blaž Hrastnik
parent f0cd02d5ef
commit e90276df0b
1 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
helix-term/src/commands.rs
View File

@ -3494,47 +3494,48 @@ pub fn code_action(cx: &mut Context) {
move |editor: &mut Editor, move |editor: &mut Editor,
compositor: &mut Compositor, compositor: &mut Compositor,
response: Option<lsp::CodeActionResponse>| { response: Option<lsp::CodeActionResponse>| {
if let Some(actions) = response { let actions = match response {
if actions.is_empty() { Some(a) => a,
editor.set_status("No code actions available".to_owned()); None => return,
};
if actions.is_empty() {
editor.set_status("No code actions available".to_owned());
return;
}
let picker = ui::Menu::new(actions, move |editor, code_action, event| {
if event != PromptEvent::Validate {
return; return;
} }
let picker = ui::Menu::new(actions, move |editor, code_action, event| { // always present here
if event != PromptEvent::Validate { let code_action = code_action.unwrap();
return;
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);
}
// always present here // if code action provides both edit and command first the edit
let code_action = code_action.unwrap(); // should be applied and then the command
if let Some(command) = &code_action.command {
match code_action {
lsp::CodeActionOrCommand::Command(command) => {
log::debug!("code action command: {:?}", command);
execute_lsp_command(editor, command.clone()); 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);
}
// 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());
}
}
} }
}); }
let popup = });
Popup::new("code-action", picker).margin(helix_view::graphics::Margin { let popup = Popup::new("code-action", picker).margin(helix_view::graphics::Margin {
vertical: 1, vertical: 1,
horizontal: 1, horizontal: 1,
}); });
compositor.push(Box::new(popup)) compositor.push(Box::new(popup))
}
}, },
) )
} }