flake8_to_ruff: support isort options

flake8_to_ruff/src/main.rs

@@ -50,12 +50,19 @@ fn main() -> Result<()> {
     // Read the pyproject.toml file.
     let black = cli
         .pyproject
+        .clone()
         .map(flake8_to_ruff::parse_black_options)
         .transpose()?
         .flatten();
 
+    let isort = cli
+        .pyproject
+        .map(flake8_to_ruff::parse_isort_options)
+        .transpose()?
+        .flatten();
+
     // Create Ruff's pyproject.toml section.
-    let pyproject = flake8_to_ruff::convert(&config, black.as_ref(), cli.plugin)?;
+    let pyproject = flake8_to_ruff::convert(&config, black.as_ref(), isort.as_ref(), cli.plugin)?;
     println!("{}", toml_edit::easy::to_string_pretty(&pyproject)?);
 
     Ok(())

src/flake8_to_ruff/converter.rs

@@ -4,6 +4,7 @@ use anyhow::Result;
 use colored::Colorize;
 
 use super::black::Black;
+use super::isort::ISort;
 use super::plugin::Plugin;
 use super::{parser, plugin};
 use crate::registry::RuleSelector;
@@ -24,6 +25,7 @@ use crate::warn_user;
 pub fn convert(
     config: &HashMap<String, HashMap<String, Option<String>>>,
     black: Option<&Black>,
+    isort: Option<&ISort>,
     plugins: Option<Vec<Plugin>>,
 ) -> Result<Pyproject> {
     // Extract the Flake8 section.
@@ -389,6 +391,19 @@ pub fn convert(
         }
     }
 
+    if let Some(isort) = isort {
+        if let Some(src_paths) = &isort.src_paths {
+            match options.src.as_mut() {
+                Some(src) => {
+                    src.extend(src_paths.clone());
+                }
+                None => {
+                    options.src = Some(src_paths.clone());
+                }
+            }
+        }
+    }
+
     // Create the pyproject.toml.
     Ok(Pyproject::new(options))
 }
@@ -413,6 +428,7 @@ mod tests {
             &HashMap::from([("flake8".to_string(), HashMap::default())]),
             None,
             None,
+            None,
         )?;
         let expected = Pyproject::new(Options {
             allowed_confusables: None,
@@ -476,6 +492,7 @@ mod tests {
                 HashMap::from([("max-line-length".to_string(), Some("100".to_string()))]),
             )]),
             None,
+            None,
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
@@ -540,6 +557,7 @@ mod tests {
                 HashMap::from([("max_line_length".to_string(), Some("100".to_string()))]),
             )]),
             None,
+            None,
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
@@ -604,6 +622,7 @@ mod tests {
                 HashMap::from([("max_line_length".to_string(), Some("abc".to_string()))]),
             )]),
             None,
+            None,
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
@@ -668,6 +687,7 @@ mod tests {
                 HashMap::from([("inline-quotes".to_string(), Some("single".to_string()))]),
             )]),
             None,
+            None,
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
@@ -740,6 +760,7 @@ mod tests {
                 )]),
             )]),
             None,
+            None,
             Some(vec![Plugin::Flake8Docstrings]),
         )?;
         let expected = Pyproject::new(Options {
@@ -812,6 +833,7 @@ mod tests {
             )]),
             None,
             None,
+            None,
         )?;
         let expected = Pyproject::new(Options {
             allowed_confusables: None,

src/flake8_to_ruff/isort.rs

@@ -0,0 +1,31 @@
+//! Extract isort configuration settings from a pyproject.toml.
+
+use std::path::Path;
+
+use anyhow::Result;
+use serde::{Deserialize, Serialize};
+
+// use crate::settings::types::PythonVersion;
+
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
+pub struct ISort {
+    #[serde(alias = "src-paths", alias = "src_paths")]
+    pub src_paths: Option<Vec<String>>,
+}
+
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+struct Tools {
+    isort: Option<ISort>,
+}
+
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+struct Pyproject {
+    tool: Option<Tools>,
+}
+
+pub fn parse_isort_options<P: AsRef<Path>>(path: P) -> Result<Option<ISort>> {
+    let contents = std::fs::read_to_string(path)?;
+    Ok(toml_edit::easy::from_str::<Pyproject>(&contents)?
+        .tool
+        .and_then(|tool| tool.isort))
+}

src/flake8_to_ruff/mod.rs

@@ -1,8 +1,10 @@
 mod black;
 mod converter;
+mod isort;
 mod parser;
 mod plugin;
 
 pub use black::parse_black_options;
 pub use converter::convert;
+pub use isort::parse_isort_options;
 pub use plugin::Plugin;