progress

Author: psteinroe

crates/pgt_workspace/src/settings.rs

@@ -12,18 +12,18 @@ use tracing::trace;
 
 use ignore::gitignore::{Gitignore, GitignoreBuilder};
 use pgt_configuration::{
-    ConfigurationDiagnostic, LinterConfiguration, PartialConfiguration,
     database::PartialDatabaseConfiguration,
     diagnostics::InvalidIgnorePattern,
     files::FilesConfiguration,
     migrations::{MigrationsConfiguration, PartialMigrationsConfiguration},
+    ConfigurationDiagnostic, LinterConfiguration, PartialConfiguration,
 };
-use pgt_fs::{FileSystem, PgTPath};
+use pgt_fs::PgTPath;
 
 use crate::{
-    DynRef, WorkspaceError,
     matcher::Matcher,
     workspace::{ProjectKey, WorkspaceData},
+    WorkspaceError,
 };
 
 #[derive(Debug, Default)]
@@ -49,6 +49,16 @@ impl WorkspaceSettings {
         self.current_project
     }
 
+    pub fn get_current_project_path(&self) -> Option<&PgTPath> {
+        trace!("Current key {:?}", self.current_project);
+        let data = self.data.get(self.current_project);
+        if let Some(data) = data {
+            Some(&data.path)
+        } else {
+            None
+        }
+    }
+
     pub fn get_current_project_data_mut(&mut self) -> &mut ProjectData {
         self.data
             .get_mut(self.current_project)
@@ -123,7 +133,8 @@ impl WorkspaceSettings {
         for (key, path_to_settings) in iter {
             trace!(
                 "Workspace path {:?}, file path {:?}",
-                path_to_settings.path, path
+                path_to_settings.path,
+                path
             );
             trace!("Iter key: {:?}", key);
             if key == self.current_project {
@@ -145,6 +156,51 @@ impl WorkspaceSettings {
     }
 }
 
+#[derive(Debug)]
+pub struct WorkspaceSettingsHandle<'a> {
+    inner: RwLockReadGuard<'a, WorkspaceSettings>,
+}
+
+impl<'a> WorkspaceSettingsHandle<'a> {
+    pub(crate) fn new(settings: &'a RwLock<WorkspaceSettings>) -> Self {
+        Self {
+            inner: settings.read().unwrap(),
+        }
+    }
+
+    pub(crate) fn settings(&self) -> Option<&Settings> {
+        self.inner.get_current_settings()
+    }
+
+    pub(crate) fn path(&self) -> Option<&PgTPath> {
+        self.inner.get_current_project_path()
+    }
+}
+
+impl<'a> AsRef<WorkspaceSettings> for WorkspaceSettingsHandle<'a> {
+    fn as_ref(&self) -> &WorkspaceSettings {
+        &self.inner
+    }
+}
+
+pub struct WorkspaceSettingsHandleMut<'a> {
+    inner: RwLockWriteGuard<'a, WorkspaceSettings>,
+}
+
+impl<'a> WorkspaceSettingsHandleMut<'a> {
+    pub(crate) fn new(settings: &'a RwLock<WorkspaceSettings>) -> Self {
+        Self {
+            inner: settings.write().unwrap(),
+        }
+    }
+}
+
+impl<'a> AsMut<WorkspaceSettings> for WorkspaceSettingsHandleMut<'a> {
+    fn as_mut(&mut self) -> &mut WorkspaceSettings {
+        &mut self.inner
+    }
+}
+
 /// Global settings for the entire workspace
 #[derive(Debug, Default)]
 pub struct Settings {

crates/pgt_workspace/src/workspace.rs

@@ -6,24 +6,24 @@ use pgt_configuration::{PartialConfiguration, RuleSelector};
 use pgt_fs::PgTPath;
 use pgt_text_size::TextRange;
 use serde::{Deserialize, Serialize};
-use slotmap::{DenseSlotMap, new_key_type};
+use slotmap::{new_key_type, DenseSlotMap};
 
 use crate::{
-    WorkspaceError,
     features::{
         code_actions::{
             CodeActionsParams, CodeActionsResult, ExecuteStatementParams, ExecuteStatementResult,
         },
         completions::{CompletionsResult, GetCompletionsParams},
         diagnostics::{PullDiagnosticsParams, PullDiagnosticsResult},
     },
+    WorkspaceError,
 };
 
 mod client;
 mod server;
 
-pub use server::StatementId;
 pub(crate) use server::parsed_document::*;
+pub use server::StatementId;
 
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
 #[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
@@ -93,6 +93,21 @@ pub struct ServerInfo {
     pub version: Option<String>,
 }
 
+#[derive(Debug, serde::Serialize, serde::Deserialize)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct RegisterProjectFolderParams {
+    pub path: Option<PathBuf>,
+    pub set_as_current_workspace: bool,
+}
+
+#[derive(Debug, serde::Serialize, serde::Deserialize)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[serde(rename_all = "camelCase")]
+pub struct UnregisterProjectFolderParams {
+    pub path: PgTPath,
+}
+
 pub trait Workspace: Send + Sync + RefUnwindSafe {
     /// Retrieves the list of diagnostics associated to a file
     fn pull_diagnostics(
@@ -111,6 +126,18 @@ pub trait Workspace: Send + Sync + RefUnwindSafe {
         params: GetCompletionsParams,
     ) -> Result<CompletionsResult, WorkspaceError>;
 
+    /// Register a possible workspace project folder. Returns the key of said project. Use this key when you want to switch to different projects.
+    fn register_project_folder(
+        &self,
+        params: RegisterProjectFolderParams,
+    ) -> Result<ProjectKey, WorkspaceError>;
+
+    /// Unregister a workspace project folder. The settings that belong to that project are deleted.
+    fn unregister_project_folder(
+        &self,
+        params: UnregisterProjectFolderParams,
+    ) -> Result<(), WorkspaceError>;
+
     /// Update the global settings for this workspace
     fn update_settings(&self, params: UpdateSettingsParams) -> Result<(), WorkspaceError>;
 

crates/pgt_workspace/src/workspace/client.rs

@@ -1,6 +1,6 @@
 use crate::workspace::ServerInfo;
 use crate::{TransportError, Workspace, WorkspaceError};
-use serde::{Deserialize, Serialize, de::DeserializeOwned};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use serde_json::json;
 use std::{
     panic::RefUnwindSafe,
@@ -103,6 +103,20 @@ where
         self.request("pgt/execute_statement", params)
     }
 
+    fn register_project_folder(
+        &self,
+        params: RegisterProjectFolderParams,
+    ) -> Result<ProjectKey, WorkspaceError> {
+        self.request("pgt/register_project_folder", params)
+    }
+
+    fn unregister_project_folder(
+        &self,
+        params: UnregisterProjectFolderParams,
+    ) -> Result<(), WorkspaceError> {
+        self.request("pgt/unregister_project_folder", params)
+    }
+
     fn open_file(&self, params: OpenFileParams) -> Result<(), WorkspaceError> {
         self.request("pgt/open_file", params)
     }