Properly combine CLI and pyproject.toml ignores and selects (#329)

src/check_lines.rs

@@ -32,8 +32,8 @@ pub fn check_lines(
     settings: &Settings,
     autofix: &fixer::Mode,
 ) {
-    let enforce_line_too_long = settings.select.contains(&CheckCode::E501);
-    let enforce_noqa = settings.select.contains(&CheckCode::M001);
+    let enforce_line_too_long = settings.enabled.contains(&CheckCode::E501);
+    let enforce_noqa = settings.enabled.contains(&CheckCode::M001);
 
     let mut noqa_directives: BTreeMap<usize, (Directive, Vec<&str>)> = BTreeMap::new();
 

src/lib.rs

@@ -7,7 +7,7 @@ use rustpython_parser::lexer::LexResult;
 use crate::autofix::fixer::Mode;
 use crate::linter::{check_path, tokenize};
 use crate::message::Message;
-use crate::settings::Settings;
+use crate::settings::{RawSettings, Settings};
 
 mod ast;
 mod autofix;
@@ -40,7 +40,7 @@ pub fn check(path: &Path, contents: &str) -> Result<Vec<Message>> {
         None => debug!("Unable to find pyproject.toml; using default settings..."),
     };
 
-    let settings = Settings::from_pyproject(pyproject, project_root)?;
+    let settings = Settings::from_raw(RawSettings::from_pyproject(pyproject, project_root)?);
 
     // Tokenize once.
     let tokens: Vec<LexResult> = tokenize(contents);

src/linter.rs

@@ -44,7 +44,7 @@ pub(crate) fn check_path(
 
     // Run the AST-based checks.
     if settings
-        .select
+        .enabled
         .iter()
         .any(|check_code| matches!(check_code.lint_source(), LintSource::AST))
     {
@@ -53,7 +53,7 @@ pub(crate) fn check_path(
                 checks.extend(check_ast(&python_ast, contents, settings, autofix, path))
             }
             Err(parse_error) => {
-                if settings.select.contains(&CheckCode::E999) {
+                if settings.enabled.contains(&CheckCode::E999) {
                     checks.push(Check::new(
                         CheckKind::SyntaxError(parse_error.error.to_string()),
                         Range {

src/main.rs

@@ -27,6 +27,7 @@ use ::ruff::settings::CurrentSettings;
 use ::ruff::settings::{FilePattern, PerFileIgnore, Settings};
 use ::ruff::tell_user;
 use ruff::linter::autoformat_path;
+use ruff::settings::RawSettings;
 
 const CARGO_PKG_NAME: &str = env!("CARGO_PKG_NAME");
 const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
@@ -120,7 +121,7 @@ fn check_for_updates() {
     }
 }
 
-fn show_settings(settings: Settings) {
+fn show_settings(settings: RawSettings) {
     println!("{:#?}", CurrentSettings::from_settings(settings));
 }
 
@@ -169,7 +170,7 @@ fn run_once(
             }
             .unwrap_or_else(|(path, message)| {
                 if let Some(path) = path {
-                    if settings.select.contains(&CheckCode::E902) {
+                    if settings.enabled.contains(&CheckCode::E902) {
                         vec![Message {
                             kind: CheckKind::IOError(message),
                             fixed: false,
@@ -287,7 +288,7 @@ fn inner_main() -> Result<ExitCode> {
         .map(|pair| PerFileIgnore::new(pair, &project_root))
         .collect();
 
-    let mut settings = Settings::from_pyproject(pyproject, project_root)?;
+    let mut settings = RawSettings::from_pyproject(pyproject, project_root)?;
     if !exclude.is_empty() {
         settings.exclude = exclude;
     }
@@ -298,17 +299,16 @@ fn inner_main() -> Result<ExitCode> {
         settings.per_file_ignores = per_file_ignores;
     }
     if !cli.select.is_empty() {
-        settings.clear();
-        settings.select(cli.select);
+        settings.select = cli.select;
     }
     if !cli.extend_select.is_empty() {
-        settings.select(cli.extend_select);
+        settings.extend_select = cli.extend_select;
     }
     if !cli.ignore.is_empty() {
-        settings.ignore(&cli.ignore);
+        settings.ignore = cli.ignore;
     }
     if !cli.extend_ignore.is_empty() {
-        settings.ignore(&cli.extend_ignore);
+        settings.extend_ignore = cli.extend_ignore;
     }
     if let Some(dummy_variable_rgx) = cli.dummy_variable_rgx {
         settings.dummy_variable_rgx = dummy_variable_rgx;
@@ -318,15 +318,18 @@ fn inner_main() -> Result<ExitCode> {
         eprintln!("Error: specify --show-settings or show-files (not both).");
         return Ok(ExitCode::FAILURE);
     }
-    if cli.show_files {
-        show_files(&cli.files, &settings);
-        return Ok(ExitCode::SUCCESS);
-    }
     if cli.show_settings {
         show_settings(settings);
         return Ok(ExitCode::SUCCESS);
     }
 
+    let settings = Settings::from_raw(settings);
+
+    if cli.show_files {
+        show_files(&cli.files, &settings);
+        return Ok(ExitCode::SUCCESS);
+    }
+
     cache::init()?;
 
     let mut printer = Printer::new(cli.format, cli.verbose);

src/pyproject.rs

@@ -37,6 +37,8 @@ pub struct Config {
     #[serde(default)]
     pub ignore: Vec<CheckCode>,
     #[serde(default)]
+    pub extend_ignore: Vec<CheckCode>,
+    #[serde(default)]
     pub per_file_ignores: Vec<StrCheckCodePair>,
     pub dummy_variable_rgx: Option<String>,
 }
@@ -184,6 +186,7 @@ mod tests {
                     select: None,
                     extend_select: vec![],
                     ignore: vec![],
+                    extend_ignore: vec![],
                     per_file_ignores: vec![],
                     dummy_variable_rgx: None,
                 })
@@ -207,6 +210,7 @@ line-length = 79
                     select: None,
                     extend_select: vec![],
                     ignore: vec![],
+                    extend_ignore: vec![],
                     per_file_ignores: vec![],
                     dummy_variable_rgx: None,
                 })
@@ -230,6 +234,7 @@ exclude = ["foo.py"]
                     select: None,
                     extend_select: vec![],
                     ignore: vec![],
+                    extend_ignore: vec![],
                     per_file_ignores: vec![],
                     dummy_variable_rgx: None,
                 })
@@ -253,6 +258,7 @@ select = ["E501"]
                     select: Some(vec![CheckCode::E501]),
                     extend_select: vec![],
                     ignore: vec![],
+                    extend_ignore: vec![],
                     per_file_ignores: vec![],
                     dummy_variable_rgx: None,
                 })
@@ -277,6 +283,7 @@ ignore = ["E501"]
                     select: None,
                     extend_select: vec![CheckCode::M001],
                     ignore: vec![CheckCode::E501],
+                    extend_ignore: vec![],
                     per_file_ignores: vec![],
                     dummy_variable_rgx: None,
                 })
@@ -344,6 +351,7 @@ other-attribute = 1
                 select: None,
                 extend_select: vec![],
                 ignore: vec![],
+                extend_ignore: vec![],
                 per_file_ignores: vec![],
                 dummy_variable_rgx: None,
             }