diff options
Diffstat (limited to 'helix-term/src')
| -rw-r--r-- | helix-term/src/commands/lsp.rs | 20 | ||||
| -rw-r--r-- | helix-term/src/commands/typed.rs | 5 | ||||
| -rw-r--r-- | helix-term/src/ui/completion.rs | 16 | ||||
| -rw-r--r-- | helix-term/src/ui/picker.rs | 11 |
4 files changed, 36 insertions, 16 deletions
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs index 1f592118..17f936cd 100644 --- a/helix-term/src/commands/lsp.rs +++ b/helix-term/src/commands/lsp.rs @@ -730,7 +730,8 @@ pub fn code_action(cx: &mut Context) { // always present here let action = action.unwrap(); - let Some(language_server) = editor.language_server_by_id(action.language_server_id) else { + let Some(language_server) = editor.language_server_by_id(action.language_server_id) + else { editor.set_error("Language Server disappeared"); return; }; @@ -746,15 +747,20 @@ pub fn code_action(cx: &mut Context) { // we support lsp "codeAction/resolve" for `edit` and `command` fields let mut resolved_code_action = None; if code_action.edit.is_none() || code_action.command.is_none() { - if let Some(future) = language_server.resolve_code_action(code_action.clone()) { + if let Some(future) = + language_server.resolve_code_action(code_action.clone()) + { if let Ok(response) = helix_lsp::block_on(future) { - if let Ok(code_action) = serde_json::from_value::<CodeAction>(response) { + if let Ok(code_action) = + serde_json::from_value::<CodeAction>(response) + { resolved_code_action = Some(code_action); } } } } - let resolved_code_action = resolved_code_action.as_ref().unwrap_or(code_action); + let resolved_code_action = + resolved_code_action.as_ref().unwrap_or(code_action); if let Some(ref workspace_edit) = resolved_code_action.edit { log::debug!("edit: {:?}", workspace_edit); @@ -1186,7 +1192,8 @@ pub fn signature_help_impl(cx: &mut Context, invoked: SignatureHelpInvoked) { // Do not show the message if signature help was invoked // automatically on backspace, trigger characters, etc. if invoked == SignatureHelpInvoked::Manual { - cx.editor.set_error("No configured language server supports signature-help"); + cx.editor + .set_error("No configured language server supports signature-help"); } return; }; @@ -1411,7 +1418,8 @@ pub fn rename_symbol(cx: &mut Context) { .language_servers_with_feature(LanguageServerFeature::RenameSymbol) .find(|ls| language_server_id.map_or(true, |id| id == ls.id())) else { - cx.editor.set_error("No configured language server supports symbol renaming"); + cx.editor + .set_error("No configured language server supports symbol renaming"); return; }; diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs index 063658c6..175f8bc6 100644 --- a/helix-term/src/commands/typed.rs +++ b/helix-term/src/commands/typed.rs @@ -1385,9 +1385,8 @@ fn lsp_workspace_command( .map(|options| (ls.id(), options)) }) else { - cx.editor.set_status( - "No active language servers for this document support workspace commands", - ); + cx.editor + .set_status("No active language servers for this document support workspace commands"); return Ok(()); }; diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs index c7f9250d..e0614722 100644 --- a/helix-term/src/ui/completion.rs +++ b/helix-term/src/ui/completion.rs @@ -144,7 +144,9 @@ impl Completion { } }; - let Some(range) = util::lsp_range_to_range(doc.text(), edit.range, offset_encoding) else{ + let Some(range) = + util::lsp_range_to_range(doc.text(), edit.range, offset_encoding) + else { return Transaction::new(doc.text()); }; @@ -413,10 +415,18 @@ impl Completion { _ => return false, }; - let Some(language_server) = cx.editor.language_server_by_id(current_item.language_server_id) else { return false; }; + let Some(language_server) = cx + .editor + .language_server_by_id(current_item.language_server_id) + else { + return false; + }; // This method should not block the compositor so we handle the response asynchronously. - let Some(future) = language_server.resolve_completion_item(current_item.item.clone()) else { return false; }; + let Some(future) = language_server.resolve_completion_item(current_item.item.clone()) + else { + return false; + }; cx.callback( future, diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs index 4605e2f1..f80bc512 100644 --- a/helix-term/src/ui/picker.rs +++ b/helix-term/src/ui/picker.rs @@ -432,7 +432,7 @@ impl<T: Item + 'static> Picker<T> { fn handle_idle_timeout(&mut self, cx: &mut Context) -> EventResult { let Some((current_file, _)) = self.current_file(cx.editor) else { - return EventResult::Consumed(None) + return EventResult::Consumed(None); }; // Try to find a document in the cache @@ -459,11 +459,14 @@ impl<T: Item + 'static> Picker<T> { let callback = move |editor: &mut Editor, compositor: &mut Compositor| { let Some(syntax) = syntax else { log::info!("highlighting picker item failed"); - return + return; }; - let Some(Overlay { content: picker, .. }) = compositor.find::<Overlay<Self>>() else { + let Some(Overlay { + content: picker, .. + }) = compositor.find::<Overlay<Self>>() + else { log::info!("picker closed before syntax highlighting finished"); - return + return; }; // Try to find a document in the cache let doc = match current_file { |