language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-29 05:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Promote lint. settings over top-level settings (#9476)

Browse source
This commit is contained in:
Micha Reiser 2024-01-29 18:42:30 +01:00 • committed by Zanie Blue
parent 6996ff7b1e
commit c3b33e9c4d
62 changed files with 389 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ruff_workspace/src/configuration.rs
View file

@ -396,11 +396,11 @@ impl Configuration {
pub fn from_options(options: Options, project_root: &Path) -> Result<Self> {
let lint = if let Some(mut lint) = options.lint {
lint.common = lint.common.combine(options.lint_top_level);
lint.common = lint.common.combine(options.lint_top_level.common);
lint
} else {
LintOptions {
common: options.lint_top_level,
common: options.lint_top_level.common,
..LintOptions::default()
}
};