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

Flatten Task enum ¯\_(ツ)_/¯

Browse Source
This commit is contained in:
Veetaha
2020-06-18 15:02:36 +03:00
parent 76c1160ffa
commit 6e81c9a921
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/rust-analyzer/src/main_loop.rs
View File

@@ -243,7 +243,8 @@ pub fn main_loop(config: Config, connection: Connection) -> Result<()> {
#[derive(Debug)] #[derive(Debug)]
enum Task { enum Task {
Respond(Response), Respond(Response),
SendMessage(Message), Notify(Notification),
SendRequest(Request),
Diagnostic(DiagnosticTask), Diagnostic(DiagnosticTask),
} }
@@ -275,7 +276,7 @@ impl fmt::Debug for Event {
return debug_verbose_not(not, f); return debug_verbose_not(not, f);
} }
} }
Event::Task(Task::SendMessage(Message::Notification(not))) => { Event::Task(Task::Notify(not)) => {
if notification_is::<lsp_types::notification::PublishDiagnostics>(not) { if notification_is::<lsp_types::notification::PublishDiagnostics>(not) {
return debug_verbose_not(not, f); return debug_verbose_not(not, f);
} }
@@ -463,7 +464,7 @@ fn on_progress_report(
token: lsp_types::ProgressToken::String(token.to_string()), token: lsp_types::ProgressToken::String(token.to_string()),
}, },
); );
task_sender.send(Task::SendMessage(create_progress_req.into())).unwrap(); task_sender.send(Task::SendRequest(create_progress_req.into())).unwrap();
}; };
let (token, progress) = match report { let (token, progress) = match report {
@@ -526,7 +527,7 @@ fn on_progress_report(
value: lsp_types::ProgressParamsValue::WorkDone(progress), value: lsp_types::ProgressParamsValue::WorkDone(progress),
}; };
let not = notification_new::<lsp_types::notification::Progress>(params); let not = notification_new::<lsp_types::notification::Progress>(params);
task_sender.send(Task::SendMessage(not.into())).unwrap() task_sender.send(Task::Notify(not.into())).unwrap()
} }
fn on_task( fn on_task(
@@ -543,7 +544,8 @@ fn on_task(
msg_sender.send(response.into()).unwrap(); msg_sender.send(response.into()).unwrap();
} }
} }
Task::SendMessage(msg) => msg_sender.send(msg).unwrap(), Task::Notify(not) => msg_sender.send(not.into()).unwrap(),
Task::SendRequest(req) => msg_sender.send(req.into()).unwrap(),
Task::Diagnostic(task) => on_diagnostic_task(task, msg_sender, state), Task::Diagnostic(task) => on_diagnostic_task(task, msg_sender, state),
} }
} }