Merge subsettings when extending configurations

crates/ruff/src/rules/flake8_annotations/settings.rs

@@ -5,6 +5,8 @@ use serde::{Deserialize, Serialize};
 use ruff_macros::CacheKey;
 use ruff_macros::ConfigurationOptions;
 
+use crate::settings::configuration::CombinePluginOptions;
+
 #[derive(Debug, PartialEq, Eq, Default, Serialize, Deserialize, ConfigurationOptions)]
 #[serde(
     deny_unknown_fields,
@@ -93,3 +95,17 @@ impl From<Settings> for Options {
         }
     }
 }
+
+impl CombinePluginOptions for Options {
+    fn combine(self, other: Self) -> Self {
+        Self {
+            mypy_init_return: self.mypy_init_return.or(other.mypy_init_return),
+            suppress_dummy_args: self.suppress_dummy_args.or(other.suppress_dummy_args),
+            suppress_none_returning: self
+                .suppress_none_returning
+                .or(other.suppress_none_returning),
+            allow_star_arg_any: self.allow_star_arg_any.or(other.allow_star_arg_any),
+            ignore_fully_untyped: self.ignore_fully_untyped.or(other.ignore_fully_untyped),
+        }
+    }
+}

crates/ruff/src/rules/flake8_bandit/settings.rs

@@ -4,6 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use ruff_macros::{CacheKey, ConfigurationOptions};
 
+use crate::settings::configuration::CombinePluginOptions;
+
 fn default_tmp_dirs() -> Vec<String> {
     ["/tmp", "/var/tmp", "/dev/shm"]
         .map(std::string::ToString::to_string)
@@ -87,3 +89,17 @@ impl Default for Settings {
         }
     }
 }
+
+impl CombinePluginOptions for Options {
+    fn combine(self, other: Self) -> Self {
+        Self {
+            hardcoded_tmp_directory: self
+                .hardcoded_tmp_directory
+                .or(other.hardcoded_tmp_directory),
+            hardcoded_tmp_directory_extend: self
+                .hardcoded_tmp_directory_extend
+                .or(other.hardcoded_tmp_directory_extend),
+            check_typed_exception: self.check_typed_exception.or(other.check_typed_exception),
+        }
+    }
+}

crates/ruff/src/rules/flake8_bugbear/settings.rs

@@ -4,6 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use ruff_macros::{CacheKey, ConfigurationOptions};
 
+use crate::settings::configuration::CombinePluginOptions;
+
 #[derive(Debug, PartialEq, Eq, Default, Serialize, Deserialize, ConfigurationOptions)]
 #[serde(
     deny_unknown_fields,
@@ -46,3 +48,11 @@ impl From<Settings> for Options {
         }
     }
 }
+
+impl CombinePluginOptions for Options {
+    fn combine(self, other: Self) -> Self {
+        Self {
+            extend_immutable_calls: self.extend_immutable_calls.or(other.extend_immutable_calls),
+        }
+    }
+}

crates/ruff/src/rules/flake8_builtins/settings.rs

@@ -4,6 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use ruff_macros::{CacheKey, ConfigurationOptions};
 
+use crate::settings::configuration::CombinePluginOptions;
+
 #[derive(Debug, PartialEq, Eq, Default, Serialize, Deserialize, ConfigurationOptions)]
 #[serde(
     deny_unknown_fields,
@@ -41,3 +43,11 @@ impl From<Settings> for Options {
         }
     }
 }
+
+impl CombinePluginOptions for Options {
+    fn combine(self, other: Self) -> Self {
+        Self {
+            builtins_ignorelist: self.builtins_ignorelist.or(other.builtins_ignorelist),
+        }
+    }
+}

crates/ruff/src/rules/flake8_comprehensions/settings.rs

@@ -4,6 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use ruff_macros::{CacheKey, ConfigurationOptions};
 
+use crate::settings::configuration::CombinePluginOptions;
+
 #[derive(Debug, PartialEq, Eq, Default, Serialize, Deserialize, ConfigurationOptions)]
 #[serde(
     deny_unknown_fields,
@@ -45,3 +47,13 @@ impl From<Settings> for Options {
         }
     }
 }
