Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 05:38:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify

Browse source
This commit is contained in:
Aleksey Kladov 2018-08-12 21:47:27 +03:00
parent 58c3370819
commit acd7552698
1 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
crates/server/src/main.rs
View file

@ -78,6 +78,11 @@ fn main_inner() -> Result<()> {
fn initialize(io: &mut Io) -> Result<()> { fn initialize(io: &mut Io) -> Result<()> {
loop { loop {
match io.recv()? { match io.recv()? {
RawMsg::Notification(n) =>
bail!("expected initialize request, got {:?}", n),
RawMsg::Response(res) =>
bail!("expected initialize request, got {:?}", res),
RawMsg::Request(req) => { RawMsg::Request(req) => {
let mut req = Some(req); let mut req = Some(req);
dispatch::handle_request::<req::Initialize, _>(&mut req, |_params, resp| { dispatch::handle_request::<req::Initialize, _>(&mut req, |_params, resp| {
@ -86,33 +91,22 @@ fn initialize(io: &mut Io) -> Result<()> {
io.send(RawMsg::Response(resp)); io.send(RawMsg::Response(resp));
Ok(()) Ok(())
})?; })?;
match req { if let Some(req) = req {
None => { bail!("expected initialize request, got {:?}", req)
match io.recv()? {
RawMsg::Notification(n) => {
if n.method != "initialized" {
bail!("expected initialized notification");
}
}
_ => {
bail!("expected initialized notification");
}
}
return initialized(io);
}
Some(req) => {
bail!("expected initialize request, got {:?}", req)
}
} }
} match io.recv()? {
RawMsg::Notification(n) => { RawMsg::Notification(n) => {
bail!("expected initialize request, got {:?}", n) if n.method != "initialized" {
} bail!("expected initialized notification");
RawMsg::Response(res) => { }
bail!("expected initialize request, got {:?}", res) }
_ => bail!("expected initialized notification"),
}
break;
} }
} }
} }
initialized(io)
} }
enum Task { enum Task {