fix: Ignore keywords for uppercase=True (#53)

shssoichiro · Sep 17, 2024 · 4fcfa0d · 4fcfa0d
1 parent 2305a5e
commit 4fcfa0d
Show file tree

Hide file tree

Showing 4 changed files with 158 additions and 108 deletions.
diff --git a/benches/bench.rs b/benches/bench.rs
@@ -8,7 +8,7 @@ fn simple_query(c: &mut Criterion) {
             format(
                 black_box(input),
                 black_box(&QueryParams::None),
-                black_box(FormatOptions::default()),
+                black_box(&FormatOptions::default()),
             )
         })
     });
@@ -21,7 +21,7 @@ fn complex_query(c: &mut Criterion) {
             format(
                 black_box(input),
                 black_box(&QueryParams::None),
-                black_box(FormatOptions::default()),
+                black_box(&FormatOptions::default()),
             )
         })
     });
@@ -39,7 +39,7 @@ fn query_with_named_params(c: &mut Criterion) {
             format(
                 black_box(input),
                 black_box(&QueryParams::Named(params.clone())),
-                black_box(FormatOptions::default()),
+                black_box(&FormatOptions::default()),
             )
         })
     });
@@ -53,7 +53,7 @@ fn query_with_explicit_indexed_params(c: &mut Criterion) {
             format(
                 black_box(input),
                 black_box(&QueryParams::Indexed(params.clone())),
-                black_box(FormatOptions::default()),
+                black_box(&FormatOptions::default()),
             )
         })
     });
@@ -67,7 +67,7 @@ fn query_with_implicit_indexed_params(c: &mut Criterion) {
             format(
                 black_box(input),
                 black_box(&QueryParams::Indexed(params.clone())),
-                black_box(FormatOptions::default()),
+                black_box(&FormatOptions::default()),
             )
         })
     });
@@ -135,7 +135,7 @@ VALUES
             format(
                 black_box(&input),
                 black_box(&QueryParams::None),
-                black_box(FormatOptions::default()),
+                black_box(&FormatOptions::default()),
             )
         })
     });
@@ -149,7 +149,7 @@ fn issue_633_2(c: &mut Criterion) {
             format(
                 black_box(input),
                 black_box(&QueryParams::Indexed(params.clone())),
-                black_box(FormatOptions::default()),
+                black_box(&FormatOptions::default()),
             )
         })
     });
@@ -175,7 +175,7 @@ fn issue_633_3(c: &mut Criterion) {
             format(
                 black_box(&input),
                 black_box(&QueryParams::None),
-                black_box(FormatOptions::default()),
+                black_box(&FormatOptions::default()),
             )
         })
     });

diff --git a/src/formatter.rs b/src/formatter.rs
@@ -17,7 +17,11 @@ pub(crate) fn check_fmt_off(s: &str) -> Option<bool> {
         .map(|matched| matched.as_str().eq_ignore_ascii_case("off"))
 }
 
-pub(crate) fn format(tokens: &[Token<'_>], params: &QueryParams, options: FormatOptions) -> String {
+pub(crate) fn format(
+    tokens: &[Token<'_>],
+    params: &QueryParams,
+    options: &FormatOptions,
+) -> String {
     let mut formatter = Formatter::new(tokens, params, options);
     let mut formatted_query = String::new();
     let mut is_fmt_enabled = true;
@@ -85,13 +89,13 @@ struct Formatter<'a> {
     previous_reserved_word: Option<&'a Token<'a>>,
     tokens: &'a [Token<'a>],
     params: Params<'a>,
-    options: FormatOptions,
-    indentation: Indentation,
+    options: &'a FormatOptions<'a>,
+    indentation: Indentation<'a>,
     inline_block: InlineBlock,
 }
 
 impl<'a> Formatter<'a> {
-    fn new(tokens: &'a [Token<'a>], params: &'a QueryParams, options: FormatOptions) -> Self {
+    fn new(tokens: &'a [Token<'a>], params: &'a QueryParams, options: &'a FormatOptions) -> Self {
         Formatter {
             index: 0,
             previous_reserved_word: None,
@@ -182,7 +186,14 @@ impl<'a> Formatter<'a> {
         {
             self.trim_spaces_end(query);
         }
-        if self.options.uppercase {
+        if self.options.uppercase
+            && !self
+                .options
+                .ignore_case_convert
+                .as_ref()
+                .map(|values| values.contains(&token.value))
+                .unwrap_or(false)
+        {
             query.push_str(&token.value.to_uppercase());
         } else {
             query.push_str(token.value);
@@ -199,7 +210,14 @@ impl<'a> Formatter<'a> {
     // Closing parentheses decrease the block indent level
     fn format_closing_parentheses(&mut self, token: &Token<'_>, query: &mut String) {
         let mut token = token.clone();
-        let value = if self.options.uppercase {
+        let value = if self.options.uppercase
+            && !self
+                .options
+                .ignore_case_convert
+                .as_ref()
+                .map(|values| values.contains(&token.value))
+                .unwrap_or(false)
+        {
             token.value.to_uppercase()
         } else {
             token.value.to_string()
@@ -299,7 +317,14 @@ impl<'a> Formatter<'a> {
     }
 
     fn format_reserved_word<'t>(&self, token: &'t str) -> Cow<'t, str> {
-        if self.options.uppercase {
+        if self.options.uppercase
+            && !self
+                .options
+                .ignore_case_convert
+                .as_ref()
+                .map(|values| values.contains(&token))
+                .unwrap_or(false)
+        {
             Cow::Owned(token.to_uppercase())
         } else {
             Cow::Borrowed(token)

diff --git a/src/indentation.rs b/src/indentation.rs
@@ -1,7 +1,7 @@
 use crate::{FormatOptions, Indent};
 
-pub(crate) struct Indentation {
-    options: FormatOptions,
+pub(crate) struct Indentation<'a> {
+    options: &'a FormatOptions<'a>,
     indent_types: Vec<IndentType>,
 }
 
@@ -11,8 +11,8 @@ enum IndentType {
     BlockLevel,
 }
 
-impl Indentation {
-    pub fn new(options: FormatOptions) -> Self {
+impl<'a> Indentation<'a> {
+    pub fn new(options: &'a FormatOptions) -> Self {
         Indentation {
             options,
             indent_types: Vec::new(),