Add an option to keep the first arguments of top level words inline

Towards addressing shssoichiro#66 a bit more.

Author: lu-zero

src/formatter.rs

@@ -210,10 +210,12 @@ impl<'a> Formatter<'a> {
         self.add_new_line(query);
         self.indentation.increase_top_level(span_len);
         query.push_str(&self.equalize_whitespace(&self.format_reserved_word(token.value)));
-        if self
-            .options
-            .max_inline_top_level
-            .map_or(true, |limit| limit < span_len)
+        if !(!["select", "from"].contains(&token.value.to_lowercase().as_str())
+            && self.options.inline_first_top_level)
+            && self
+                .options
+                .max_inline_top_level
+                .map_or(true, |limit| limit < span_len)
         {
             self.add_new_line(query);
         } else {

src/lib.rs

@@ -61,6 +61,10 @@ pub struct FormatOptions<'a> {
     ///
     /// Default: None
     pub max_inline_top_level: Option<usize>,
+    /// Inline the first top level argument
+    ///
+    /// Default: false
+    pub inline_first_top_level: bool,
 }
 
 impl<'a> Default for FormatOptions<'a> {
@@ -74,6 +78,7 @@ impl<'a> Default for FormatOptions<'a> {
             max_inline_block: 50,
             max_inline_arguments: None,
             max_inline_top_level: None,
+            inline_first_top_level: false,
         }
     }
 }
@@ -306,6 +311,34 @@ mod tests {
         assert_eq!(format(input, &QueryParams::None, &options), expected);
     }
 
+    #[test]
+    fn it_formats_select_with_complex_where_top_level_inline() {
+        let input = indoc!(
+            "
+            SELECT * FROM foo, bar, baz WHERE Column1 = 'testing'
+            AND ( (Column2 = Column3 OR Column4 >= NOW()) );
+      "
+        );
+        let options = FormatOptions {
+            inline_first_top_level: true,
+            max_inline_top_level: Some(10),
+            max_inline_arguments: Some(20),
+            max_inline_block: 50,
+            ..Default::default()
+        };
+        let expected = indoc!(
+            "
+            SELECT *
+            FROM
+              foo, bar, baz
+            WHERE Column1 = 'testing'
+              AND ((Column2 = Column3
+                  OR Column4 >= NOW()));"
+        );
+
+        assert_eq!(format(input, &QueryParams::None, &options), expected);
+    }
+
     #[test]
     fn it_formats_select_with_top_level_reserved_words() {
         let input = indoc!(