Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions apps/oxfmt/src/lsp/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
use std::path::{Path, PathBuf};
use std::{
path::{Path, PathBuf},
sync::Arc,
};

use oxc_language_server::{LanguageId, run_server};
use tower_lsp_server::ls_types::Uri;
Expand Down Expand Up @@ -51,10 +54,10 @@ pub async fn run_lsp(js_config_loader: JsConfigLoaderCb, external_formatter: Ext
run_server(
"oxfmt".to_string(),
env!("CARGO_PKG_VERSION").to_string(),
vec![Box::new(server_formatter::ServerFormatterBuilder::new(
Arc::new(server_formatter::ServerFormatterBuilder::new(
js_config_loader,
external_formatter,
))],
)),
)
.await;
}
6 changes: 4 additions & 2 deletions apps/oxlint/src/lsp/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use std::sync::Arc;

use oxc_linter::ExternalLinter;

#[cfg(feature = "napi")]
Expand All @@ -21,11 +23,11 @@ pub async fn run_lsp(
oxc_language_server::run_server(
"oxlint".to_string(),
env!("CARGO_PKG_VERSION").to_string(),
vec![Box::new(crate::lsp::server_linter::ServerLinterBuilder::new(
Arc::new(crate::lsp::server_linter::ServerLinterBuilder::new(
external_linter,
#[cfg(feature = "napi")]
js_config_loader,
))],
)),
)
.await;
}
10 changes: 5 additions & 5 deletions crates/oxc_language_server/src/backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ impl LanguageServer for Backend {

let mut capabilities = Capabilities::from(params.capabilities);
let mut server_capabilities = server_capabilities();
for tool_builder in self.worker_manager.read_tool_builders() {
tool_builder.server_capabilities(&mut server_capabilities, &mut capabilities);
}
self.worker_manager
.read_tool_builder()
.server_capabilities(&mut server_capabilities, &mut capabilities);

info!("initialize: {options:?}");
info!(
Expand Down Expand Up @@ -906,11 +906,11 @@ impl Backend {
/// The Backend will manage multiple [WorkspaceWorker]s and their configurations.
/// It also holds the capabilities of the language server and an in-memory file system.
/// The client is used to communicate with the LSP client.
pub fn new(client: Client, server_info: ServerInfo, tools: Vec<Box<dyn ToolBuilder>>) -> Self {
pub fn new(client: Client, server_info: ServerInfo, tool: Arc<dyn ToolBuilder>) -> Self {
Self {
client,
server_info,
worker_manager: WorkerManager::new(Arc::from(tools)),
worker_manager: WorkerManager::new(tool),
capabilities: OnceCell::new(),
file_system: Arc::new(RwLock::new(LSPFileSystem::default())),
}
Expand Down
10 changes: 4 additions & 6 deletions crates/oxc_language_server/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use std::sync::Arc;

use rustc_hash::FxBuildHasher;
use tower_lsp_server::ls_types::Uri;
use tower_lsp_server::{LspService, Server, ls_types::ServerInfo};
Expand Down Expand Up @@ -32,19 +34,15 @@ impl<'a> TextDocument<'a> {
}

/// Run the language server
pub async fn run_server(
server_name: String,
server_version: String,
tools: Vec<Box<dyn ToolBuilder>>,
) {
pub async fn run_server(server_name: String, server_version: String, tool: Arc<dyn ToolBuilder>) {
let stdin = tokio::io::stdin();
let stdout = tokio::io::stdout();

let (service, socket) = LspService::build(|client| {
crate::backend::Backend::new(
client,
ServerInfo { name: server_name, version: Some(server_version) },
tools,
tool,
)
})
.finish();
Expand Down
Loading
Loading