language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 22:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

edits use source-root API

Browse source
This commit is contained in:
Aleksey Kladov 2018-12-21 12:18:14 +03:00
parent 0063f03e86
commit b5b44659a4
4 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/ra_lsp_server/src/conv.rs
View file

@ -283,16 +283,17 @@ impl TryConvWith for FileSystemEdit {
type Output = req::FileSystemEdit;
fn try_conv_with(self, world: &ServerWorld) -> Result<req::FileSystemEdit> {
let res = match self {
FileSystemEdit::CreateFile { anchor, path } => {
let uri = world.file_id_to_uri(anchor)?;
let path = &path.as_str()[3..]; // strip `../` b/c url is weird
let uri = uri.join(path)?;
FileSystemEdit::CreateFile { source_root, path } => {
let uri = world.path_to_uri(source_root, &path)?;
req::FileSystemEdit::CreateFile { uri }
}
FileSystemEdit::MoveFile { file, path } => {
let src = world.file_id_to_uri(file)?;
let path = &path.as_str()[3..]; // strip `../` b/c url is weird
let dst = src.join(path)?;
FileSystemEdit::MoveFile {
src,
dst_source_root,
dst_path,
} => {
let src = world.file_id_to_uri(src)?;
let dst = world.path_to_uri(dst_source_root, &dst_path)?;
req::FileSystemEdit::MoveFile { src, dst }
}
};