From e3db4f3716cb67f75d818207b7698cf3464aad57 Mon Sep 17 00:00:00 2001
From: Steffen Lyngbaek <steffenlyngbaek@gmail.com>
Date: Sun, 15 Mar 2020 20:48:39 -0700
Subject: Rely on the safer workspace_loaded check

---
 crates/rust-analyzer/src/main_loop.rs | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index c38a25a44..7e00d58ec 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -426,6 +426,12 @@ fn loop_turn(
         });
     }
 
+    if !loop_state.workspace_loaded
+        && world_state.feature_flags.get("notifications.workspace-loaded")
+    {
+        send_startup_progress(&connection.sender, loop_state, world_state);
+    }
+
     if !loop_state.workspace_loaded
         && world_state.roots_to_scan == 0
         && loop_state.pending_libraries.is_empty()
@@ -439,7 +445,6 @@ fn loop_turn(
             move || snap.analysis().prime_caches(subs).unwrap_or_else(|_: Canceled| ())
         });
     }
-    send_startup_progress(&connection.sender, loop_state, world_state);
 
     if state_changed {
         update_file_notifications_on_threadpool(
@@ -708,9 +713,6 @@ fn send_startup_progress(
     loop_state: &mut LoopState,
     world_state: &WorldState,
 ) {
-    if !world_state.feature_flags.get("notifications.workspace-loaded") {
-        return;
-    }
     let total: usize = world_state.workspaces.iter().map(|it| it.n_packages()).sum();
     let progress = total - world_state.roots_to_scan;
     if loop_state.roots_scanned_progress == Some(progress) {
@@ -718,8 +720,8 @@ fn send_startup_progress(
     }
     loop_state.roots_scanned_progress = Some(progress);
 
-    match (progress, loop_state.workspace_loaded) {
-        (0, false) => {
+    match progress {
+        0 => {
             let work_done_progress_create = request_new::<req::WorkDoneProgressCreate>(
                 loop_state.next_request_id(),
                 WorkDoneProgressCreateParams {
@@ -737,7 +739,13 @@ fn send_startup_progress(
                 }),
             );
         }
-        (_, false) => send_startup_progress_notif(
+        progress if progress == total => send_startup_progress_notif(
+            sender,
+            WorkDoneProgress::End(WorkDoneProgressEnd {
+                message: Some(format!("rust-analyzer loaded, {} packages", progress)),
+            }),
+        ),
+        progress => send_startup_progress_notif(
             sender,
             WorkDoneProgress::Report(WorkDoneProgressReport {
                 cancellable: None,
@@ -745,12 +753,6 @@ fn send_startup_progress(
                 percentage: Some(100.0 * progress as f64 / total as f64),
             }),
         ),
-        (_, true) => send_startup_progress_notif(
-            sender,
-            WorkDoneProgress::End(WorkDoneProgressEnd {
-                message: Some(format!("rust-analyzer loaded, {} packages", progress)),
-            }),
-        ),
     }
 }
 
-- 
cgit v1.2.3