Migrate flycheck to fully-lsp-compatible progress reports (introduce ra_progress crate)

2 files changed, 12 insertions, 4 deletions

diff --git a/crates/ra_ide/src/lib.rs b/crates/ra_ide/src/lib.rs
index 51dc1f041..6704467d9 100644
--- a/crates/ra_ide/src/lib.rs
+++ b/crates/ra_ide/src/lib.rs
@@ -241,8 +241,11 @@ impl Analysis {
         self.with_db(|db| status::status(&*db))
     }
 
-    pub fn prime_caches(&self, files: Vec<FileId>) -> Cancelable<()> {
-        self.with_db(|db| prime_caches::prime_caches(db, files))
+    pub fn prime_caches<P>(&self, files: Vec<FileId>, report_progress: P) -> Cancelable<()>
+    where
+        P: FnMut(usize) + std::panic::UnwindSafe,
+    {
+        self.with_db(|db| prime_caches::prime_caches(db, files, report_progress))
     }
 
     /// Gets the text of the source file.
diff --git a/crates/ra_ide/src/prime_caches.rs b/crates/ra_ide/src/prime_caches.rs
index c5ab5a1d8..f60595989 100644
--- a/crates/ra_ide/src/prime_caches.rs
+++ b/crates/ra_ide/src/prime_caches.rs
@@ -5,8 +5,13 @@
 
 use crate::{FileId, RootDatabase};
 
-pub(crate) fn prime_caches(db: &RootDatabase, files: Vec<FileId>) {
-    for file in files {
+pub(crate) fn prime_caches(
+    db: &RootDatabase,
+    files: Vec<FileId>,
+    mut report_progress: impl FnMut(usize),
+) {
+    for (i, file) in files.into_iter().enumerate() {
         let _ = crate::syntax_highlighting::highlight(db, file, None, false);
+        report_progress(i);
     }
 }