chore: migrate from tower-lsp to tower-lsp-server

Upgrade the LSP implementation to use the tower-lsp-server crate,
which provides better maintenance and updated APIs.

Author: omarabid

Cargo.toml

@@ -31,7 +31,7 @@ tabled = "0.20.0"
 terminal_size = "0.4.3"
 clap = { version = "4.5.60", features = ["cargo", "derive"] }
 chrono = { version = "0.4.44", features = ["serde"] }
-tower-lsp = "0.20"
+tower-lsp-server = "0.23.0"
 tokio = { version = "1.49.0", features = ["full"] }
 url = "2.5.8"
 

ci/Cargo.toml

@@ -21,7 +21,7 @@ default = ["termlog"]
 termlog = ["codeinput/termlog"]
 journald = ["codeinput/journald"]
 syslog = ["codeinput/syslog"]
-lsp = ["codeinput/tower-lsp", "codeinput/tokio", "tokio"]
+lsp = ["codeinput/tower-lsp-server", "codeinput/tokio", "tokio"]
 
 [dependencies]
 codeinput = { version = "0.1.0", path = "../codeinput" }

codeinput/Cargo.toml

@@ -94,7 +94,7 @@ tabled = { workspace = true, optional = true }
 terminal_size = { workspace = true, optional = true }
 clap = { workspace = true, optional = true }
 chrono = { version = "0.4.44", features = ["serde"], optional = true }
-tower-lsp = { workspace = true, optional = true }
+tower-lsp-server = { workspace = true, optional = true }
 tokio = { workspace = true, optional = true }
 url = { workspace = true, optional = true }
 

codeinput/src/core/commands/lsp.rs

@@ -4,11 +4,11 @@
 
 use crate::utils::error::Result;
 
-#[cfg(feature = "tower-lsp")]
+#[cfg(feature = "tower-lsp-server")]
 use crate::lsp::server::{run_lsp_server, run_lsp_server_tcp};
 
 /// Run the LSP server
