switch out lsp-types for gen-lsp-types

Author: BenjaminBrienen

Cargo.lock

@@ -29,7 +29,7 @@ ide-completion.workspace = true
 indexmap.workspace = true
 itertools.workspace = true
 scip = "0.7.1"
-lsp-types = { version = "=0.95.0", features = ["proposed"] }
+lsp-types = { version = "0.4.0", package = "gen-lsp-types" }
 parking_lot = "0.12.4"
 xflags = "0.3.2"
 oorandom = "11.1.5"
@@ -53,6 +53,8 @@ semver.workspace = true
 memchr = "2.7.5"
 cargo_metadata.workspace = true
 process-wrap.workspace = true
+strum = "0.28.0"
+strum_macros = "0.28.0"
 dhat = { version = "0.3.3", optional = true }
 
 cfg.workspace = true

crates/rust-analyzer/Cargo.toml

@@ -14,7 +14,7 @@ use std::{env, fs, path::PathBuf, process::ExitCode, sync::Arc};
 
 use anyhow::Context;
 use lsp_server::Connection;
-use paths::Utf8PathBuf;
+use paths::{Utf8Component, Utf8PathBuf, Utf8Prefix};
 use rust_analyzer::{
     cli::flags,
     config::{Config, ConfigChange, ConfigErrors},
@@ -207,29 +207,18 @@ fn run_server() -> anyhow::Result<()> {
 
     tracing::info!("InitializeParams: {}", initialize_params);
     let lsp_types::InitializeParams {
+        #[expect(deprecated, reason = "migration TODO")]
         root_uri,
-        mut capabilities,
-        workspace_folders,
+        capabilities,
+        workspace_folders_initialize_params,
         initialization_options,
         client_info,
         ..
     } = from_json::<lsp_types::InitializeParams>("InitializeParams", &initialize_params)?;
 
-    // lsp-types has a typo in the `/capabilities/workspace/diagnostics` field, its typoed as `diagnostic`
-    if let Some(val) = initialize_params.pointer("/capabilities/workspace/diagnostics")
-        && let Ok(diag_caps) = from_json::<lsp_types::DiagnosticWorkspaceClientCapabilities>(
-            "DiagnosticWorkspaceClientCapabilities",
-            val,
-        )
-    {
-        tracing::info!("Patching lsp-types workspace diagnostics capabilities: {diag_caps:#?}");
-        capabilities.workspace.get_or_insert_default().diagnostic.get_or_insert(diag_caps);
-    }
-
     let root_path = match root_uri
-        .and_then(|it| it.to_file_path().ok())
+        .map(|it| Utf8PathBuf::from(it.to_string().to_owned()))
         .map(patch_path_prefix)
-        .and_then(|it| Utf8PathBuf::from_path_buf(it).ok())
         .and_then(|it| AbsPathBuf::try_from(it).ok())
     {
         Some(it) => it,
@@ -247,13 +236,19 @@ fn run_server() -> anyhow::Result<()> {
         );
     }
 
-    let workspace_roots = workspace_folders
+    let workspace_roots = workspace_folders_initialize_params
+        .workspace_folders
+        .and_then(|workspaces| match workspaces {
+            lsp_types::WorkspaceFolders::WorkspaceFolderList(workspace_folders) => {
+                Some(workspace_folders)
+            }
+            lsp_types::WorkspaceFolders::Null => None,
+        })
         .map(|workspaces| {
             workspaces
                 .into_iter()
-                .filter_map(|it| it.uri.to_file_path().ok())
+                .map(|it| Utf8PathBuf::from(it.uri.to_string()))
                 .map(patch_path_prefix)
-                .filter_map(|it| Utf8PathBuf::from_path_buf(it).ok())
                 .filter_map(|it| AbsPathBuf::try_from(it).ok())
                 .collect::<Vec<_>>()
         })
@@ -269,12 +264,11 @@ fn run_server() -> anyhow::Result<()> {
 
         if !error_sink.is_empty() {
             use lsp_types::{
-                MessageType, ShowMessageParams,
-                notification::{Notification, ShowMessage},
+                MessageType, Notification as _, ShowMessageNotification, ShowMessageParams,
             };
             let not = lsp_server::Notification::new(
-                ShowMessage::METHOD.to_owned(),
-                ShowMessageParams { typ: MessageType::WARNING, message: error_sink.to_string() },
+                ShowMessageNotification::METHOD.into(),
+                ShowMessageParams { kind: MessageType::Warning, message: error_sink.to_string() },
             );
             connection.sender.send(lsp_server::Message::Notification(not)).unwrap();
         }
@@ -288,7 +282,6 @@ fn run_server() -> anyhow::Result<()> {
             name: String::from("rust-analyzer"),
             version: Some(rust_analyzer::version().to_string()),
         }),
-        offset_encoding: None,
     };
 
     let initialize_result = serde_json::to_value(initialize_result).unwrap();
@@ -325,8 +318,7 @@ fn run_server() -> anyhow::Result<()> {
     Ok(())
 }
 
-fn patch_path_prefix(path: PathBuf) -> PathBuf {
-    use std::path::{Component, Prefix};
+fn patch_path_prefix(path: Utf8PathBuf) -> Utf8PathBuf {
     if cfg!(windows) {
         // VSCode might report paths with the file drive in lowercase, but this can mess
         // with env vars set by tools and build scripts executed by r-a such that it invalidates
@@ -335,17 +327,17 @@ fn patch_path_prefix(path: PathBuf) -> PathBuf {
         // (doing it conditionally is a pain because std::path::Prefix always reports uppercase letters on windows)
         let mut comps = path.components();
         match comps.next() {
-            Some(Component::Prefix(prefix)) => {
+            Some(Utf8Component::Prefix(prefix)) => {
                 let prefix = match prefix.kind() {
-                    Prefix::Disk(d) => {
+                    Utf8Prefix::Disk(d) => {
                         format!("{}:", d.to_ascii_uppercase() as char)
                     }
-                    Prefix::VerbatimDisk(d) => {
+                    Utf8Prefix::VerbatimDisk(d) => {
                         format!(r"\\?\{}:", d.to_ascii_uppercase() as char)
                     }
                     _ => return path,
                 };
-                let mut path = PathBuf::new();
+                let mut path = Utf8PathBuf::new();
                 path.push(prefix);
                 path.extend(comps);
                 path