Skip to content

Commit

Permalink
Try finding user settings for the configuration fallback
Browse files Browse the repository at this point in the history
  • Loading branch information
snowsignal committed May 1, 2024
1 parent 414990c commit dc01bc9
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions crates/ruff_server/src/session/workspace/ruff_settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use ruff_linter::{
};
use ruff_workspace::{
configuration::{Configuration, FormatConfiguration, LintConfiguration, RuleSelection},
pyproject::settings_toml,
pyproject::{find_user_settings_toml, settings_toml},
resolver::{ConfigurationTransformer, Relativity},
};
use std::{
Expand Down Expand Up @@ -80,9 +80,22 @@ impl RuffSettingsIndex {
}
}

let fallback = find_user_settings_toml()
.and_then(|user_settings| {
ruff_workspace::resolver::resolve_root_settings(
&user_settings,
Relativity::Cwd,
&EditorConfigurationTransformer(editor_settings, root),
).ok()
})
.unwrap_or_default();

Self {
index,
fallback: Arc::default(),
fallback: Arc::new(RuffSettings {
formatter: fallback.formatter,
linter: fallback.linter,
}),
}
}

Expand Down

0 comments on commit dc01bc9

Please sign in to comment.