feat: follow change requests

Author: PFiS1737

crates/biome_js_syntax/src/file_source.rs

@@ -120,10 +120,9 @@ impl Language {
     Debug, Clone, Default, Copy, Eq, PartialEq, Hash, serde::Serialize, serde::Deserialize,
 )]
 pub enum EmbeddingKind {
-    Astro,
-    // This variant is currently only used to record whether it is an Astro frontmatter,
-    // and in that case, the `indentScriptAndStyle` setting is ignored.
-    AstroFrontmatter,
+    Astro {
+        frontmatter: bool,
+    },
     Vue,
     Svelte,
     #[default]
@@ -132,7 +131,10 @@ pub enum EmbeddingKind {
 
 impl EmbeddingKind {
     pub const fn is_astro(&self) -> bool {
-        matches!(self, Self::Astro)
+        matches!(self, Self::Astro { frontmatter: false })
+    }
+    pub const fn is_astro_frontmatter(&self) -> bool {
+        matches!(self, Self::Astro { frontmatter: true })
     }
     pub const fn is_vue(&self) -> bool {
         matches!(self, Self::Vue)
@@ -204,7 +206,10 @@ impl JsFileSource {
     }
 
     pub fn astro() -> Self {
-        Self::ts().with_embedding_kind(EmbeddingKind::Astro)
+        Self::ts().with_embedding_kind(EmbeddingKind::Astro { frontmatter: false })
+    }
+    pub fn astro_frontmatter() -> Self {
+        Self::ts().with_embedding_kind(EmbeddingKind::Astro { frontmatter: true })
     }
 
     /// Vue file definition

crates/biome_service/src/file_handlers/html.rs

@@ -445,7 +445,8 @@ pub(crate) fn parse_astro_embedded_script(
     settings: &Settings,
 ) -> Option<(EmbeddedSnippet<JsLanguage>, DocumentFileSource)> {
     let content = element.content_token()?;
-    let file_source = JsFileSource::ts().with_embedding_kind(EmbeddingKind::AstroFrontmatter);
+    let file_source =
+        JsFileSource::ts().with_embedding_kind(EmbeddingKind::Astro { frontmatter: true });
     let document_file_source = DocumentFileSource::Js(file_source);
     let options = settings.parse_options::<JsLanguage>(path, &document_file_source);
     let parse = parse_js_with_offset_and_cache(
@@ -493,7 +494,7 @@ pub(crate) fn parse_embedded_script(
             }
             file_source
         } else if html_file_source.is_astro() {
-            JsFileSource::ts().with_embedding_kind(EmbeddingKind::Astro)
+            JsFileSource::ts().with_embedding_kind(EmbeddingKind::Astro { frontmatter: false })
         } else {
             let is_module = element.is_javascript_module().unwrap_or_default();
             if is_module {
@@ -672,8 +673,8 @@ fn format_embedded(
         let mut iter = embedded_nodes.iter();
         let node = iter.find(|node| node.range == range)?;
 
-        let wrap_document = |document: Document, is_astro_frontmatter: bool| {
-            if indent_script_and_style && !is_astro_frontmatter {
+        let wrap_document = |document: Document, should_indent: bool| {
+            if indent_script_and_style && should_indent {
                 let elements = vec![
                     FormatElement::Line(LineMode::Hard),
                     FormatElement::Tag(Tag::StartIndent),
@@ -701,7 +702,7 @@ fn format_embedded(
 
                 Some(wrap_document(
                     formatted.into_document(),
-                    file_source.as_embedding_kind() == &EmbeddingKind::AstroFrontmatter,
+                    !file_source.as_embedding_kind().is_astro_frontmatter(),
                 ))
             }
             DocumentFileSource::Json(_) => {
@@ -710,14 +711,14 @@ fn format_embedded(
                 let node = node.node.clone().embedded_syntax::<JsonLanguage>().clone();
                 let formatted =
                     biome_json_formatter::format_node_with_offset(json_options, &node).ok()?;
-                Some(wrap_document(formatted.into_document(), false))
+                Some(wrap_document(formatted.into_document(), true))
             }
             DocumentFileSource::Css(_) => {
                 let css_options = settings.format_options::<CssLanguage>(biome_path, &node.source);
                 let node = node.node.clone().embedded_syntax::<CssLanguage>();
                 let formatted =
                     biome_css_formatter::format_node_with_offset(css_options, &node).ok()?;
-                Some(wrap_document(formatted.into_document(), false))
+                Some(wrap_document(formatted.into_document(), true))
             }
             _ => None,
         }

crates/biome_service/src/file_handlers/mod.rs

@@ -814,7 +814,7 @@ impl Features {
         match language_hint {
             // TODO: remove match once we remove vue/astro/svelte handlers
             DocumentFileSource::Js(source) => match source.as_embedding_kind() {
-                EmbeddingKind::Astro | EmbeddingKind::AstroFrontmatter => self.astro.capabilities(),
+                EmbeddingKind::Astro { .. } => self.astro.capabilities(),
                 EmbeddingKind::Vue => self.vue.capabilities(),
                 EmbeddingKind::Svelte => self.svelte.capabilities(),
                 EmbeddingKind::None => self.js.capabilities(),

xtask/rules_check/src/lib.rs

@@ -285,7 +285,7 @@ fn assert_lint(
         DocumentFileSource::Js(file_source) => {
             // Temporary support for astro, svelte and vue code blocks
             let (code, file_source) = match file_source.as_embedding_kind() {
-                EmbeddingKind::Astro => (
+                EmbeddingKind::Astro { .. } => (
                     biome_service::file_handlers::AstroFileHandler::input(code),
                     JsFileSource::ts(),
                 ),