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

LSP: Use negotiated position encoding for workspace edits (#7469) 

Previously this was hard-coded to UTF-8 but we might have negotiated
another position encoding.
pull/7488/head
Michael Davis 2023-06-29 10:24:13 -05:00 committed by GitHub
parent d3f8e0592b
commit 4fab60030f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
helix-term/src/application.rs
View File

@ -1047,9 +1047,12 @@ impl Application {
Ok(serde_json::Value::Null) Ok(serde_json::Value::Null)
} }
Ok(MethodCall::ApplyWorkspaceEdit(params)) => { Ok(MethodCall::ApplyWorkspaceEdit(params)) => {
let language_server = language_server!();
if language_server.is_initialized() {
let offset_encoding = language_server.offset_encoding();
let res = apply_workspace_edit( let res = apply_workspace_edit(
&mut self.editor, &mut self.editor,
helix_lsp::OffsetEncoding::Utf8, offset_encoding,
&params.edit, &params.edit,
); );
@ -1061,6 +1064,14 @@ impl Application {
.err() .err()
.map(|err| err.failed_change_idx as u32), .map(|err| err.failed_change_idx as u32),
})) }))
} else {
Err(helix_lsp::jsonrpc::Error {
code: helix_lsp::jsonrpc::ErrorCode::InvalidRequest,
message: "Server must be initialized to request workspace edits"
.to_string(),
data: None,
})
}
} }
Ok(MethodCall::WorkspaceFolders) => { Ok(MethodCall::WorkspaceFolders) => {
Ok(json!(&*language_server!().workspace_folders().await)) Ok(json!(&*language_server!().workspace_folders().await))