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

Merge #6445

Browse Source 
6445: Fix coalescing of prime_caches updates r=jonas-schievink a=jonas-schievink

The previous implementation could try to create a progress bar when one
was already registered.

bors r+ 🤖 

Co-authored-by: Jonas Schievink <jonas.schievink@ferrous-systems.com>
This commit is contained in:
bors[bot] 2020-11-02 17:54:01 +00:00 committed by GitHub
commit 245e1b533b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,8 +192,7 @@ impl GlobalState {
},
Event::Task(mut task) => {
let _p = profile::span("GlobalState::handle_event/task");
let mut prime_caches_started = false;
let mut prime_caches_progress = None;
let mut prime_caches_progress = Vec::new();
loop {
match task {
Task::Response(response) => self.respond(response),
@ -203,13 +202,19 @@ impl GlobalState {
}
}
Task::Workspaces(workspaces) => self.switch_workspaces(workspaces),
Task::PrimeCaches(progress) => {
if let PrimeCachesProgress::Started = progress {
prime_caches_started = true;
Task::PrimeCaches(progress) => match progress {
PrimeCachesProgress::Started => prime_caches_progress.push(progress),
PrimeCachesProgress::StartedOnCrate { .. } => {
match prime_caches_progress.last_mut() {
Some(last @ PrimeCachesProgress::StartedOnCrate { .. }) => {
// Coalesce subsequent update events.
*last = progress;
}
_ => prime_caches_progress.push(progress),
}
}
prime_caches_progress = Some(progress);
}
PrimeCachesProgress::Finished => prime_caches_progress.push(progress),
},
}
// Coalesce multiple task events into one loop turn
task = match self.task_pool.receiver.try_recv() {
@ -218,7 +223,7 @@ impl GlobalState {
};
}
if let Some(progress) = prime_caches_progress {
for progress in prime_caches_progress {
let (state, message, fraction);
match progress {
PrimeCachesProgress::Started => {
@ -238,11 +243,6 @@ impl GlobalState {
}
};
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, Some(fraction));
}
}