From f73a5fbc89c1e1255ae886b1dfe23329d7ad8713 Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Wed, 19 Jan 2022 17:10:14 -0500
Subject: refactor(lsp): reduce data stored in `StateSnapshot` (#13426)

---
 cli/lsp/config.rs | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'cli/lsp/config.rs')

diff --git a/cli/lsp/config.rs b/cli/lsp/config.rs
index 7be4135d2..89924a22a 100644
--- a/cli/lsp/config.rs
+++ b/cli/lsp/config.rs
@@ -194,7 +194,6 @@ impl WorkspaceSettings {
 #[derive(Debug, Clone, Default)]
 pub struct ConfigSnapshot {
   pub client_capabilities: ClientCapabilities,
-  pub root_uri: Option<Url>,
   pub settings: Settings,
   pub workspace_folders: Option<Vec<lsp::WorkspaceFolder>>,
 }
@@ -224,7 +223,6 @@ pub struct Settings {
 #[derive(Debug)]
 pub struct Config {
   pub client_capabilities: ClientCapabilities,
-  pub root_uri: Option<Url>,
   settings: Arc<RwLock<Settings>>,
   tx: mpsc::Sender<ConfigRequest>,
   pub workspace_folders: Option<Vec<WorkspaceFolder>>,
@@ -326,7 +324,6 @@ impl Config {
 
     Self {
       client_capabilities: ClientCapabilities::default(),
-      root_uri: None,
       settings,
       tx,
       workspace_folders: None,
@@ -345,15 +342,10 @@ impl Config {
     Ok(())
   }
 
-  pub fn snapshot(&self) -> Result<ConfigSnapshot, AnyError> {
-    Ok(ConfigSnapshot {
+  pub fn snapshot(&self) -> Arc<ConfigSnapshot> {
+    Arc::new(ConfigSnapshot {
       client_capabilities: self.client_capabilities.clone(),
-      root_uri: self.root_uri.clone(),
-      settings: self
-        .settings
-        .try_read()
-        .ok_or_else(|| anyhow!("Error reading settings."))?
-        .clone(),
+      settings: self.settings.read().clone(),
       workspace_folders: self.workspace_folders.clone(),
     })
   }
-- 
cgit v1.2.3