mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coalesce prime_caches updates

Browse Source
This commit is contained in:
Jonas Schievink 2020-11-02 17:06:49 +01:00
parent cb04f0c019
commit 6e8ddac165
1 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,15 +190,35 @@ impl GlobalState {
} }
lsp_server::Message::Response(resp) => self.complete_request(resp), lsp_server::Message::Response(resp) => self.complete_request(resp),
}, },
Event::Task(task) => match task { Event::Task(mut task) => {
Task::Response(response) => self.respond(response), let _p = profile::span("GlobalState::handle_event/task");
Task::Diagnostics(diagnostics_per_file) => { let mut prime_caches_started = false;
for (file_id, diagnostics) in diagnostics_per_file { let mut prime_caches_progress = None;
self.diagnostics.set_native_diagnostics(file_id, diagnostics) loop {
match task {
Task::Response(response) => self.respond(response),
Task::Diagnostics(diagnostics_per_file) => {
for (file_id, diagnostics) in diagnostics_per_file {
self.diagnostics.set_native_diagnostics(file_id, diagnostics)
}
}
Task::Workspaces(workspaces) => self.switch_workspaces(workspaces),
Task::PrimeCaches(progress) => {
if let PrimeCachesProgress::Started = progress {
prime_caches_started = true;
}
prime_caches_progress = Some(progress);
}
} }
// Coalesce multiple task events into one loop turn
task = match self.task_pool.receiver.try_recv() {
Ok(task) => task,
Err(_) => break,
};
} }
Task::Workspaces(workspaces) => self.switch_workspaces(workspaces),
Task::PrimeCaches(progress) => { if let Some(progress) = prime_caches_progress {
let (state, message, fraction); let (state, message, fraction);
match progress { match progress {
PrimeCachesProgress::Started => { PrimeCachesProgress::Started => {
@ -218,9 +238,15 @@ impl GlobalState {
} }
}; };
self.report_progress("indexing", state, message, Some(fraction)); if state != Progress::Begin && prime_caches_started {
// Progress indicator needs to be created first.
self.report_progress("indexing", Progress::Begin, None, Some(0.0));
}
self.report_progress("indexing", state, message.clone(), Some(fraction));
eprintln!("progress reported: {:?}", message);
} }
}, }
Event::Vfs(mut task) => { Event::Vfs(mut task) => {
let _p = profile::span("GlobalState::handle_event/vfs"); let _p = profile::span("GlobalState::handle_event/vfs");
loop { loop {