fix merge conflicts

biomejs · Jan 8, 2025 · e76078c · e76078c
1 parent f6edd5c
commit e76078c
Show file tree

Hide file tree

Showing 7 changed files with 116 additions and 97 deletions.
diff --git a/crates/biome_cli/src/execute/migrate/eslint_any_rule_to_biome.rs b/crates/biome_cli/src/execute/migrate/eslint_any_rule_to_biome.rs
diff --git a/crates/biome_configuration/src/analyzer/linter/rules.rs b/crates/biome_configuration/src/analyzer/linter/rules.rs
diff --git a/crates/biome_configuration/src/lib.rs b/crates/biome_configuration/src/lib.rs
@@ -30,7 +30,7 @@ use crate::graphql::{GraphqlFormatterConfiguration, GraphqlLinterConfiguration};
 pub use crate::grit::{grit_configuration, GritConfiguration};
 use crate::javascript::{JsFormatterConfiguration, JsLinterConfiguration};
 use crate::json::{JsonFormatterConfiguration, JsonLinterConfiguration};
-use crate::max_size::MazSize;
+use crate::max_size::MaxSize;
 use crate::vcs::{vcs_configuration, VcsConfiguration};
 pub use analyzer::{
     linter_configuration, LinterConfiguration, RuleConfiguration, RuleFixConfiguration,
@@ -337,7 +337,7 @@ pub struct FilesConfiguration {
     /// this limit will be ignored for performance reasons. Defaults to 1 MiB
     #[bpaf(long("files-max-size"), argument("NUMBER"))]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub max_size: Option<MazSize>,
+    pub max_size: Option<MaxSize>,
 
     /// Tells Biome to not emit diagnostics when handling files that doesn't know
     #[bpaf(long("files-ignore-unknown"), argument("true|false"), optional)]

diff --git a/crates/biome_js_syntax/Cargo.toml b/crates/biome_js_syntax/Cargo.toml
@@ -15,7 +15,7 @@ biome_aria          = { workspace = true }
 biome_aria_metadata = { workspace = true }
 biome_rowan         = { workspace = true, features = ["serde"] }
 biome_string_case   = { workspace = true }
-camino            = { workspace = true }
+camino              = { workspace = true }
 enumflags2          = { workspace = true }
 schemars            = { workspace = true, optional = true }
 serde               = { workspace = true, features = ["derive"] }

diff --git a/crates/biome_service/src/settings.rs b/crates/biome_service/src/settings.rs
@@ -8,7 +8,7 @@ use biome_configuration::diagnostics::InvalidIgnorePattern;
 use biome_configuration::formatter::{FormatWithErrorsEnabled, FormatterEnabled};
 use biome_configuration::html::HtmlConfiguration;
 use biome_configuration::javascript::JsxRuntime;
-use biome_configuration::max_size::MazSize;
+use biome_configuration::max_size::MaxSize;
 use biome_configuration::{
     push_to_analyzer_assist, push_to_analyzer_rules, BiomeDiagnostic, Configuration,
     CssConfiguration, FilesConfiguration, FilesIgnoreUnknownEnabled, FormatterConfiguration,
@@ -579,7 +579,7 @@ pub struct LanguageSettings<L: ServiceLanguage> {
 #[derive(Clone, Default, Debug)]
 pub struct FilesSettings {
     /// File size limit in bytes
-    pub max_size: Option<MazSize>,
+    pub max_size: Option<MaxSize>,
 
     /// gitignore file patterns
     pub git_ignore: Option<Gitignore>,

diff --git a/packages/@biomejs/backend-jsonrpc/src/workspace.ts b/packages/@biomejs/backend-jsonrpc/src/workspace.ts
diff --git a/packages/@biomejs/biome/configuration_schema.json b/packages/@biomejs/biome/configuration_schema.json