refactor(oxfmt/lsp): move lsp code to apps/oxfmt, remove lsp formatter feature flag

apps/oxfmt/Cargo.toml

@@ -28,9 +28,10 @@ doctest = false
 
 [dependencies]
 oxc_allocator = { workspace = true, features = ["pool"] }
+oxc_data_structures = { workspace = true, features = ["rope"] }
 oxc_diagnostics = { workspace = true }
 oxc_formatter = { workspace = true }
-oxc_language_server = { workspace = true, default-features = false, features = ["formatter"] }
+oxc_language_server = { workspace = true, default-features = false }
 oxc_napi = { workspace = true }
 oxc_parser = { workspace = true }
 oxc_span = { workspace = true }
@@ -40,16 +41,19 @@ cow-utils = { workspace = true }
 editorconfig-parser = { workspace = true }
 ignore = { workspace = true, features = ["simd-accel"] }
 json-strip-comments = { workspace = true }
+log = { workspace = true }
 miette = { workspace = true }
 phf = { workspace = true, features = ["macros"] }
 rayon = { workspace = true }
+serde = { workspace = true }
 serde_json = { workspace = true }
 simdutf8 = { workspace = true }
 sort-package-json = { workspace = true }
 oxc-toml = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = [] } # Omit the `regex` feature
+tower-lsp-server = { workspace = true, features = ["proposed"] }
 
 # NAPI dependencies (conditional on napi feature)
 napi = { workspace = true, features = ["async", "serde-json"], optional = true }
@@ -58,6 +62,9 @@ napi-derive = { workspace = true, optional = true }
 [build-dependencies]
 napi-build = { workspace = true }
 
+[dev-dependencies]
+insta = { workspace = true }
+
 [target.'cfg(not(any(target_os = "linux", target_os = "freebsd", target_arch = "arm", target_family = "wasm")))'.dependencies]
 mimalloc-safe = { workspace = true, optional = true, features = ["skip_collect_on_exit"] }
 

apps/oxfmt/src/lsp/mod.rs

@@ -1,11 +1,17 @@
-use oxc_language_server::{ServerFormatterBuilder, run_server};
+use oxc_language_server::run_server;
+
+mod options;
+mod server_formatter;
+#[cfg(test)]
+mod tester;
+const FORMAT_CONFIG_FILES: &[&str; 2] = &[".oxfmtrc.json", ".oxfmtrc.jsonc"];
 
 /// Run the language server
 pub async fn run_lsp() {
     run_server(
         "oxfmt".to_string(),
         env!("CARGO_PKG_VERSION").to_string(),
-        vec![Box::new(ServerFormatterBuilder)],
+        vec![Box::new(server_formatter::ServerFormatterBuilder)],
     )
     .await;
 }

crates/oxc_language_server/src/formatter/server_formatter.rs → apps/oxfmt/src/lsp/server_formatter.rs

