diff --git a/Cargo.lock b/Cargo.lock index 52a6d0e..df035ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -423,19 +423,6 @@ dependencies = [ "url", ] -[[package]] -name = "lsp-types" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e34d33a8e9b006cd3fc4fe69a921affa097bae4bb65f76271f4644f9a334365" -dependencies = [ - "bitflags 1.3.2", - "serde", - "serde_json", - "serde_repr", - "url", -] - [[package]] name = "memchr" version = "2.8.0" @@ -459,7 +446,6 @@ version = "0.0.2" dependencies = [ "cargo_metadata", "dashmap 6.1.0", - "lsp-types 0.95.1", "mist-codegen", "mist-parser", "serde", @@ -881,7 +867,7 @@ dependencies = [ "dashmap 5.5.3", "futures", "httparse", - "lsp-types 0.94.1", + "lsp-types", "memchr", "serde", "serde_json", diff --git a/crates/analyzer/Cargo.toml b/crates/analyzer/Cargo.toml index 1cc9a3f..6274f4e 100644 --- a/crates/analyzer/Cargo.toml +++ b/crates/analyzer/Cargo.toml @@ -19,4 +19,3 @@ cargo_metadata = "0.23.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -lsp-types = "0.95" diff --git a/crates/analyzer/src/lib.rs b/crates/analyzer/src/lib.rs index 8fa5bcb..853ee1e 100644 --- a/crates/analyzer/src/lib.rs +++ b/crates/analyzer/src/lib.rs @@ -7,10 +7,9 @@ use std::fs; use std::path::{Component, PathBuf}; use std::sync::Arc; -use lsp_types::request::GotoDefinition; use tokio::sync::Mutex; use tower_lsp::jsonrpc::Result; -use tower_lsp::lsp_types::*; +use tower_lsp::lsp_types::{self, *}; use tower_lsp::{Client, LanguageServer, LspService, Server}; use crate::builder::MistDiagnostic; @@ -240,7 +239,7 @@ impl LanguageServer for Backend { .rust_analyzer .lock() .await - .request::(lsp_types::GotoDefinitionParams { + .request::(lsp_types::GotoDefinitionParams { text_document_position_params: lsp_types::TextDocumentPositionParams { position: lsp_types::Position { line: line as u32, diff --git a/crates/analyzer/src/rust_analyzer.rs b/crates/analyzer/src/rust_analyzer.rs index 323de0e..d84d634 100644 --- a/crates/analyzer/src/rust_analyzer.rs +++ b/crates/analyzer/src/rust_analyzer.rs @@ -1,16 +1,16 @@ use std::{collections::HashMap, path::PathBuf, process::Stdio, sync::Arc}; -use lsp_types::{ - ClientCapabilities, InitializeParams, InitializedParams, Url, WorkspaceFolder, - notification::{Initialized, Notification}, - request::{self, Request}, -}; use serde::{Deserialize, Serialize}; use serde_json::{Value, json}; use tokio::{ io::{AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufReader}, sync::{Mutex, mpsc::Sender}, }; +use tower_lsp::lsp_types::{ + self, ClientCapabilities, InitializeParams, InitializedParams, Url, WorkspaceFolder, + notification::{Initialized, Notification}, + request::{self, Request}, +}; #[derive(Deserialize)] pub struct JsonRpcResponse {