Add --quote-style argument to ruff format

astral-sh · Nov 30, 2023 · 40dca18 · 40dca18
1 parent 041163a
commit 40dca18
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git 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<LineLength>,
+    /// Set the quote-style.
+    #[arg(long, help_heading = "Format configuration")]
+    pub quote_style: Option<QuoteStyle>,
     /// 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<Vec<RuleSelector>>,
     pub ignore: Option<Vec<RuleSelector>>,
     pub line_length: Option<LineLength>,
+    pub quote_style: Option<QuoteStyle>,
     pub per_file_ignores: Option<Vec<PatternPrefixPair>>,
     pub extend_per_file_ignores: Option<Vec<PatternPrefixPair>>,
     pub preview: Option<PreviewMode>,
@@ -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);

diff --git a/crates/ruff_python_formatter/src/cli.rs b/crates/ruff_python_formatter/src/cli.rs
@@ -12,7 +12,7 @@ use ruff_python_parser::{parse_ok_tokens, AsMode};
 use ruff_text_size::Ranged;
 
 use crate::comments::collect_comments;
-use crate::{format_module_ast, MagicTrailingComma, PreviewMode, PyFormatOptions};
+use crate::{format_module_ast, MagicTrailingComma, PreviewMode, PyFormatOptions, QuoteStyle};
 
 #[derive(ValueEnum, Clone, Debug)]
 pub enum Emit {
@@ -42,6 +42,8 @@ pub struct Cli {
     pub print_comments: bool,
     #[clap(long, short = 'C')]
     pub skip_magic_trailing_comma: bool,
+    #[clap(long)]
+    pub quote_style: QuoteStyle,
 }
 
 pub fn format_and_debug_print(source: &str, cli: &Cli, source_path: &Path) -> Result<String> {