Skip to content

Commit 94bd39b

Browse files
ah-yuah-yu
committed
tweak
1 parent 0a5a492 commit 94bd39b

File tree

6 files changed

+22
-27
lines changed

6 files changed

+22
-27
lines changed

‎crates/biome_js_formatter/tests/language.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ impl TestFormatLanguage for JsTestFormatLanguage {
8686
.parser
8787
.allow_wrong_line_comments
8888
.unwrap_or_default(),
89-
grit_metavariable: true,
89+
grit_metavariables: true,
9090
};
9191
let css_format_options = CssFormatOptions::default().with_quote_style(
9292
settings

‎crates/biome_js_formatter/tests/prettier_tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ impl JsForeignLanguageFormatter for MultiLanguageFormatter {
2020
fn format(&self, language: JsForeignLanguage, source: &str) -> FormatResult<Document> {
2121
match language {
2222
JsForeignLanguage::Css => {
23-
let parse_options = CssParserOptions::default().allow_grit_metavariables();
23+
let parse_options = CssParserOptions::default().allow_metavariables();
2424
let format_options = CssFormatOptions::default();
2525
let parse = biome_css_parser::parse_css(source, parse_options);
2626
if parse.has_errors() {

‎crates/biome_js_formatter/tests/quick_test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function outerFunctionToForceIndent() {
6969
.with_arrow_parentheses(ArrowParentheses::AsNeeded)
7070
.with_attribute_position(AttributePosition::Multiline);
7171

72-
let css_parse_options = CssParserOptions::default().allow_grit_metavariables();
72+
let css_parse_options = CssParserOptions::default().allow_metavariables();
7373
let css_format_options = CssFormatOptions::default();
7474
let multi_language_formatter = MultiLanguageFormatter {
7575
css_parse_options,

‎crates/biome_js_formatter/tests/spec_test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ impl JsForeignLanguageFormatter for MultiLanguageFormatter {
2121
language: biome_js_formatter::JsForeignLanguage,
2222
source: &str,
2323
) -> biome_formatter::FormatResult<biome_formatter::prelude::Document> {
24-
let css_parse_options = CssParserOptions::default().allow_grit_metavariables();
24+
let css_parse_options = CssParserOptions::default().allow_metavariables();
2525
let css_format_options = CssFormatOptions::default();
2626
match language {
2727
JsForeignLanguage::Css => {

‎crates/biome_service/src/file_handlers/javascript.rs

+17-19
Original file line numberDiff line numberDiff line change
@@ -440,14 +440,13 @@ fn debug_formatter_ir(
440440
.map(|settings| CssParserOptions {
441441
css_modules: settings.css_modules.unwrap_or_default(),
442442
allow_wrong_line_comments: settings.allow_wrong_line_comments.unwrap_or_default(),
443-
grit_metavariable: true,
443+
grit_metavariables: true,
444444
})
445445
.unwrap_or_default();
446446
let css_format_options = settings.format_options::<CssLanguage>(path, document_file_source);
447447
let format_with_errors = settings
448448
.settings()
449-
.map(|settings| settings.formatter.format_with_errors)
450-
.unwrap_or_default();
449+
.is_some_and(|settings| settings.formatter.format_with_errors);
451450
let multi_language_formatter = MultiLanguageFormatter {
452451
css_parse_options,
453452
css_format_options,
@@ -764,23 +763,25 @@ pub(crate) fn fix_all(params: FixAllParams) -> Result<FixFileResult, WorkspaceEr
764763
}
765764
}
766765
None => {
767-
let css_parse_options = workspace
766+
let css_parse_options = params
767+
.workspace
768768
.settings()
769769
.map(|settings| settings.languages.css.parser.clone())
770770
.map(|settings| CssParserOptions {
771771
css_modules: settings.css_modules.unwrap_or_default(),
772772
allow_wrong_line_comments: settings
773773
.allow_wrong_line_comments
774774
.unwrap_or_default(),
775-
grit_metavariable: true,
775+
grit_metavariables: true,
776776
})
777777
.unwrap_or_default();
778-
let css_format_options =
779-
workspace.format_options::<CssLanguage>(biome_path, &document_file_source);
780-
let format_with_errors = workspace
778+
let css_format_options = params
779+
.workspace
780+
.format_options::<CssLanguage>(params.biome_path, &params.document_file_source);
781+
let format_with_errors = params
782+
.workspace
781783
.settings()
782-
.map(|settings| settings.formatter.format_with_errors)
783-
.unwrap_or_default();
784+
.is_some_and(|settings| settings.formatter.format_with_errors);
784785
let multi_language_formatter = MultiLanguageFormatter {
785786
css_parse_options,
786787
css_format_options,
@@ -830,15 +831,14 @@ pub(crate) fn format(
830831
.map(|settings| CssParserOptions {
831832
css_modules: settings.css_modules.unwrap_or_default(),
832833
allow_wrong_line_comments: settings.allow_wrong_line_comments.unwrap_or_default(),
833-
grit_metavariable: true,
834+
grit_metavariables: true,
834835
})
835836
.unwrap_or_default();
836837
let css_format_options =
837838
settings.format_options::<CssLanguage>(biome_path, document_file_source);
838839
let format_with_errors = settings
839840
.settings()
840-
.map(|settings| settings.formatter.format_with_errors)
841-
.unwrap_or_default();
841+
.is_some_and(|settings| settings.formatter.format_with_errors);
842842
let multi_language_formatter = MultiLanguageFormatter {
843843
css_parse_options,
844844
css_format_options,
@@ -871,15 +871,14 @@ pub(crate) fn format_range(
871871
.map(|settings| CssParserOptions {
872872
css_modules: settings.css_modules.unwrap_or_default(),
873873
allow_wrong_line_comments: settings.allow_wrong_line_comments.unwrap_or_default(),
874-
grit_metavariable: true,
874+
grit_metavariables: true,
875875
})
876876
.unwrap_or_default();
877877
let css_format_options =
878878
settings.format_options::<CssLanguage>(biome_path, document_file_source);
879879
let format_with_errors = settings
880880
.settings()
881-
.map(|settings| settings.formatter.format_with_errors)
882-
.unwrap_or_default();
881+
.is_some_and(|settings| settings.formatter.format_with_errors);
883882
let multi_language_formatter = MultiLanguageFormatter {
884883
css_parse_options,
885884
css_format_options,
@@ -930,14 +929,13 @@ pub(crate) fn format_on_type(
930929
.map(|settings| CssParserOptions {
931930
css_modules: settings.css_modules.unwrap_or_default(),
932931
allow_wrong_line_comments: settings.allow_wrong_line_comments.unwrap_or_default(),
933-
grit_metavariable: true,
932+
grit_metavariables: true,
934933
})
935934
.unwrap_or_default();
936935
let css_format_options = settings.format_options::<CssLanguage>(path, document_file_source);
937936
let format_with_errors = settings
938937
.settings()
939-
.map(|settings| settings.formatter.format_with_errors)
940-
.unwrap_or_default();
938+
.is_some_and(|settings| settings.formatter.format_with_errors);
941939
let multi_language_formatter = MultiLanguageFormatter {
942940
css_parse_options,
943941
css_format_options,

‎xtask/bench/src/language.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,7 @@ impl JsForeignLanguageFormatter for MultiLanguageFormatter {
134134
fn format(&self, language: JsForeignLanguage, source: &str) -> FormatResult<Document> {
135135
match language {
136136
JsForeignLanguage::Css => {
137-
let parse = parse_css(
138-
source,
139-
CssParserOptions::default().allow_grit_metavariables(),
140-
);
137+
let parse = parse_css(source, CssParserOptions::default().allow_metavariables());
141138
if parse.has_errors() {
142139
return Err(FormatError::SyntaxError);
143140
}

0 commit comments

Comments
 (0)