un-make quote-style a global formatter property and just apply to bot…

…h css and js
biomejs · Dec 31, 2023 · 245c847 · 245c847
1 parent f91ccea
commit 245c847
Show file tree

Hide file tree

Showing 69 changed files with 124 additions and 110 deletions.
diff --git a/crates/biome_cli/tests/cases/overrides_formatter.rs b/crates/biome_cli/tests/cases/overrides_formatter.rs
@@ -26,8 +26,8 @@ const FORMATTED_WITH_NO_SEMICOLONS: &str = "const a = [\"loreum\", \"ipsum\"]\n"
 
 const CSS_UNFORMATTED_QUOTES: &str =
     r#"[class='foo'] { background-image: url("/path/to/file.jpg")}"#;
-const CSS_FORMATTED_SINGLE_QUOTES: &str =
-    "[class='foo'] {\n\tbackground-image: url('/path/to/file.jpg');\n}\n";
+const CSS_FORMATTED_SINGLE_QUOTES_AND_SPACES: &str =
+    "[class='foo'] {\n  background-image: url('/path/to/file.jpg');\n}\n";
 
 #[test]
 fn does_handle_included_file_and_disable_formatter() {
@@ -279,7 +279,7 @@ fn does_include_file_with_different_languages() {
 
     assert_file_contents(&fs, test, FORMATTED_WITH_SINGLE_QUOTES);
     assert_file_contents(&fs, test2, FORMATTED_WITH_NO_SEMICOLONS);
-    assert_file_contents(&fs, test_css, CSS_FORMATTED_SINGLE_QUOTES);
+    assert_file_contents(&fs, test_css, CSS_FORMATTED_SINGLE_QUOTES_AND_SPACES);
 
     assert_cli_snapshot(SnapshotPayload::new(
         module_path!(),

diff --git a/crates/biome_cli/tests/commands/format.rs b/crates/biome_cli/tests/commands/format.rs
@@ -41,7 +41,7 @@ const APPLY_CSS_QUOTE_STYLE_BEFORE: &str =
     r#"[class='foo'] { background-image: url("/path/to/file.jpg")}"#;
 
 const APPLY_CSS_QUOTE_STYLE_AFTER: &str =
-    "[class='foo'] {\n\tbackground-image: url('/path/to/file.jpg');\n}";
+    "[class='foo'] {\n\tbackground-image: url('/path/to/file.jpg');\n}\n";
 
 const APPLY_TRAILING_COMMA_BEFORE: &str = r#"
 const a = [

diff --git a/...hots/main_cases_overrides_formatter/does_not_change_formatting_language_settings.snap.new b/...hots/main_cases_overrides_formatter/does_not_change_formatting_language_settings.snap.new
diff --git a/crates/biome_cli/tests/snapshots/main_commands_check/check_help.snap b/crates/biome_cli/tests/snapshots/main_commands_check/check_help.snap
@@ -29,8 +29,6 @@ The configuration that is contained inside the file `biome.json`
         --indent-width=NUMBER  The size of the indentation, 2 by default
         --line-ending=<lf|crlf|cr>  The type of line ending.
         --line-width=NUMBER   What's the max width of a line. Defaults to 80.
-        --quote-style=<double|single>  The type of quotes used in languages that support alternate quoting
-                              styles. Defaults to double.
         --jsx-quote-style=<double|single>  The type of quotes used in JSX. Defaults to double.
         --quote-properties=<preserve|as-needed>  When properties in objects are quoted. Defaults to asNeeded.
         --trailing-comma=<all|es5|none>  Print trailing commas wherever possible in multi-line comma-separated
@@ -56,8 +54,7 @@ The configuration that is contained inside the file `biome.json`
                               (and its super languages) files.
         --javascript-formatter-line-width=NUMBER  What's the max width of a line applied to JavaScript
                               (and its super languages) files. Defaults to 80.
-        --javascript-formatter-quote-style=<double|single>  The type of quotes used in JavaScript code.
-                              Defaults to double.
+        --quote-style=<double|single>  The type of quotes used in JavaScript code. Defaults to double.
         --json-formatter-enabled=<true|false>  Control the formatter for JSON (and its super languages)
                               files.
         --json-formatter-indent-style=<tab|space>  The indent style applied to JSON (and its super languages)

diff --git a/crates/biome_cli/tests/snapshots/main_commands_ci/ci_help.snap b/crates/biome_cli/tests/snapshots/main_commands_ci/ci_help.snap
@@ -31,8 +31,6 @@ The configuration that is contained inside the file `biome.json`
         --indent-width=NUMBER  The size of the indentation, 2 by default
         --line-ending=<lf|crlf|cr>  The type of line ending.
         --line-width=NUMBER   What's the max width of a line. Defaults to 80.
-        --quote-style=<double|single>  The type of quotes used in languages that support alternate quoting
-                              styles. Defaults to double.
         --jsx-quote-style=<double|single>  The type of quotes used in JSX. Defaults to double.
         --quote-properties=<preserve|as-needed>  When properties in objects are quoted. Defaults to asNeeded.
         --trailing-comma=<all|es5|none>  Print trailing commas wherever possible in multi-line comma-separated
@@ -58,8 +56,7 @@ The configuration that is contained inside the file `biome.json`
                               (and its super languages) files.
         --javascript-formatter-line-width=NUMBER  What's the max width of a line applied to JavaScript
                               (and its super languages) files. Defaults to 80.
-        --javascript-formatter-quote-style=<double|single>  The type of quotes used in JavaScript code.
-                              Defaults to double.
+        --quote-style=<double|single>  The type of quotes used in JavaScript code. Defaults to double.
         --json-formatter-enabled=<true|false>  Control the formatter for JSON (and its super languages)
                               files.
         --json-formatter-indent-style=<tab|space>  The indent style applied to JSON (and its super languages)

diff --git a/crates/biome_cli/tests/snapshots/main_commands_format/format_help.snap b/crates/biome_cli/tests/snapshots/main_commands_format/format_help.snap
@@ -15,8 +15,6 @@ Generic options applied to all files
         --indent-width=NUMBER  The size of the indentation, 2 by default
         --line-ending=<lf|crlf|cr>  The type of line ending.
         --line-width=NUMBER   What's the max width of a line. Defaults to 80.
-        --quote-style=<double|single>  The type of quotes used in languages that support alternate quoting
-                              styles. Defaults to double.
 
 Formatting options specific to the JavaScript files
         --jsx-quote-style=<double|single>  The type of quotes used in JSX. Defaults to double.
@@ -44,8 +42,7 @@ Formatting options specific to the JavaScript files
                               (and its super languages) files.
         --javascript-formatter-line-width=NUMBER  What's the max width of a line applied to JavaScript
                               (and its super languages) files. Defaults to 80.
-        --javascript-formatter-quote-style=<double|single>  The type of quotes used in JavaScript code.
-                              Defaults to double.
+        --quote-style=<double|single>  The type of quotes used in JavaScript code. Defaults to double.
 
 Set of properties to integrate Biome with a VCS software.
         --vcs-client-kind=<git>  The kind of client.

diff --git a/crates/biome_css_formatter/tests/specs/css/atrule/charset.css.snap b/crates/biome_css_formatter/tests/specs/css/atrule/charset.css.snap
@@ -26,6 +26,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/atrule/color_profile.css.snap b/crates/biome_css_formatter/tests/specs/css/atrule/color_profile.css.snap
@@ -29,6 +29,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/atrule/container.css.snap b/crates/biome_css_formatter/tests/specs/css/atrule/container.css.snap
@@ -89,6 +89,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/atrule/counter_style.css.snap b/crates/biome_css_formatter/tests/specs/css/atrule/counter_style.css.snap
@@ -89,6 +89,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/atrule/font_face.css.snap b/crates/biome_css_formatter/tests/specs/css/atrule/font_face.css.snap
@@ -109,6 +109,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/atrule/keyframes.css.snap b/crates/biome_css_formatter/tests/specs/css/atrule/keyframes.css.snap
@@ -246,6 +246,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/atrule/layer.css.snap b/crates/biome_css_formatter/tests/specs/css/atrule/layer.css.snap
@@ -89,6 +89,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/atrule/media.css.snap b/crates/biome_css_formatter/tests/specs/css/atrule/media.css.snap
@@ -67,6 +67,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/atrule/page.css.snap b/crates/biome_css_formatter/tests/specs/css/atrule/page.css.snap
@@ -95,6 +95,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/atrule/page_complex.css.snap b/crates/biome_css_formatter/tests/specs/css/atrule/page_complex.css.snap
@@ -146,6 +146,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/atrule/scope.css.snap b/crates/biome_css_formatter/tests/specs/css/atrule/scope.css.snap
@@ -88,6 +88,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/atrule/supports.css.snap b/crates/biome_css_formatter/tests/specs/css/atrule/supports.css.snap
@@ -199,6 +199,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/atrule/supports_complex.css.snap b/crates/biome_css_formatter/tests/specs/css/atrule/supports_complex.css.snap
@@ -64,6 +64,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/block.css.snap b/crates/biome_css_formatter/tests/specs/css/block.css.snap
@@ -41,6 +41,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/casing.css.snap b/crates/biome_css_formatter/tests/specs/css/casing.css.snap
@@ -49,6 +49,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/color/functional_colors.css.snap b/crates/biome_css_formatter/tests/specs/css/color/functional_colors.css.snap
@@ -51,6 +51,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/color/hex_colors.css.snap b/crates/biome_css_formatter/tests/specs/css/color/hex_colors.css.snap
@@ -27,6 +27,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/declaration_list.css.snap b/crates/biome_css_formatter/tests/specs/css/declaration_list.css.snap
@@ -47,6 +47,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/dimensions.css.snap b/crates/biome_css_formatter/tests/specs/css/dimensions.css.snap
@@ -26,6 +26,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/empty.css.snap b/crates/biome_css_formatter/tests/specs/css/empty.css.snap
@@ -21,6 +21,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/functions.css.snap b/crates/biome_css_formatter/tests/specs/css/functions.css.snap
@@ -32,6 +32,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/important.css.snap b/crates/biome_css_formatter/tests/specs/css/important.css.snap
@@ -27,6 +27,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/namespace.css.snap b/crates/biome_css_formatter/tests/specs/css/namespace.css.snap
@@ -55,6 +55,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/pseudo/is.css.snap b/crates/biome_css_formatter/tests/specs/css/pseudo/is.css.snap
@@ -48,6 +48,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/pseudo/not.css.snap b/crates/biome_css_formatter/tests/specs/css/pseudo/not.css.snap
@@ -32,6 +32,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/...ome_css_formatter/tests/specs/css/pseudo/pseudo_class_function_compound_selector.css.snap b/...ome_css_formatter/tests/specs/css/pseudo/pseudo_class_function_compound_selector.css.snap
@@ -32,6 +32,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/...ss_formatter/tests/specs/css/pseudo/pseudo_class_function_compound_selector_list.css.snap b/...ss_formatter/tests/specs/css/pseudo/pseudo_class_function_compound_selector_list.css.snap
@@ -28,6 +28,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/pseudo/pseudo_class_function_nth.css.snap b/crates/biome_css_formatter/tests/specs/css/pseudo/pseudo_class_function_nth.css.snap
@@ -57,6 +57,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/...ss_formatter/tests/specs/css/pseudo/pseudo_class_function_relative_selector_list.css.snap b/...ss_formatter/tests/specs/css/pseudo/pseudo_class_function_relative_selector_list.css.snap
@@ -33,6 +33,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/pseudo/pseudo_class_function_selector.css.snap b/crates/biome_css_formatter/tests/specs/css/pseudo/pseudo_class_function_selector.css.snap
@@ -39,6 +39,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/pseudo/pseudo_class_function_value_list.css.snap b/crates/biome_css_formatter/tests/specs/css/pseudo/pseudo_class_function_value_list.css.snap
@@ -33,6 +33,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/pseudo/pseudo_class_identifier.css.snap b/crates/biome_css_formatter/tests/specs/css/pseudo/pseudo_class_identifier.css.snap
@@ -24,6 +24,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/pseudo/pseudo_element_selector.css.snap b/crates/biome_css_formatter/tests/specs/css/pseudo/pseudo_element_selector.css.snap
@@ -38,6 +38,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css

diff --git a/crates/biome_css_formatter/tests/specs/css/pseudo/where.css.snap b/crates/biome_css_formatter/tests/specs/css/pseudo/where.css.snap
@@ -42,6 +42,7 @@ Indent style: Tab
 Indent width: 2
 Line ending: LF
 Line width: 80
+Quote style: Double Quotes
 -----
 
 ```css