1 files changed, 6 insertions, 26 deletions

diff --git a/crates/ra_lsp_server/src/server_world.rs b/crates/ra_lsp_server/src/server_world.rs
index 7eb4d3e56..8c7951e13 100644
--- a/crates/ra_lsp_server/src/server_world.rs
+++ b/crates/ra_lsp_server/src/server_world.rs
@@ -1,7 +1,6 @@
 use std::{
     path::{Path, PathBuf},
     sync::Arc,
-    time::Duration,
 };
 
 use lsp_types::Url;
@@ -16,6 +15,7 @@ use failure::{Error, format_err};
 use gen_lsp_server::ErrorCode;
 
 use crate::{
+    main_loop::pending_requests::{CompletedRequest, LatestRequests},
     project_model::ProjectWorkspace,
     vfs_filter::IncludeRustFiles,
     Result,
@@ -29,26 +29,14 @@ pub struct ServerWorldState {
     pub workspaces: Arc<Vec<ProjectWorkspace>>,
     pub analysis_host: AnalysisHost,
     pub vfs: Arc<RwLock<Vfs>>,
-    // hand-rolling VecDeque here to print things in a nicer way
-    pub latest_completed_requests: Arc<RwLock<[CompletedRequest; N_COMPLETED_REQUESTS]>>,
-    pub request_idx: usize,
+    pub latest_requests: Arc<RwLock<LatestRequests>>,
 }
 
-const N_COMPLETED_REQUESTS: usize = 10;
-
 pub struct ServerWorld {
     pub workspaces: Arc<Vec<ProjectWorkspace>>,
     pub analysis: Analysis,
     pub vfs: Arc<RwLock<Vfs>>,
-    pub latest_completed_requests: Arc<RwLock<[CompletedRequest; N_COMPLETED_REQUESTS]>>,
-    pub request_idx: usize,
-}
-
-#[derive(Debug, Default)]
-pub struct CompletedRequest {
-    pub id: u64,
-    pub method: String,
-    pub duration: Duration,
+    pub latest_requests: Arc<RwLock<LatestRequests>>,
 }
 
 impl ServerWorldState {
@@ -88,8 +76,7 @@ impl ServerWorldState {
             workspaces: Arc::new(workspaces),
             analysis_host,
             vfs: Arc::new(RwLock::new(vfs)),
-            latest_completed_requests: Default::default(),
-            request_idx: 0,
+            latest_requests: Default::default(),
         }
     }
 
@@ -158,8 +145,7 @@ impl ServerWorldState {
             workspaces: Arc::clone(&self.workspaces),
             analysis: self.analysis_host.analysis(),
             vfs: Arc::clone(&self.vfs),
-            latest_completed_requests: Arc::clone(&self.latest_completed_requests),
-            request_idx: self.request_idx.checked_sub(1).unwrap_or(N_COMPLETED_REQUESTS - 1),
+            latest_requests: Arc::clone(&self.latest_requests),
         }
     }
 
@@ -172,13 +158,7 @@ impl ServerWorldState {
     }
 
     pub fn complete_request(&mut self, request: CompletedRequest) {
-        // special case: don't track status request itself
-        if request.method == "rust-analyzer/analyzerStatus" {
-            return;
-        }
-        let idx = self.request_idx;
-        self.latest_completed_requests.write()[idx] = request;
-        self.request_idx = (idx + 1) % N_COMPLETED_REQUESTS;
+        self.latest_requests.write().record(request)
     }
 }