Move ExperimentalFeatures to cli.rs and simplify implementation

Co-authored-by: felix-andreas-copilot <[email protected]>

Author: Copilot

crates/roughly/src/cli.rs

@@ -1,7 +1,6 @@
 use {
     crate::{
         config, diagnostics,
-        experimental::ExperimentalFeatures,
         format::{self, LineEnding},
         index,
         lsp_types::{self, DiagnosticSeverity},
@@ -16,6 +15,55 @@ use {
     },
 };
 
+//
+// EXPERIMENTAL FEATURES
+//
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct ExperimentalFeatures {
+    pub unused: bool,
+    pub range_formatting: bool,
+}
+
+impl ExperimentalFeatures {
+    pub fn new() -> Self {
+        Self {
+            unused: false,
+            range_formatting: false,
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        !self.unused && !self.range_formatting
+    }
+}
+
+impl Default for ExperimentalFeatures {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+pub fn parse_experimental_features(feature_strings: &[String]) -> ExperimentalFeatures {
+    let mut features = ExperimentalFeatures::new();
+
+    for feature_str in feature_strings {
+        match feature_str.as_str() {
+            "all" => {
+                features.unused = true;
+                features.range_formatting = true;
+            }
+            "unused" => features.unused = true,
+            "range_formatting" => features.range_formatting = true,
+            _ => {
+                warn(&format!("unknown experimental feature: {}", feature_str));
+            }
+        }
+    }
+
+    features
+}
+
 //
 // LOG
 //

crates/roughly/src/diagnostics.rs

@@ -4,8 +4,8 @@ mod unused;
 
 use {
     crate::{
+        cli::ExperimentalFeatures,
         config::{self, Case},
-        experimental::{ExperimentalFeature, ExperimentalFeatures},
         lsp_types::{Diagnostic, DiagnosticSeverity},
         utils,
     },
@@ -37,7 +37,7 @@ pub fn analyze(node: Node, rope: &Rope, config: Config, full: bool) -> Vec<Diagn
 
     if full && !has_syntax_errors {
         #[allow(clippy::collapsible_if)]
-        if config.experimental_features.has(ExperimentalFeature::Unused) {
+        if config.experimental_features.unused {
             match unused::analyze(node, rope) {
                 Ok(diags) => diagnostics.extend(diags),
                 Err(error) => {

crates/roughly/src/experimental.rs

@@ -4,7 +4,6 @@ pub mod cli;
 pub mod completions;
 pub mod config;
 pub mod diagnostics;
-pub mod experimental;
 pub mod format;
 pub mod index;
 pub mod server;

crates/roughly/src/lib.rs

@@ -1,8 +1,7 @@
 use {
     clap::{Parser, Subcommand},
     roughly::{
-        cli::{self, CheckError, DebugError, FmtError},
-        experimental::ExperimentalFeatures,
+        cli::{self, parse_experimental_features, CheckError, DebugError, FmtError},
     },
     std::{path::PathBuf, process::ExitCode},
     tracing_subscriber::prelude::*,
@@ -22,10 +21,7 @@ fn main() -> ExitCode {
     let cli = Cli::parse();
 
     // Parse experimental features and warn about unknown ones
-    let (experimental_features, unknown_features) = ExperimentalFeatures::from_strings(&cli.experimental_features);
-    for unknown in &unknown_features {
-        eprintln!("warning: unknown experimental feature: {}", unknown);
-    }
+    let experimental_features = parse_experimental_features(&cli.experimental_features);
 
     match cli.command {
         Command::Check { files } => match cli::check(files.as_deref(), experimental_features) {

crates/roughly/src/main.rs

@@ -1,9 +1,8 @@
 use {
     crate::{
-        cli, completions,
+        cli::{self, ExperimentalFeatures}, completions,
         config::Config,
         diagnostics,
-        experimental::{ExperimentalFeature, ExperimentalFeatures},
         format::{self, LineEnding},
         index::{self, IndexError},
         lsp_types::{
@@ -139,7 +138,7 @@ impl LanguageServer for ServerState {
                     ..Default::default()
                 }),
                 document_formatting_provider: Some(OneOf::Left(true)),
-                document_range_formatting_provider: Some(OneOf::Left(self.experimental_features.has(ExperimentalFeature::RangeFormatting))),
+                document_range_formatting_provider: Some(OneOf::Left(self.experimental_features.range_formatting)),
                 document_symbol_provider: Some(OneOf::Left(true)),
                 text_document_sync: Some(TextDocumentSyncCapability::Options(
                     TextDocumentSyncOptions {