+
+impl CombinePluginOptions for Options {
+    fn combine(self, other: Self) -> Self {
+        Self {
+            allow_dict_calls_with_keyword_arguments: self
+                .allow_dict_calls_with_keyword_arguments
+                .or(other.allow_dict_calls_with_keyword_arguments),
+        }
+    }
+}

crates/ruff/src/rules/flake8_errmsg/settings.rs

@@ -4,6 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use ruff_macros::{CacheKey, ConfigurationOptions};
 
+use crate::settings::configuration::CombinePluginOptions;
+
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions)]
 #[serde(
     deny_unknown_fields,
@@ -37,3 +39,11 @@ impl From<Settings> for Options {
         }
     }
 }
+
+impl CombinePluginOptions for Options {
+    fn combine(self, other: Self) -> Self {
+        Self {
+            max_string_length: self.max_string_length.or(other.max_string_length),
+        }
+    }
+}

crates/ruff/src/rules/flake8_gettext/settings.rs

@@ -2,6 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use ruff_macros::{CacheKey, ConfigurationOptions};
 
+use crate::settings::configuration::CombinePluginOptions;
+
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions)]
 #[serde(
     deny_unknown_fields,
@@ -69,3 +71,16 @@ impl From<Settings> for Options {
         }
     }
 }
+
+impl CombinePluginOptions for Options {
+    fn combine(self, other: Self) -> Self {
+        Self {
+            function_names: self.function_names.or(other.function_names),
+            extend_function_names: other
+                .extend_function_names
+                .into_iter()
+                .chain(self.extend_function_names.into_iter())
+                .collect(),
+        }
+    }
+}

crates/ruff/src/rules/flake8_implicit_str_concat/settings.rs

@@ -4,6 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use ruff_macros::{CacheKey, ConfigurationOptions};
 
+use crate::settings::configuration::CombinePluginOptions;
+
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions)]
 #[serde(
     deny_unknown_fields,
@@ -59,3 +61,11 @@ impl From<Settings> for Options {
         }
     }
 }
+
+impl CombinePluginOptions for Options {
+    fn combine(self, other: Self) -> Self {
+        Self {
+            allow_multiline: self.allow_multiline.or(other.allow_multiline),
+        }
+    }
+}

crates/ruff/src/rules/flake8_import_conventions/settings.rs

@@ -5,6 +5,8 @@ use serde::{Deserialize, Serialize};
 
 use ruff_macros::{CacheKey, ConfigurationOptions};
 
+use crate::settings::configuration::CombinePluginOptions;
+
 const CONVENTIONAL_ALIASES: &[(&str, &str)] = &[
     ("altair", "alt"),
     ("matplotlib", "mpl"),
@@ -132,3 +134,14 @@ impl From<Settings> for Options {
         }
     }
 }
+
+impl CombinePluginOptions for Options {
+    fn combine(self, other: Self) -> Self {
+        Self {
+            aliases: self.aliases.or(other.aliases),
+            extend_aliases: self.extend_aliases.or(other.extend_aliases),
+            banned_aliases: self.banned_aliases.or(other.banned_aliases),
+            banned_from: self.banned_from.or(other.banned_from),
+        }
+    }
+}

crates/ruff/src/rules/flake8_pytest_style/settings.rs

@@ -4,6 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use ruff_macros::{CacheKey, ConfigurationOptions};
 
+use crate::settings::configuration::CombinePluginOptions;
+
 use super::types;
 
 fn default_broad_exceptions() -> Vec<String> {
@@ -167,3 +169,25 @@ impl Default for Settings {
         }
     }
 }
+
+impl CombinePluginOptions for Options {
+    fn combine(self, other: Self) -> Self {
+        Self {
+            fixture_parentheses: self.fixture_parentheses.or(other.fixture_parentheses),
+            parametrize_names_type: self.parametrize_names_type.or(other.parametrize_names_type),
+            parametrize_values_type: self
+                .parametrize_values_type
+                .or(other.parametrize_values_type),
+            parametrize_values_row_type: self
+                .parametrize_values_row_type
+                .or(other.parametrize_values_row_type),
+            raises_require_match_for: self
+                .raises_require_match_for
+                .or(other.raises_require_match_for),
+            raises_extend_require_match_for: self
+                .raises_extend_require_match_for
+                .or(other.raises_extend_require_match_for),
+            mark_parentheses: self.mark_parentheses.or(other.mark_parentheses),
+        }
+    }
+}

