aboutsummaryrefslogtreecommitdiff
path: root/helix-term
diff options
context:
space:
mode:
authorsigmaSd2023-07-21 19:50:08 +0000
committerGitHub2023-07-21 19:50:08 +0000
commit8977123f25baba838d2d16f8a40e78563c4ebf4a (patch)
tree8f8b7187e817ca7175d194249cd77dd88ec7684e /helix-term
parentd52b790379ffc5646409a9972e0a4e70bcc8a981 (diff)
feat: resolve code action (#7677)
Diffstat (limited to 'helix-term')
-rw-r--r--helix-term/src/commands/lsp.rs15
1 files changed, 14 insertions, 1 deletions
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs
index 145bddd0..1f592118 100644
--- a/helix-term/src/commands/lsp.rs
+++ b/helix-term/src/commands/lsp.rs
@@ -743,7 +743,20 @@ pub fn code_action(cx: &mut Context) {
}
lsp::CodeActionOrCommand::CodeAction(code_action) => {
log::debug!("code action: {:?}", code_action);
- if let Some(ref workspace_edit) = code_action.edit {
+ // 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 Ok(response) = helix_lsp::block_on(future) {
+ 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);
+
+ if let Some(ref workspace_edit) = resolved_code_action.edit {
log::debug!("edit: {:?}", workspace_edit);
let _ = apply_workspace_edit(editor, offset_encoding, workspace_edit);
}