From b56cfcca10994ec2bf1878f222afdb375459f8d3 Mon Sep 17 00:00:00 2001
From: Igor Aleksanov <popzxc@yandex.ru>
Date: Tue, 18 Aug 2020 13:32:29 +0300
Subject: Make disabled diagnostics an argument of corresponding function

---
 crates/ide/src/lib.rs | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'crates/ide/src/lib.rs')

diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index b762c994e..a19a379c6 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -151,16 +151,11 @@ impl<T> RangeInfo<T> {
 #[derive(Debug)]
 pub struct AnalysisHost {
     db: RootDatabase,
-    config: AnalysisConfig,
 }
 
 impl AnalysisHost {
     pub fn new(lru_capacity: Option<usize>) -> Self {
-        Self::with_config(lru_capacity, AnalysisConfig::default())
-    }
-
-    pub fn with_config(lru_capacity: Option<usize>, config: AnalysisConfig) -> Self {
-        AnalysisHost { db: RootDatabase::new(lru_capacity), config }
+        AnalysisHost { db: RootDatabase::new(lru_capacity) }
     }
 
     pub fn update_lru_capacity(&mut self, lru_capacity: Option<usize>) {
@@ -170,7 +165,7 @@ impl AnalysisHost {
     /// Returns a snapshot of the current state, which you can query for
     /// semantic information.
     pub fn analysis(&self) -> Analysis {
-        Analysis { db: self.db.snapshot(), config: self.config.clone() }
+        Analysis { db: self.db.snapshot() }
     }
 
     /// Applies changes to the current state of the world. If there are
@@ -214,7 +209,6 @@ impl Default for AnalysisHost {
 #[derive(Debug)]
 pub struct Analysis {
     db: salsa::Snapshot<RootDatabase>,
-    config: AnalysisConfig,
 }
 
 // As a general design guideline, `Analysis` API are intended to be independent
@@ -509,8 +503,11 @@ impl Analysis {
         &self,
         file_id: FileId,
         enable_experimental: bool,
+        disabled_diagnostics: Option<HashSet<String>>,
     ) -> Cancelable<Vec<Diagnostic>> {
-        self.with_db(|db| diagnostics::diagnostics(db, file_id, enable_experimental, &self.config))
+        self.with_db(|db| {
+            diagnostics::diagnostics(db, file_id, enable_experimental, disabled_diagnostics)
+        })
     }
 
     /// Returns the edit required to rename reference at the position to the new
@@ -539,11 +536,6 @@ impl Analysis {
         })
     }
 
-    /// Sets the provided config.
-    pub fn set_config(&mut self, config: AnalysisConfig) {
-        self.config = config;
-    }
-
     /// Performs an operation on that may be Canceled.
     fn with_db<F, T>(&self, f: F) -> Cancelable<T>
     where
-- 
cgit v1.2.3


From 34847c8d96ddf98c40117ebacaecec38b9b758fc Mon Sep 17 00:00:00 2001
From: Igor Aleksanov <popzxc@yandex.ru>
Date: Tue, 18 Aug 2020 13:35:36 +0300
Subject: Move analysis config structure to the config.rs

---
 crates/ide/src/lib.rs | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'crates/ide/src/lib.rs')

diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index a19a379c6..4b797f374 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -99,12 +99,6 @@ pub use text_edit::{Indel, TextEdit};
 
 pub type Cancelable<T> = Result<T, Canceled>;
 
-/// Configuration parameters for the analysis run.
-#[derive(Debug, Default, Clone)]
-pub struct AnalysisConfig {
-    pub disabled_diagnostics: HashSet<String>,
-}
-
 #[derive(Debug)]
 pub struct Diagnostic {
     pub name: Option<String>,
-- 
cgit v1.2.3