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

vscode moves cursor

Browse Source
This commit is contained in:
Aleksey Kladov
2018-08-16 13:46:31 +03:00
parent eda52cbc34
commit e0a43a159d
5 changed files with 52 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
crates/server/src/main_loop/mod.rs
View File

@@ -171,21 +171,29 @@ fn on_request(
let path_map = path_map.clone();
let sender = sender.clone();
pool.execute(move || {
let task = match handle_execute_command(world, path_map, params) {
Ok(req) => match to_value(req) {
Err(e) => Task::Die(e.into()),
Ok(params) => {
let request = RawRequest {
id: 0,
method: <req::ApplyWorkspaceEdit as req::ClientRequest>::METHOD.to_string(),
params,
};
Task::Request(request)
}
},
Err(e) => Task::Die(e),
let (edit, cursor) = match handle_execute_command(world, path_map, params) {
Ok(res) => res,
Err(e) => return sender.send(Task::Die(e)),
};
sender.send(task)
match to_value(edit) {
Err(e) => return sender.send(Task::Die(e.into())),
Ok(params) => {
let request = RawRequest {
id: 0,
method: <req::ApplyWorkspaceEdit as req::ClientRequest>::METHOD.to_string(),
params,
};
sender.send(Task::Request(request))
}
}
if let Some(cursor) = cursor {
let request = RawRequest {
id: 0,
method: <req::MoveCursor as req::ClientRequest>::METHOD.to_string(),
params: to_value(cursor).unwrap(),
};
sender.send(Task::Request(request))
}
});
Ok(())
})?;