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

Avoid parsing the root configuration twice (#10625)

Browse source
This commit is contained in:
Micha Reiser 2024-05-01 11:28:30 +02:00 • committed by GitHub
parent 068e22d382
commit 376fb71a7f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 37 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -867,11 +867,7 @@ impl LintConfiguration {
} else {
// Otherwise we apply the updates on top of the existing select_set.
for (rule, enabled) in select_map_updates {
if enabled {
select_set.insert(rule);
} else {
select_set.remove(rule);
}
select_set.set(rule, enabled);
}
for rule in docstring_override_updates {
@ -894,11 +890,7 @@ impl LintConfiguration {
}
} else {
for (rule, enabled) in fixable_map_updates {
if enabled {
fixable_set.insert(rule);
} else {
fixable_set.remove(rule);
}
fixable_set.set(rule, enabled);
}
}
@ -1095,31 +1087,27 @@ impl LintConfiguration {
#[must_use]
pub fn combine(self, config: Self) -> Self {
let mut rule_selections = config.rule_selections;
rule_selections.extend(self.rule_selections);
let mut extend_safe_fixes = config.extend_safe_fixes;
extend_safe_fixes.extend(self.extend_safe_fixes);
let mut extend_unsafe_fixes = config.extend_unsafe_fixes;
extend_unsafe_fixes.extend(self.extend_unsafe_fixes);
let mut extend_per_file_ignores = config.extend_per_file_ignores;
extend_per_file_ignores.extend(self.extend_per_file_ignores);
Self {
exclude: self.exclude.or(config.exclude),
preview: self.preview.or(config.preview),
rule_selections: config
.rule_selections
.into_iter()
.chain(self.rule_selections)
.collect(),
extend_safe_fixes: config
.extend_safe_fixes
.into_iter()
.chain(self.extend_safe_fixes)
.collect(),
extend_unsafe_fixes: config
.extend_unsafe_fixes
.into_iter()
.chain(self.extend_unsafe_fixes)
.collect(),
rule_selections,
extend_safe_fixes,
extend_unsafe_fixes,
allowed_confusables: self.allowed_confusables.or(config.allowed_confusables),
dummy_variable_rgx: self.dummy_variable_rgx.or(config.dummy_variable_rgx),
extend_per_file_ignores: config
.extend_per_file_ignores
.into_iter()
.chain(self.extend_per_file_ignores)
.collect(),
extend_per_file_ignores,
external: self.external.or(config.external),
ignore_init_module_imports: self
.ignore_init_module_imports