TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

chore(lsp): check rename capabilities before send rename action (#2203)

Browse source
This commit is contained in:
ttys3 2022-04-23 16:09:16 +08:00 • committed by GitHub
parent c1d3d49f3f
commit 19d042dde6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
helix-lsp/src/client.rs
View file

@ -3,6 +3,7 @@ use crate::{
Call, Error, OffsetEncoding, Result,
};
use anyhow::anyhow;
use helix_core::{find_root, ChangeSet, Rope};
use jsonrpc_core as jsonrpc;
use lsp_types as lsp;
@ -861,6 +862,19 @@ impl Client {
position: lsp::Position,
new_name: String,
) -> anyhow::Result<lsp::WorkspaceEdit> {
let capabilities = self.capabilities.get().unwrap();
// check if we're able to rename
match capabilities.rename_provider {
Some(lsp::OneOf::Left(true)) | Some(lsp::OneOf::Right(_)) => (),
// None | Some(false)
_ => {
let err = "The server does not support rename";
log::warn!("rename_symbol failed: {}", err);
return Err(anyhow!(err));
}
};
let params = lsp::RenameParams {
text_document_position: lsp::TextDocumentPositionParams {
text_document,

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

@ -674,8 +674,10 @@ pub fn rename_symbol(cx: &mut Context) {
let pos = doc.position(view.id, offset_encoding);
let task = language_server.rename_symbol(doc.identifier(), pos, input.to_string());
let edits = block_on(task).unwrap_or_default();
apply_workspace_edit(cx.editor, offset_encoding, &edits);
match block_on(task) {
Ok(edits) => apply_workspace_edit(cx.editor, offset_encoding, &edits),
Err(err) => cx.editor.set_error(err.to_string()),
}
},
);
}