feedback and fixups

Author: BenjaminBrienen

crates/rust-analyzer/src/config.rs

@@ -1116,7 +1116,7 @@ pub struct Config {
 
     default_config: &'static DefaultConfigData,
     /// Config node that obtains its initial value during the server initialization and
-    /// by receiving a `lsp_types::DidChangeConfiguration`.
+    /// by receiving a [`lsp_types::DidChangeConfigurationNotification`].
     client_config: (FullConfigInput, ConfigErrors),
 
     /// Config node whose values apply to **every** Rust project.
@@ -2657,8 +2657,6 @@ impl Config {
     }
 
     pub fn snippet_cap(&self) -> Option<SnippetCap> {
-        // FIXME: Also detect the proposed lsp version at caps.workspace.workspaceEdit.snippetEditSupport
-        // once lsp-types has it.
         SnippetCap::new(self.snippet_text_edit())
     }
 

crates/rust-analyzer/src/handlers/dispatch.rs

@@ -282,9 +282,7 @@ impl RequestDispatcher<'_> {
         R::Params: DeserializeOwned + fmt::Debug,
     {
         let req = self.req.take_if(|it| it.method == R::METHOD.to_string())?;
-        // FIXME: use `as_str()` when that is possible
-        // https://github.com/ribru17/gen-lsp-types/issues/9
-        let res = crate::from_json(Box::new(R::METHOD.to_string()).leak(), &req.params);
+        let res = crate::from_json(R::METHOD.to_string(), &req.params);
         match res {
             Ok(params) => {
                 let panic_context =

crates/rust-analyzer/src/handlers/notification.rs

@@ -554,7 +554,7 @@ pub(crate) fn handle_run_flycheck(
 
 pub(crate) fn handle_abort_run_test(state: &mut GlobalState, _: ()) -> anyhow::Result<()> {
     if state.test_run_session.take().is_some() {
-        state.send_notification::<lsp_ext::EndRunTest>(());
+        state.send_notification::<lsp_ext::EndRunTestNotification>(());
     }
     Ok(())
 }

crates/rust-analyzer/src/handlers/request.rs

@@ -18,9 +18,9 @@ use lsp_server::ErrorCode;
 use lsp_types::{
     CallHierarchyIncomingCall, CallHierarchyIncomingCallsParams, CallHierarchyItem,
     CallHierarchyOutgoingCall, CallHierarchyOutgoingCallsParams, CallHierarchyPrepareParams,
-    CodeLens, CompletionItem, Contents, FoldingRange, FoldingRangeParams, InlayHint,
-    InlayHintParams, Location, LocationLink, Position, PrepareRenameResult, Range, RenameParams,
-    ResourceOperationKind, SemanticTokens, SemanticTokensDeltaParams,
+    CodeLens, CompletionItem, Contents, DocumentChange, FoldingRange, FoldingRangeParams,
+    InlayHint, InlayHintParams, Location, LocationLink, Position, PrepareRenameResult, Range,
+    RenameParams, ResourceOperationKind, SemanticTokens, SemanticTokensDeltaParams,
     SemanticTokensDeltaRequestResponse, SemanticTokensParams, SemanticTokensRangeParams,
     SymbolInformation, SymbolTag, TextDocumentIdentifier, Uri, WorkspaceEdit,
 };
@@ -252,7 +252,7 @@ pub(crate) fn handle_run_test(
     params: lsp_ext::RunTestParams,
 ) -> anyhow::Result<()> {
     if let Some(_session) = state.test_run_session.take() {
-        state.send_notification::<lsp_ext::EndRunTest>(());
+        state.send_notification::<lsp_ext::EndRunTestNotification>(());
     }
 
     let mut handles = vec![];
@@ -1416,7 +1416,7 @@ pub(crate) fn handle_rename(
 
     if let Some(changes) = workspace_edit.document_changes.as_ref() {
         for change in changes {
-            resource_ops_supported(&snap.config, resolve_resource_op(change))?;
+            resource_ops_supported(&snap.config, change)?;
         }
     }
 
@@ -1542,8 +1542,8 @@ pub(crate) fn handle_code_action(
         let changes = code_action.edit.as_ref().and_then(|it| it.document_changes.as_ref());
         if let Some(changes) = changes {
             for change in changes {
-                if let lsp_ext::SnippetDocumentChangeOperation::Change(res_op) = change {
-                    resource_ops_supported(&snap.config, resolve_resource_op(res_op))?
+                if let lsp_ext::SnippetDocumentChangeOperation::Change(change) = change {
+                    resource_ops_supported(&snap.config, change)?
                 }
             }
         }
@@ -1645,8 +1645,8 @@ pub(crate) fn handle_code_action_resolve(
         && let Some(changes) = edit.document_changes.as_ref()
     {
         for change in changes {
-            if let lsp_ext::SnippetDocumentChangeOperation::Change(res_op) = change {
-                resource_ops_supported(&snap.config, resolve_resource_op(res_op))?
+            if let lsp_ext::SnippetDocumentChangeOperation::Change(change) = change {
+                resource_ops_supported(&snap.config, change)?
             }
         }
     }
@@ -2669,14 +2669,20 @@ fn crate_path(root_file_path: &VfsPath) -> Option<VfsPath> {
     None
 }
 
-fn resource_ops_supported(config: &Config, kind: ResourceOperationKind) -> anyhow::Result<()> {
-    if !matches!(config.workspace_edit_resource_operations(), Some(resops) if resops.contains(&kind))
+fn resource_ops_supported(config: &Config, kind: &DocumentChange) -> anyhow::Result<()> {
+    let op = match kind {
+        lsp_types::DocumentChange::CreateFile(_) => ResourceOperationKind::Create,
+        lsp_types::DocumentChange::RenameFile(_) => ResourceOperationKind::Rename,
+        lsp_types::DocumentChange::DeleteFile(_) => ResourceOperationKind::Delete,
+        lsp_types::DocumentChange::TextDocumentEdit(_) => return Ok(()),
+    };
+    if !matches!(config.workspace_edit_resource_operations(), Some(resops) if resops.contains(&op))
     {
         return Err(LspError::new(
             ErrorCode::RequestFailed as i32,
             format!(
                 "Client does not support {} capability.",
-                match kind {
+                match op {
                     ResourceOperationKind::Create => "create",
                     ResourceOperationKind::Rename => "rename",
                     ResourceOperationKind::Delete => "delete",
@@ -2689,15 +2695,6 @@ fn resource_ops_supported(config: &Config, kind: ResourceOperationKind) -> anyho
     Ok(())
 }
 
-fn resolve_resource_op(op: &lsp_types::DocumentChange) -> ResourceOperationKind {
-    match op {
-        lsp_types::DocumentChange::CreateFile(_) => ResourceOperationKind::Create,
-        lsp_types::DocumentChange::RenameFile(_) => ResourceOperationKind::Rename,
-        lsp_types::DocumentChange::DeleteFile(_) => ResourceOperationKind::Delete,
-        lsp_types::DocumentChange::TextDocumentEdit(_) => todo!(),
-    }
-}
-
 pub(crate) fn diff(left: &str, right: &str) -> TextEdit {
     use dissimilar::Chunk;
 

crates/rust-analyzer/src/lsp/capabilities.rs

@@ -470,6 +470,8 @@ impl ClientCapabilities {
     }
 
     pub fn snippet_text_edit(&self) -> bool {
+        // FIXME: apply https://github.com/rust-lang/rust-analyzer/pull/22088
+        // self.0.workspace.unwrap().workspace_edit.unwrap().snippet_edit_support
         self.experimental_bool("snippetTextEdit")
     }