diff --git a/crates/activity_indicator/src/activity_indicator.rs b/crates/activity_indicator/src/activity_indicator.rs index a8874e8d9e89f42f03f3f47d493a773dd4619f7b..9172b84f3c2cec4111777f8e1e974ea2a6d8f8a7 100644 --- a/crates/activity_indicator/src/activity_indicator.rs +++ b/crates/activity_indicator/src/activity_indicator.rs @@ -203,14 +203,12 @@ impl ActivityIndicator { } // Show any language server installation info. - let mut validating = SmallVec::<[_; 3]>::new(); let mut downloading = SmallVec::<[_; 3]>::new(); let mut checking_for_update = SmallVec::<[_; 3]>::new(); let mut failed = SmallVec::<[_; 3]>::new(); for status in &self.statuses { let name = status.name.clone(); match status.status { - LanguageServerBinaryStatus::Validating => validating.push(name), LanguageServerBinaryStatus::CheckingForUpdate => checking_for_update.push(name), LanguageServerBinaryStatus::Downloading => downloading.push(name), LanguageServerBinaryStatus::Failed { .. } => failed.push(name), @@ -242,7 +240,7 @@ impl ActivityIndicator { ), on_click: None, }; - } else if !failed.is_empty() || !validating.is_empty() { + } else if !failed.is_empty() { return Content { icon: Some(WARNING_ICON), message: format!( diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs index e0ff6254445150ca93d88bb14f0a2bcfaaa5624d..9e3d3708ba7bc37ab81584cc68f3b19713bb0589 100644 --- a/crates/language/src/language.rs +++ b/crates/language/src/language.rs @@ -536,7 +536,6 @@ struct BracketConfig { #[derive(Clone)] pub enum LanguageServerBinaryStatus { - Validating, CheckingForUpdate, Downloading, Downloaded, diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs index 60fd95e007d799fcdbb077b8f85ee77ae096abb6..a33a47779c24f27deff5e72645202e0df5831fa0 100644 --- a/crates/project/src/project.rs +++ b/crates/project/src/project.rs @@ -280,8 +280,6 @@ pub enum Event { } pub enum LanguageServerState { - Validating(Task>>), - Starting(Task>>), Running { @@ -2485,7 +2483,7 @@ impl Project { .await; this.update(&mut cx, |_, cx| { - Self::check_errored_server_id( + Self::check_errored_server( language, adapter, server_id, @@ -2935,7 +2933,6 @@ impl Project { let mut root_path = None; let server = match server_state { - Some(LanguageServerState::Validating(task)) => task.await, Some(LanguageServerState::Starting(task)) => task.await, Some(LanguageServerState::Running { server, .. }) => Some(server), None => None, @@ -3047,7 +3044,7 @@ impl Project { .detach(); } - fn check_errored_server_id( + fn check_errored_server( language: Arc, adapter: Arc, server_id: LanguageServerId, @@ -7391,7 +7388,7 @@ impl Entity for Project { use LanguageServerState::*; match server_state { Running { server, .. } => server.shutdown()?.await, - Starting(task) | Validating(task) => task.await?.shutdown()?.await, + Starting(task) => task.await?.shutdown()?.await, } }) .collect::>();