@@ -11,11 +11,12 @@ use oxc_formatter::{
 use oxc_parser::Parser;
 use tower_lsp_server::ls_types::{Pattern, Position, Range, ServerCapabilities, TextEdit, Uri};
 
-use crate::{
-    capabilities::Capabilities,
-    formatter::{FORMAT_CONFIG_FILES, options::FormatOptions as LSPFormatOptions},
-    tool::{Tool, ToolBuilder, ToolRestartChanges},
+use crate::lsp::{FORMAT_CONFIG_FILES, options::FormatOptions as LSPFormatOptions};
+
+use oxc_language_server::{
+    Capabilities,
     utils::normalize_path,
+    {Tool, ToolBuilder, ToolRestartChanges},
 };
 
 pub struct ServerFormatterBuilder;
@@ -370,7 +371,8 @@ fn load_ignore_paths(cwd: &Path) -> Vec<PathBuf> {
 
 #[cfg(test)]
 mod tests_builder {
-    use crate::{ServerFormatterBuilder, ToolBuilder, capabilities::Capabilities};
+    use crate::lsp::server_formatter::ServerFormatterBuilder;
+    use oxc_language_server::{Capabilities, ToolBuilder};
 
     #[test]
     fn test_server_capabilities() {
@@ -392,7 +394,7 @@ mod test_watchers {
     const FAKE_DIR: &str = "fixtures/formatter/watchers";
 
     mod init_watchers {
-        use crate::formatter::{server_formatter::test_watchers::FAKE_DIR, tester::Tester};
+        use crate::lsp::{server_formatter::test_watchers::FAKE_DIR, tester::Tester};
         use serde_json::json;
 
         #[test]
@@ -432,10 +434,8 @@ mod test_watchers {
     }
 
     mod handle_configuration_change {
-        use crate::{
-            ToolRestartChanges,
-            formatter::{server_formatter::test_watchers::FAKE_DIR, tester::Tester},
-        };
+        use crate::lsp::{server_formatter::test_watchers::FAKE_DIR, tester::Tester};
+        use oxc_language_server::ToolRestartChanges;
         use serde_json::json;
 
         #[test]
@@ -465,7 +465,7 @@ mod tests {
     use serde_json::json;
 
     use super::compute_minimal_text_edit;
-    use crate::formatter::tester::Tester;
+    use crate::lsp::tester::Tester;
 
     #[test]
     #[should_panic(expected = "assertion failed")]
@@ -551,7 +551,7 @@ mod tests {
     #[test]
     fn test_formatter() {
         Tester::new(
-            "fixtures/formatter/basic",
+            "test/fixtures/lsp/basic",
             json!({
                 "fmt.experimental": true
             }),
@@ -562,7 +562,7 @@ mod tests {
     #[test]
     fn test_root_config_detection() {
         Tester::new(
-            "fixtures/formatter/root_config",
+            "test/fixtures/lsp/root_config",
             json!({
                 "fmt.experimental": true
             }),
@@ -573,7 +573,7 @@ mod tests {
     #[test]
     fn test_custom_config_path() {
         Tester::new(
-            "fixtures/formatter/custom_config_path",
+            "test/fixtures/lsp/custom_config_path",
             json!({
                 "fmt.experimental": true,
                 "fmt.configPath": "./format.json",
@@ -585,7 +585,7 @@ mod tests {
     #[test]
     fn test_ignore_files() {
         Tester::new(
-            "fixtures/formatter/ignore-file",
+            "test/fixtures/lsp/ignore-file",
             json!({
                 "fmt.experimental": true
             }),
@@ -596,7 +596,7 @@ mod tests {
     #[test]
     fn test_ignore_pattern() {
         Tester::new(
-            "fixtures/formatter/ignore-pattern",
+            "test/fixtures/lsp/ignore-pattern",
             json!({
                 "fmt.experimental": true
             }),

crates/oxc_language_server/src/formatter/snapshots/fixtures_formatter_basic@basic.ts.snap → apps/oxfmt/src/lsp/snapshots/test_fixtures_lsp_basic@basic.ts.snap

@@ -1,8 +1,8 @@
 ---
-source: crates/oxc_language_server/src/formatter/tester.rs
+source: apps/oxfmt/src/lsp/tester.rs
 ---
 ========================================
-File: fixtures/formatter/basic/basic.ts
+File: test/fixtures/lsp/basic/basic.ts
 ========================================
 Range: Range {
     start: Position {

crates/oxc_language_server/src/formatter/snapshots/fixtures_formatter_root_config@semicolons-as-needed.ts.snap → apps/oxfmt/src/lsp/snapshots/test_fixtures_lsp_custom_config_path@semicolons-as-needed.ts.snap

@@ -1,8 +1,8 @@
 ---
-source: crates/oxc_language_server/src/formatter/tester.rs
+source: apps/oxfmt/src/lsp/tester.rs
 ---
 ========================================
-File: fixtures/formatter/root_config/semicolons-as-needed.ts
+File: test/fixtures/lsp/custom_config_path/semicolons-as-needed.ts
 ========================================
 Range: Range {
     start: Position {

crates/oxc_language_server/src/formatter/snapshots/fixtures_formatter_ignore-file@ignored.ts_not-ignored.js.snap → apps/oxfmt/src/lsp/snapshots/test_fixtures_lsp_ignore-file@ignored.ts_not-ignored.js.snap

@@ -1,12 +1,12 @@
 ---
-source: crates/oxc_language_server/src/formatter/tester.rs
+source: apps/oxfmt/src/lsp/tester.rs
 ---
 ========================================
-File: fixtures/formatter/ignore-file/ignored.ts
+File: test/fixtures/lsp/ignore-file/ignored.ts
 ========================================
 File is ignored
 ========================================
-File: fixtures/formatter/ignore-file/not-ignored.js
+File: test/fixtures/lsp/ignore-file/not-ignored.js
 ========================================
 Range: Range {
     start: Position {

crates/oxc_language_server/src/formatter/snapshots/fixtures_formatter_ignore-pattern@ignored.ts_not-ignored.js.snap → apps/oxfmt/src/lsp/snapshots/test_fixtures_lsp_ignore-pattern@ignored.ts_not-ignored.js.snap

@@ -1,12 +1,12 @@
 ---
-source: crates/oxc_language_server/src/formatter/tester.rs
+source: apps/oxfmt/src/lsp/tester.rs
 ---
 ========================================
-File: fixtures/formatter/ignore-pattern/ignored.ts
+File: test/fixtures/lsp/ignore-pattern/ignored.ts
 ========================================
 File is ignored
 ========================================
-File: fixtures/formatter/ignore-pattern/not-ignored.js
+File: test/fixtures/lsp/ignore-pattern/not-ignored.js
 ========================================
 Range: Range {
     start: Position {

crates/oxc_language_server/src/formatter/snapshots/fixtures_formatter_custom_config_path@semicolons-as-needed.ts.snap → apps/oxfmt/src/lsp/snapshots/test_fixtures_lsp_root_config@semicolons-as-needed.ts.snap

@@ -1,8 +1,8 @@
 ---
-source: crates/oxc_language_server/src/formatter/tester.rs
+source: apps/oxfmt/src/lsp/tester.rs
 ---
 ========================================
-File: fixtures/formatter/custom_config_path/semicolons-as-needed.ts
+File: test/fixtures/lsp/root_config/semicolons-as-needed.ts
 ========================================
 Range: Range {
     start: Position {

crates/oxc_language_server/src/formatter/tester.rs → apps/oxfmt/src/lsp/tester.rs

@@ -2,11 +2,8 @@ use std::{fmt::Write, path::PathBuf};
 
 use tower_lsp_server::ls_types::{TextEdit, Uri};
 
-use crate::{
-    ToolRestartChanges,
-    formatter::server_formatter::{ServerFormatter, ServerFormatterBuilder},
-    tool::Tool,
-};
+use crate::lsp::server_formatter::{ServerFormatter, ServerFormatterBuilder};
+use oxc_language_server::{Tool, ToolRestartChanges};
 
 /// Given a file path relative to the crate root directory, return the absolute path of the file.
 pub fn get_file_path(relative_file_path: &str) -> PathBuf {

crates/oxc_language_server/Cargo.toml

@@ -28,15 +28,12 @@ doctest = false
 oxc_allocator = { workspace = true, optional = true }
 oxc_data_structures = { workspace = true, features = ["rope"], optional = true }
 oxc_diagnostics = { workspace = true, optional = true }
-oxc_formatter = { workspace = true, optional = true }
 oxc_linter = { workspace = true, optional = true }
-oxc_parser = { workspace = true, optional = true }
 
 #
 env_logger = { workspace = true, features = ["humantime"] }
 futures = { workspace = true }
 ignore = { workspace = true, features = ["simd-accel"], optional = true }
-json-strip-comments = { workspace = true }
 log = { workspace = true }
 papaya = { workspace = true }
 rustc-hash = { workspace = true }
@@ -50,7 +47,7 @@ insta = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "io-util", "macros"] }
 
 [features]
-default = ["linter", "formatter"]
+default = ["linter"]
 linter = [
   "dep:oxc_allocator",
   "dep:oxc_data_structures",
@@ -59,11 +56,3 @@ linter = [
   #
   "dep:ignore",
 ]
-formatter = [
-  "dep:oxc_allocator",
-  "dep:oxc_data_structures",
-  "dep:oxc_formatter",
-  "dep:oxc_parser",
-  #
-  "dep:ignore",
-]

crates/oxc_language_server/src/lib.rs

@@ -4,20 +4,16 @@ use tower_lsp_server::{LspService, Server, ls_types::ServerInfo};
 mod backend;
 mod capabilities;
 mod file_system;
-#[cfg(feature = "formatter")]
-mod formatter;
 #[cfg(feature = "linter")]
 mod linter;
 mod options;
 #[cfg(test)]
 mod tests;
 mod tool;
-mod utils;
+pub mod utils;
 mod worker;
 
-use crate::backend::Backend;
-#[cfg(feature = "formatter")]
-pub use crate::formatter::ServerFormatterBuilder;
+pub use crate::capabilities::Capabilities;
 #[cfg(feature = "linter")]
 pub use crate::linter::ServerLinterBuilder;
 pub use crate::tool::{Tool, ToolBuilder, ToolRestartChanges};
@@ -36,7 +32,11 @@ pub async fn run_server(
     let stdout = tokio::io::stdout();
 
     let (service, socket) = LspService::build(|client| {
-        Backend::new(client, ServerInfo { name: server_name, version: Some(server_version) }, tools)
+        crate::backend::Backend::new(
+            client,
+            ServerInfo { name: server_name, version: Some(server_version) },
+            tools,
+        )
     })
     .finish();
 

crates/oxc_language_server/src/main.rs

@@ -3,8 +3,6 @@ async fn main() {
     #[expect(clippy::vec_init_then_push)]
     let tools: Vec<Box<dyn oxc_language_server::ToolBuilder>> = {
         let mut v: Vec<Box<dyn oxc_language_server::ToolBuilder>> = Vec::new();
-        #[cfg(feature = "formatter")]
-        v.push(Box::new(oxc_language_server::ServerFormatterBuilder));
         #[cfg(feature = "linter")]
         v.push(Box::new(oxc_language_server::ServerLinterBuilder));
         v