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
83 changes: 36 additions & 47 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ smallvec = { version = "1.15.1", features = ["union", "serde"] } # Stack-allocat
tempfile = "3.23.0" # Temporary files
tokio = { version = "1.48.0", default-features = false } # Async runtime
toml = { version = "0.9.8" }
tower-lsp-server = "0.22.1" # LSP server framework
tower-lsp-server = "0.23.0" # LSP server framework
tracing-subscriber = "0.3.20" # Tracing implementation
ureq = { version = "3.1.4", default-features = false } # HTTP client
url = { version = "2.5.7" } # URL parsing
Expand Down
2 changes: 1 addition & 1 deletion crates/oxc_language_server/src/backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use tokio::sync::{OnceCell, RwLock, SetError};
use tower_lsp_server::{
Client, LanguageServer,
jsonrpc::{Error, ErrorCode, Result},
lsp_types::{
ls_types::{
CodeActionParams, CodeActionResponse, ConfigurationItem, Diagnostic,
DidChangeConfigurationParams, DidChangeTextDocumentParams, DidChangeWatchedFilesParams,
DidChangeWorkspaceFoldersParams, DidCloseTextDocumentParams, DidOpenTextDocumentParams,
Expand Down
4 changes: 2 additions & 2 deletions crates/oxc_language_server/src/capabilities.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use tower_lsp_server::lsp_types::{
use tower_lsp_server::ls_types::{
ClientCapabilities, OneOf, SaveOptions, ServerCapabilities, TextDocumentSyncCapability,
TextDocumentSyncKind, TextDocumentSyncOptions, TextDocumentSyncSaveOptions,
WorkspaceFoldersServerCapabilities, WorkspaceServerCapabilities,
Expand Down Expand Up @@ -52,7 +52,7 @@ pub fn server_capabilities() -> ServerCapabilities {

#[cfg(test)]
mod test {
use tower_lsp_server::lsp_types::{
use tower_lsp_server::ls_types::{
ClientCapabilities, DidChangeWatchedFilesClientCapabilities, WorkspaceClientCapabilities,
};

Expand Down
2 changes: 1 addition & 1 deletion crates/oxc_language_server/src/file_system.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use tower_lsp_server::lsp_types::Uri;
use tower_lsp_server::ls_types::Uri;

use crate::ConcurrentHashMap;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ use oxc_formatter::{
get_supported_source_type,
};
use oxc_parser::Parser;
use tower_lsp_server::{
UriExt,
lsp_types::{Pattern, Position, Range, ServerCapabilities, TextEdit, Uri},
};
use tower_lsp_server::ls_types::{Pattern, Position, Range, ServerCapabilities, TextEdit, Uri};

use crate::{
formatter::{FORMAT_CONFIG_FILES, options::FormatOptions as LSPFormatOptions},
Expand Down Expand Up @@ -69,7 +66,7 @@ impl ServerFormatterBuilder {
impl ToolBuilder for ServerFormatterBuilder {
fn server_capabilities(&self, capabilities: &mut ServerCapabilities) {
capabilities.document_formatting_provider =
Some(tower_lsp_server::lsp_types::OneOf::Left(true));
Some(tower_lsp_server::ls_types::OneOf::Left(true));
}
fn build_boxed(&self, root_uri: &Uri, options: serde_json::Value) -> Box<dyn Tool> {
Box::new(ServerFormatterBuilder::build(root_uri, options))
Expand Down Expand Up @@ -380,7 +377,7 @@ mod tests_builder {

#[test]
fn test_server_capabilities() {
use tower_lsp_server::lsp_types::{OneOf, ServerCapabilities};
use tower_lsp_server::ls_types::{OneOf, ServerCapabilities};

let builder = ServerFormatterBuilder;
let mut capabilities = ServerCapabilities::default();
Expand Down
5 changes: 1 addition & 4 deletions crates/oxc_language_server/src/formatter/tester.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
use std::{fmt::Write, path::PathBuf};

use tower_lsp_server::{
UriExt,
lsp_types::{TextEdit, Uri},
};
use tower_lsp_server::ls_types::{TextEdit, Uri};

use crate::{
ToolRestartChanges,
Expand Down
2 changes: 1 addition & 1 deletion crates/oxc_language_server/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use rustc_hash::FxBuildHasher;
use tower_lsp_server::{LspService, Server, lsp_types::ServerInfo};
use tower_lsp_server::{LspService, Server, ls_types::ServerInfo};

mod backend;
mod capabilities;
Expand Down
2 changes: 1 addition & 1 deletion crates/oxc_language_server/src/linter/code_actions.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use log::debug;
use tower_lsp_server::lsp_types::{CodeAction, CodeActionKind, TextEdit, Uri, WorkspaceEdit};
use tower_lsp_server::ls_types::{CodeAction, CodeActionKind, TextEdit, Uri, WorkspaceEdit};

use crate::linter::error_with_position::{FixedContent, LinterCodeAction};

Expand Down
Loading
Loading