crates/ruff/src/rules/flake8_quotes/settings.rs

@@ -4,6 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use ruff_macros::{CacheKey, ConfigurationOptions};
 
+use crate::settings::configuration::CombinePluginOptions;
+
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, CacheKey)]
 #[serde(deny_unknown_fields, rename_all = "kebab-case")]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
@@ -111,3 +113,14 @@ impl From<Settings> for Options {
         }
     }
 }
+
+impl CombinePluginOptions for Options {
+    fn combine(self, other: Self) -> Self {
+        Self {
+            inline_quotes: self.inline_quotes.or(other.inline_quotes),
+            multiline_quotes: self.multiline_quotes.or(other.multiline_quotes),
+            docstring_quotes: self.docstring_quotes.or(other.docstring_quotes),
+            avoid_escape: self.avoid_escape.or(other.avoid_escape),
+        }
+    }
+}

crates/ruff/src/rules/flake8_self/settings.rs

@@ -4,6 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use ruff_macros::{CacheKey, ConfigurationOptions};
 
+use crate::settings::configuration::CombinePluginOptions;
+
 // By default, ignore the `namedtuple` methods and attributes, which are underscore-prefixed to
 // prevent conflicts with field names.
 const IGNORE_NAMES: [&str; 5] = ["_make", "_asdict", "_replace", "_fields", "_field_defaults"];
@@ -57,3 +59,10 @@ impl From<Settings> for Options {
         }
     }
 }
+impl CombinePluginOptions for Options {
+    fn combine(self, other: Self) -> Self {
+        Self {
+            ignore_names: self.ignore_names.or(other.ignore_names),
+        }
+    }
+}

crates/ruff/src/rules/flake8_tidy_imports/options.rs

@@ -5,6 +5,8 @@ use serde::{Deserialize, Serialize};
 
 use ruff_macros::ConfigurationOptions;
 
+use crate::settings::configuration::CombinePluginOptions;
+
 use super::banned_api::ApiBan;
 use super::relative_imports::Strictness;
 use super::Settings;
@@ -60,3 +62,12 @@ impl From<Settings> for Options {
         }
     }
 }
+
+impl CombinePluginOptions for Options {
+    fn combine(self, other: Self) -> Self {
+        Self {
+            ban_relative_imports: self.ban_relative_imports.or(other.ban_relative_imports),
+            banned_api: self.banned_api.or(other.banned_api),
+        }
+    }
+}

crates/ruff/src/rules/flake8_type_checking/settings.rs

@@ -4,6 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use ruff_macros::{CacheKey, ConfigurationOptions};
 
+use crate::settings::configuration::CombinePluginOptions;
+
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions)]
 #[serde(
     deny_unknown_fields,
@@ -99,3 +101,18 @@ impl From<Settings> for Options {
         }
     }
 }
+
+impl CombinePluginOptions for Options {
+    fn combine(self, other: Self) -> Self {
+        Self {
+            strict: self.strict.or(other.strict),
+            exempt_modules: self.exempt_modules.or(other.exempt_modules),
+            runtime_evaluated_base_classes: self
+                .runtime_evaluated_base_classes
+                .or(other.runtime_evaluated_base_classes),
+            runtime_evaluated_decorators: self
+                .runtime_evaluated_decorators
+                .or(other.runtime_evaluated_decorators),
+        }
+    }
+}

crates/ruff/src/rules/flake8_unused_arguments/settings.rs

@@ -4,6 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use ruff_macros::{CacheKey, ConfigurationOptions};
 
+use crate::settings::configuration::CombinePluginOptions;
+
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Default, ConfigurationOptions)]
 #[serde(
     deny_unknown_fields,
@@ -41,3 +43,10 @@ impl From<Settings> for Options {
         }
     }
 }
+impl CombinePluginOptions for Options {
+    fn combine(self, other: Self) -> Self {
+        Self {
+            ignore_variadic_names: self.ignore_variadic_names.or(other.ignore_variadic_names),
+        }
+    }
+}