Skip to content

Commit

Permalink
Use struct instead of type alias for workspace settings index (#12726)
Browse files Browse the repository at this point in the history
## Summary

Follow-up from #12725, this is
just a small refactor to use a wrapper struct instead of type alias for
workspace settings index. This avoids the need to have the
`register_workspace_settings` as a static method on `Index` and instead
is a method on the new struct itself.
  • Loading branch information
dhruvmanila authored Aug 7, 2024
1 parent 7fcfedd commit 037e817
Showing 1 changed file with 69 additions and 49 deletions.
118 changes: 69 additions & 49 deletions crates/ruff_server/src/session/index.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use std::borrow::Cow;
use std::ops::{Deref, DerefMut};
use std::path::PathBuf;
use std::{collections::BTreeMap, path::Path, sync::Arc};

Expand All @@ -17,8 +18,6 @@ use super::{settings::ResolvedClientSettings, ClientSettings};

mod ruff_settings;

type SettingsIndex = BTreeMap<PathBuf, WorkspaceSettings>;

/// Stores and tracks all open documents in a session, along with their associated settings.
#[derive(Default)]
pub(crate) struct Index {
Expand All @@ -29,7 +28,7 @@ pub(crate) struct Index {
notebook_cells: FxHashMap<Url, Url>,

/// Maps a workspace folder root to its settings.
settings: SettingsIndex,
settings: WorkspaceSettingsIndex,
}

/// Settings associated with a workspace.
Expand Down Expand Up @@ -70,20 +69,15 @@ impl Index {
workspace_folders: Vec<(Url, ClientSettings)>,
global_settings: &ClientSettings,
) -> crate::Result<Self> {
let mut settings_index = BTreeMap::new();
let mut settings = WorkspaceSettingsIndex::default();
for (url, workspace_settings) in workspace_folders {
Self::register_workspace_settings(
&mut settings_index,
&url,
Some(workspace_settings),
global_settings,
)?;
settings.register_workspace(&url, Some(workspace_settings), global_settings)?;
}

Ok(Self {
documents: FxHashMap::default(),
notebook_cells: FxHashMap::default(),
settings: settings_index,
settings,
})
}

Expand Down Expand Up @@ -176,7 +170,7 @@ impl Index {
global_settings: &ClientSettings,
) -> crate::Result<()> {
// TODO(jane): Find a way for workspace client settings to be added or changed dynamically.
Self::register_workspace_settings(&mut self.settings, url, None, global_settings)
self.settings.register_workspace(url, None, global_settings)
}

pub(super) fn num_documents(&self) -> usize {
Expand All @@ -194,43 +188,6 @@ impl Index {
.collect()
}

fn register_workspace_settings(
settings_index: &mut SettingsIndex,
workspace_url: &Url,
workspace_settings: Option<ClientSettings>,
global_settings: &ClientSettings,
) -> crate::Result<()> {
if workspace_url.scheme() != "file" {
tracing::warn!("Ignoring non-file workspace: {workspace_url}");
show_warn_msg!("Ruff does not support non-file workspaces; Ignoring {workspace_url}");
return Ok(());
}
let workspace_path = workspace_url.to_file_path().map_err(|()| {
anyhow!("Failed to convert workspace URL to file path: {workspace_url}")
})?;

let client_settings = if let Some(workspace_settings) = workspace_settings {
ResolvedClientSettings::with_workspace(&workspace_settings, global_settings)
} else {
ResolvedClientSettings::global(global_settings)
};

let workspace_settings_index = ruff_settings::RuffSettingsIndex::new(
&workspace_path,
client_settings.editor_settings(),
);

settings_index.insert(
workspace_path,
WorkspaceSettings {
client_settings,
ruff_settings: workspace_settings_index,
},
);

Ok(())
}

pub(super) fn close_workspace_folder(&mut self, workspace_url: &Url) -> crate::Result<()> {
let workspace_path = workspace_url.to_file_path().map_err(|()| {
anyhow!("Failed to convert workspace URL to file path: {workspace_url}")
Expand Down Expand Up @@ -427,6 +384,69 @@ impl Index {
}
}

/// Maps a workspace folder root to its settings.
#[derive(Default)]
struct WorkspaceSettingsIndex {
index: BTreeMap<PathBuf, WorkspaceSettings>,
}

impl WorkspaceSettingsIndex {
/// Register a workspace folder with the given settings.
///
/// If the `workspace_settings` is [`Some`], it is preferred over the global settings for the
/// workspace. Otherwise, the global settings are used exclusively.
fn register_workspace(
&mut self,
workspace_url: &Url,
workspace_settings: Option<ClientSettings>,
global_settings: &ClientSettings,
) -> crate::Result<()> {
if workspace_url.scheme() != "file" {
tracing::info!("Ignoring non-file workspace URL: {workspace_url}");
show_warn_msg!("Ruff does not support non-file workspaces; Ignoring {workspace_url}");
return Ok(());
}
let workspace_path = workspace_url.to_file_path().map_err(|()| {
anyhow!("Failed to convert workspace URL to file path: {workspace_url}")
})?;

let client_settings = if let Some(workspace_settings) = workspace_settings {
ResolvedClientSettings::with_workspace(&workspace_settings, global_settings)
} else {
ResolvedClientSettings::global(global_settings)
};

let workspace_settings_index = ruff_settings::RuffSettingsIndex::new(
&workspace_path,
client_settings.editor_settings(),
);

self.insert(
workspace_path,
WorkspaceSettings {
client_settings,
ruff_settings: workspace_settings_index,
},
);

Ok(())
}
}

impl Deref for WorkspaceSettingsIndex {
type Target = BTreeMap<PathBuf, WorkspaceSettings>;

fn deref(&self) -> &Self::Target {
&self.index
}
}

impl DerefMut for WorkspaceSettingsIndex {
fn deref_mut(&mut self) -> &mut Self::Target {
&mut self.index
}
}

impl DocumentController {
fn new_text(document: TextDocument) -> Self {
Self::Text(Arc::new(document))
Expand Down

0 comments on commit 037e817

Please sign in to comment.