-#[cfg(feature = "tower-lsp")]
+#[cfg(feature = "tower-lsp-server")]
 pub fn run(port: Option<u16>) -> Result<()> {
     let rt = tokio::runtime::Runtime::new()?;
     rt.block_on(async {

codeinput/src/core/commands/mod.rs

@@ -7,5 +7,5 @@ pub mod list_rules;
 pub mod list_tags;
 pub mod parse;
 
-#[cfg(feature = "tower-lsp")]
+#[cfg(feature = "tower-lsp-server")]
 pub mod lsp;

codeinput/src/lib.rs

@@ -12,5 +12,5 @@ pub mod core;
 pub mod utils;
 
 // LSP server module (requires full features - not just types)
-#[cfg(all(not(feature = "types"), feature = "tokio", feature = "tower-lsp"))]
+#[cfg(all(not(feature = "types"), feature = "tokio", feature = "tower-lsp-server"))]
 pub mod lsp;

codeinput/src/lsp/commands.rs

@@ -1,4 +1,4 @@
-use tower_lsp::jsonrpc::Result as LspResult;
+use tower_lsp_server::jsonrpc::Result as LspResult;
 use url::Url;
 
 use crate::core::types::{CodeownersCache, OwnerType};
@@ -9,7 +9,7 @@ use super::types::*;
 impl LspServer {
     pub async fn get_file_ownership_command(&self, uri_str: String) -> LspResult<Option<FileOwnershipInfo>> {
         let Ok(uri) = Url::parse(&uri_str) else {
-            return Err(tower_lsp::jsonrpc::Error::invalid_params("Invalid URI"));
+            return Err(tower_lsp_server::jsonrpc::Error::invalid_params("Invalid URI"));
         };
         Ok(self.get_file_ownership(&uri).await)
     }

codeinput/src/lsp/handlers.rs

@@ -1,20 +1,20 @@
 use serde::Serialize;
 use serde_json::Value;
-use tower_lsp::LanguageServer;
-use tower_lsp::jsonrpc::Result as LspResult;
-use tower_lsp::lsp_types::*;
+use tower_lsp_server::LanguageServer;
+use tower_lsp_server::jsonrpc::Result as LspResult;
+use tower_lsp_server::ls_types::*;
 use url::Url;
 
 use super::server::{LspServer, is_codeowners_file, uri_to_path};
 
-#[tower_lsp::async_trait]
 impl LanguageServer for LspServer {
     async fn initialize(&self, params: InitializeParams) -> LspResult<InitializeResult> {
         // Initialize workspaces from workspace folders
         let workspace_folders = params.workspace_folders.unwrap_or_default();
 
         for folder in workspace_folders {
-            if let Err(e) = self.initialize_workspace(folder.uri, None).await {
+            let Ok(uri_url) = Url::parse(folder.uri.as_str()) else { continue; };
+            if let Err(e) = self.initialize_workspace(uri_url, None).await {
                 self.client
                     .log_message(
                         MessageType::WARNING,
@@ -25,18 +25,23 @@ impl LanguageServer for LspServer {
         }
 
         // If no workspace folders, try to use root_uri
-        if let Some(root_uri) = params.root_uri {
-            if let Err(e) = self.initialize_workspace(root_uri, None).await {
-                self.client
-                    .log_message(
-                        MessageType::WARNING,
-                        format!("Failed to initialize root workspace: {}", e),
-                    )
-                    .await;
+        #[allow(deprecated)]
+        let root_uri = params.root_uri;
+        if let Some(root_uri) = root_uri {
+            if let Ok(uri_url) = Url::parse(root_uri.as_str()) {
+                if let Err(e) = self.initialize_workspace(uri_url, None).await {
+                    self.client
+                        .log_message(
+                            MessageType::WARNING,
+                            format!("Failed to initialize root workspace: {}", e),
+                        )
+                        .await;
+                }
             }
         }
 
         Ok(InitializeResult {
+            offset_encoding: None,
             capabilities: ServerCapabilities {
                 text_document_sync: Some(TextDocumentSyncCapability::Kind(
                     TextDocumentSyncKind::FULL,
@@ -87,7 +92,7 @@ impl LanguageServer for LspServer {
     }
 
     async fn did_open(&self, params: DidOpenTextDocumentParams) {
-        let file_uri = params.text_document.uri;
+        let Ok(file_uri) = Url::parse(params.text_document.uri.as_str()) else { return; };
 
         // Check if this is a CODEOWNERS file and refresh cache if so
         if is_codeowners_file(&file_uri) {
@@ -120,7 +125,7 @@ impl LanguageServer for LspServer {
     }
 
     async fn did_save(&self, params: DidSaveTextDocumentParams) {
-        let file_uri = params.text_document.uri;
+        let Ok(file_uri) = Url::parse(params.text_document.uri.as_str()) else { return; };
 
         // If CODEOWNERS file was saved, refresh the cache
         if is_codeowners_file(&file_uri) {
@@ -147,7 +152,7 @@ impl LanguageServer for LspServer {
     }
 
     async fn hover(&self, params: HoverParams) -> LspResult<Option<Hover>> {
-        let file_uri = params.text_document_position_params.text_document.uri;
+        let Ok(file_uri) = Url::parse(params.text_document_position_params.text_document.uri.as_str()) else { return Ok(None); };
 
         // Get ownership info for this file
         if let Some(info) = self.get_file_ownership(&file_uri).await {
@@ -194,7 +199,7 @@ impl LanguageServer for LspServer {
     }
 
     async fn code_lens(&self, params: CodeLensParams) -> LspResult<Option<Vec<CodeLens>>> {
-        let file_uri = params.text_document.uri;
+        let Ok(file_uri) = Url::parse(params.text_document.uri.as_str()) else { return Ok(None); };
 
         // Get ownership info for this file
         if let Some(info) = self.get_file_ownership(&file_uri).await {
@@ -267,7 +272,7 @@ impl LanguageServer for LspServer {
     }
 
     async fn inlay_hint(&self, params: InlayHintParams) -> LspResult<Option<Vec<InlayHint>>> {
-        let file_uri = params.text_document.uri;
+        let Ok(file_uri) = Url::parse(params.text_document.uri.as_str()) else { return Ok(None); };
 
         let path = uri_to_path(&file_uri);
         let file_path = match path {
@@ -358,7 +363,7 @@ impl LanguageServer for LspServer {
 
     async fn did_change_workspace_folders(&self, params: DidChangeWorkspaceFoldersParams) {
         // Handle removed workspaces - collect URIs first, then remove them
-        let removed_uris: Vec<Url> = params.event.removed.iter().map(|f| f.uri.clone()).collect();
+        let removed_uris: Vec<Url> = params.event.removed.iter().filter_map(|f| Url::parse(f.uri.as_str()).ok()).collect();
         {
             let mut workspaces = self.workspaces.write().await;
             for uri in removed_uris {
@@ -368,7 +373,8 @@ impl LanguageServer for LspServer {
 
         // Handle added workspaces
         for folder in params.event.added {
-            if let Err(e) = self.initialize_workspace(folder.uri, None).await {
+            let Ok(uri_url) = Url::parse(folder.uri.as_str()) else { continue; };
+            if let Err(e) = self.initialize_workspace(uri_url, None).await {
                 self.client
                     .log_message(
                         MessageType::WARNING,
@@ -382,7 +388,7 @@ impl LanguageServer for LspServer {
     async fn execute_command(&self, params: ExecuteCommandParams) -> LspResult<Option<Value>> {
         fn to_value<T: Serialize>(v: T) -> LspResult<Value> {
             serde_json::to_value(v)
-                .map_err(|e| tower_lsp::jsonrpc::Error::invalid_params(e.to_string()))
+                .map_err(|e| tower_lsp_server::jsonrpc::Error::invalid_params(e.to_string()))
         }
 
         match params.command.as_str() {
@@ -392,7 +398,7 @@ impl LanguageServer for LspServer {
                     .first()
                     .and_then(|v| v.as_str())
                     .ok_or_else(|| {
-                        tower_lsp::jsonrpc::Error::invalid_params(
+                        tower_lsp_server::jsonrpc::Error::invalid_params(
                             "Expected a single URI string argument",
                         )
                     })?;
@@ -411,7 +417,7 @@ impl LanguageServer for LspServer {
                 let result = self.list_tags(None).await?;
                 to_value(result).map(Some)
             }
-            _ => Err(tower_lsp::jsonrpc::Error::method_not_found()),
+            _ => Err(tower_lsp_server::jsonrpc::Error::method_not_found()),
         }
     }
 }

codeinput/src/lsp/server.rs

@@ -3,8 +3,8 @@ use std::path::PathBuf;
 use std::sync::Arc;
 
 use tokio::sync::RwLock;
-use tower_lsp::lsp_types::*;
-use tower_lsp::Client;
+use tower_lsp_server::ls_types::*;
+use tower_lsp_server::Client;
 use url::Url;
 
 use crate::core::cache::sync_cache;
@@ -138,8 +138,9 @@ impl LspServer {
 
             // Publish diagnostics for this workspace
             for (file_uri, file_diagnostics) in diagnostics {
+                let Ok(ls_uri) = file_uri.as_str().parse::<Uri>() else { continue; };
                 self.client
-                    .publish_diagnostics(file_uri, file_diagnostics, None)
+                    .publish_diagnostics(ls_uri, file_diagnostics, None)
                     .await;
             }
         }
@@ -163,9 +164,9 @@ pub async fn run_lsp_server() -> Result<()> {
     let stdin = tokio::io::stdin();
     let stdout = tokio::io::stdout();
 
-    let (service, socket) = tower_lsp::LspService::new(|client| LspServer::new(client));
+    let (service, socket) = tower_lsp_server::LspService::new(|client| LspServer::new(client));
 
-    tower_lsp::Server::new(stdin, stdout, socket)
+    tower_lsp_server::Server::new(stdin, stdout, socket)
         .serve(service)
         .await;
 
@@ -184,8 +185,8 @@ pub async fn run_lsp_server_tcp(port: u16) -> Result<()> {
     loop {
         let (stream, _) = listener.accept().await?;
         let (read, write) = tokio::io::split(stream);
-        let (service, socket) = tower_lsp::LspService::new(|client| LspServer::new(client));
+        let (service, socket) = tower_lsp_server::LspService::new(|client| LspServer::new(client));
 
-        tokio::spawn(tower_lsp::Server::new(read, write, socket).serve(service));
+        tokio::spawn(tower_lsp_server::Server::new(read, write, socket).serve(service));
     }
 }