From 54bc01192eceed0a97296c025189b76e1c833eaa Mon Sep 17 00:00:00 2001 From: Samuel Cormier-Iijima Date: Wed, 29 Nov 2023 23:47:00 -0500 Subject: [PATCH] Add --quote-style argument to ruff format --- crates/ruff_cli/src/args.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/crates/ruff_cli/src/args.rs b/crates/ruff_cli/src/args.rs index 6c5ed14456ab93..c1d61f9e940112 100644 --- a/crates/ruff_cli/src/args.rs +++ b/crates/ruff_cli/src/args.rs @@ -2,6 +2,7 @@ use std::path::PathBuf; use clap::{command, Parser}; use regex::Regex; +use ruff_python_formatter::QuoteStyle; use rustc_hash::FxHashMap; use ruff_linter::line_width::LineLength; @@ -417,6 +418,9 @@ pub struct FormatCommand { /// Set the line-length. #[arg(long, help_heading = "Format configuration")] pub line_length: Option, + /// Set the quote-style. + #[arg(long, help_heading = "Format configuration")] + pub quote_style: Option, /// Ignore all configuration files. #[arg(long, conflicts_with = "config", help_heading = "Miscellaneous")] pub isolated: bool, @@ -521,6 +525,7 @@ impl CheckCommand { fixable: self.fixable, ignore: self.ignore, line_length: self.line_length, + quote_style: None, per_file_ignores: self.per_file_ignores, preview: resolve_bool_arg(self.preview, self.no_preview).map(PreviewMode::from), respect_gitignore: resolve_bool_arg( @@ -562,6 +567,7 @@ impl FormatCommand { }, CliOverrides { line_length: self.line_length, + quote_style: self.quote_style, respect_gitignore: resolve_bool_arg( self.respect_gitignore, self.no_respect_gitignore, @@ -637,6 +643,7 @@ pub struct CliOverrides { pub fixable: Option>, pub ignore: Option>, pub line_length: Option, + pub quote_style: Option, pub per_file_ignores: Option>, pub extend_per_file_ignores: Option>, pub preview: Option, @@ -718,6 +725,9 @@ impl ConfigurationTransformer for CliOverrides { ..config.lint.pycodestyle.unwrap_or_default() }); } + if let Some(quote_style) = self.quote_style { + config.format.quote_style = Some(quote_style); + } if let Some(preview) = &self.preview { config.preview = Some(*preview); config.lint.preview = Some(*preview);