rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

New lsp-types to fix versioning

Browse Source 
Fixes #6603
This commit is contained in:
kjeremy
2020-11-24 08:52:24 -05:00
parent 2d2615db15
commit e981485b76
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
crates/rust-analyzer/src/to_proto.rs
View File

@@ -629,12 +629,21 @@ pub(crate) fn resource_op(
match file_system_edit {
FileSystemEdit::CreateFile { anchor, dst } => {
let uri = snap.anchored_path(anchor, &dst);
lsp_types::ResourceOp::Create(lsp_types::CreateFile { uri, options: None })
lsp_types::ResourceOp::Create(lsp_types::CreateFile {
uri,
options: None,
annotation: None,
})
}
FileSystemEdit::MoveFile { src, anchor, dst } => {
let old_uri = snap.file_id_to_url(src);
let new_uri = snap.anchored_path(anchor, &dst);
lsp_types::ResourceOp::Rename(lsp_types::RenameFile { old_uri, new_uri, options: None })
lsp_types::ResourceOp::Rename(lsp_types::RenameFile {
old_uri,
new_uri,
options: None,
annotation: None,
})
}
}
}
@@ -684,9 +693,11 @@ impl From<lsp_ext::SnippetWorkspaceEdit> for lsp_types::WorkspaceEdit {
edits: edit
.edits
.into_iter()
.map(|edit| lsp_types::TextEdit {
range: edit.range,
new_text: edit.new_text,
.map(|edit| {
lsp_types::OneOf::Left(lsp_types::TextEdit {
range: edit.range,
new_text: edit.new_text,
})
})
.collect(),
},