feat(html): add experimental-html feature flag to enable html file …

…handler
biomejs · Sep 18, 2024 · 2c353c9 · 2c353c9
1 parent 2c8ff7f
commit 2c353c9
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 12 deletions.
diff --git a/crates/biome_cli/Cargo.toml b/crates/biome_cli/Cargo.toml
@@ -77,7 +77,8 @@ regex                = { workspace = true }
 tokio                = { workspace = true, features = ["io-util"] }
 
 [features]
-docgen = ["bpaf/docgen"]
+docgen            = ["bpaf/docgen"]
+experimental-html = ["biome_service/experimental-html"]
 
 [lints]
 workspace = true
diff --git a/crates/biome_service/Cargo.toml b/crates/biome_service/Cargo.toml
@@ -66,6 +66,7 @@ slotmap                  = { workspace = true, features = ["serde"] }
 tracing                  = { workspace = true, features = ["attributes", "log"] }
 
 [features]
+experimental-html = []
 schema = [
   "dep:schemars",
   "biome_js_analyze/schema",

diff --git a/crates/biome_service/src/file_handlers/html.rs b/crates/biome_service/src/file_handlers/html.rs
@@ -1,3 +1,4 @@
+use biome_analyze::{AnalyzerConfiguration, AnalyzerOptions};
 use biome_formatter::Printed;
 use biome_fs::BiomePath;
 use biome_html_formatter::{format_node, HtmlFormatOptions};
@@ -25,9 +26,9 @@ impl ServiceLanguage for HtmlLanguage {
     type EnvironmentSettings = ();
 
     fn lookup_settings(
-        _languages: &crate::settings::LanguageListSettings,
+        languages: &crate::settings::LanguageListSettings,
     ) -> &crate::settings::LanguageSettings<Self> {
-        todo!()
+        &languages.html
     }
 
     fn resolve_format_options(
@@ -46,10 +47,13 @@ impl ServiceLanguage for HtmlLanguage {
         _linter: Option<&crate::settings::LinterSettings>,
         _overrides: Option<&crate::settings::OverrideSettings>,
         _language: Option<&Self::LinterSettings>,
-        _path: &biome_fs::BiomePath,
+        path: &biome_fs::BiomePath,
         _file_source: &super::DocumentFileSource,
-    ) -> biome_analyze::AnalyzerOptions {
-        todo!()
+    ) -> AnalyzerOptions {
+        AnalyzerOptions {
+            configuration: AnalyzerConfiguration::default(),
+            file_path: path.to_path_buf(),
+        }
     }
 }
 

diff --git a/crates/biome_service/src/file_handlers/mod.rs b/crates/biome_service/src/file_handlers/mod.rs
@@ -144,9 +144,10 @@ impl DocumentFileSource {
         if let Ok(file_source) = GraphqlFileSource::try_from_extension(extension) {
             return Ok(file_source.into());
         }
-        //if let Ok(file_source) = HtmlFileSource::try_from_extension(extension) {
-        //    return Ok(file_source.into());
-        //}
+        #[cfg(feature = "experimental-html")]
+        if let Ok(file_source) = HtmlFileSource::try_from_extension(extension) {
+            return Ok(file_source.into());
+        }
         Err(FileSourceError::UnknownExtension)
     }
 
@@ -170,9 +171,10 @@ impl DocumentFileSource {
         if let Ok(file_source) = GraphqlFileSource::try_from_language_id(language_id) {
             return Ok(file_source.into());
         }
-        //if let Ok(file_source) = HtmlFileSource::try_from_language_id(language_id) {
-        //    return Ok(file_source.into());
-        //}
+        #[cfg(feature = "experimental-html")]
+        if let Ok(file_source) = HtmlFileSource::try_from_language_id(language_id) {
+            return Ok(file_source.into());
+        }
         Err(FileSourceError::UnknownLanguageId)
     }
 
@@ -314,7 +316,10 @@ impl DocumentFileSource {
             DocumentFileSource::Css(_)
             | DocumentFileSource::Graphql(_)
             | DocumentFileSource::Json(_) => true,
+            #[cfg(not(feature = "experimental-html"))]
             DocumentFileSource::Html(_) => false,
+            #[cfg(feature = "experimental-html")]
+            DocumentFileSource::Html(_) => true,
             DocumentFileSource::Unknown => false,
         }
     }

diff --git a/crates/biome_service/src/settings.rs b/crates/biome_service/src/settings.rs
@@ -23,6 +23,7 @@ use biome_formatter::{
 use biome_fs::BiomePath;
 use biome_graphql_formatter::context::GraphqlFormatOptions;
 use biome_graphql_syntax::GraphqlLanguage;
+use biome_html_syntax::HtmlLanguage;
 use biome_js_formatter::context::JsFormatOptions;
 use biome_js_parser::JsParserOptions;
 use biome_js_syntax::{JsFileSource, JsLanguage};
@@ -560,6 +561,7 @@ pub struct LanguageListSettings {
     pub json: LanguageSettings<JsonLanguage>,
     pub css: LanguageSettings<CssLanguage>,
     pub graphql: LanguageSettings<GraphqlLanguage>,
+    pub html: LanguageSettings<HtmlLanguage>,
 }
 
 impl From<JavascriptConfiguration> for LanguageSettings<JsLanguage> {