[ty] Always register rename provider if client doesn't support dynamic registration (#21789)

MichaReiser · web-flow · commit 326025d45f87 · 2025-12-04T14:40:16.000+01:00
diff --git a/crates/ty_server/src/capabilities.rs b/crates/ty_server/src/capabilities.rs
@@ -1,5 +1,5 @@
 use lsp_types::{
-    ClientCapabilities, CodeActionKind, CodeActionOptions, CompletionOptions,
+    self as types, ClientCapabilities, CodeActionKind, CodeActionOptions, CompletionOptions,
     DeclarationCapability, DiagnosticOptions, DiagnosticServerCapabilities,
     HoverProviderCapability, InlayHintOptions, InlayHintServerCapabilities, MarkupKind,
     NotebookCellSelector, NotebookSelector, OneOf, RenameOptions, SelectionRangeProviderCapability,
@@ -8,11 +8,9 @@ use lsp_types::{
     TextDocumentSyncCapability, TextDocumentSyncKind, TextDocumentSyncOptions,
     TypeDefinitionProviderCapability, WorkDoneProgressOptions,
 };
+use std::str::FromStr;
 
 use crate::PositionEncoding;
-use crate::session::GlobalSettings;
-use lsp_types as types;
-use std::str::FromStr;
 
 bitflags::bitflags! {
     /// Represents the resolved client capabilities for the language server.
@@ -349,7 +347,6 @@ impl ResolvedClientCapabilities {
 pub(crate) fn server_capabilities(
     position_encoding: PositionEncoding,
     resolved_client_capabilities: ResolvedClientCapabilities,
-    global_settings: &GlobalSettings,
 ) -> ServerCapabilities {
     let diagnostic_provider =
         if resolved_client_capabilities.supports_diagnostic_dynamic_registration() {
@@ -368,11 +365,9 @@ pub(crate) fn server_capabilities(
         // dynamically based on the `ty.experimental.rename` setting.
         None
     } else {
-        // Otherwise, we check whether user has enabled rename support via the resolved settings
-        // from initialization options.
-        global_settings
-            .is_rename_enabled()
-            .then(|| OneOf::Right(server_rename_options()))
+        // Otherwise, we always register the rename provider and bail out in `prepareRename` if
+        // the feature is disabled.
+        Some(OneOf::Right(server_rename_options()))
     };
 
     ServerCapabilities {
diff --git a/crates/ty_server/src/server.rs b/crates/ty_server/src/server.rs
@@ -72,15 +72,8 @@ impl Server {
         tracing::debug!("Resolved client capabilities: {resolved_client_capabilities}");
 
         let position_encoding = Self::find_best_position_encoding(&client_capabilities);
-        let server_capabilities = server_capabilities(
-            position_encoding,
-            resolved_client_capabilities,
-            &initialization_options
-                .options
-                .global
-                .clone()
-                .into_settings(),
-        );
+        let server_capabilities =
+            server_capabilities(position_encoding, resolved_client_capabilities);
 
         let version = ruff_db::program_version().unwrap_or("Unknown");
         tracing::info!("Version: {version}");
diff --git a/crates/ty_server/src/server/api/requests/prepare_rename.rs b/crates/ty_server/src/server/api/requests/prepare_rename.rs
@@ -32,6 +32,7 @@ impl BackgroundDocumentRequestHandler for PrepareRenameRequestHandler {
         if snapshot
             .workspace_settings()
             .is_language_services_disabled()
+            || !snapshot.global_settings().is_rename_enabled()
         {
             return Ok(None);
         }
diff --git a/crates/ty_server/src/session.rs b/crates/ty_server/src/session.rs
@@ -564,7 +564,7 @@ impl Session {
             publish_settings_diagnostics(self, client, root);
         }
 
-        if let Some(global_options) = combined_global_options.take() {
+        if let Some(global_options) = combined_global_options {
             let global_settings = global_options.into_settings();
             if global_settings.diagnostic_mode().is_workspace() {
                 for project in self.projects.values_mut() {
diff --git a/crates/ty_server/tests/e2e/snapshots/e2e__initialize__initialization.snap b/crates/ty_server/tests/e2e/snapshots/e2e__initialize__initialization.snap
@@ -48,6 +48,9 @@ expression: initialization_result
         "quickfix"
       ]
     },
+    "renameProvider": {
+      "prepareProvider": true
+    },
     "declarationProvider": true,
     "executeCommandProvider": {
       "commands": [
diff --git a/crates/ty_server/tests/e2e/snapshots/e2e__initialize__initialization_with_workspace.snap b/crates/ty_server/tests/e2e/snapshots/e2e__initialize__initialization_with_workspace.snap
@@ -48,6 +48,9 @@ expression: initialization_result
         "quickfix"
       ]
     },
+    "renameProvider": {
+      "prepareProvider": true
+    },
     "declarationProvider": true,
     "executeCommandProvider": {
       "commands": [

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ impl BackgroundDocumentRequestHandler for PrepareRenameRequestHandler {`
`32`	`32`	`if snapshot`
`33`	`33`	`.workspace_settings()`
`34`	`34`	`.is_language_services_disabled()`
	`35`	`+ \|\| !snapshot.global_settings().is_rename_enabled()`
`35`	`36`	`{`
`36`	`37`	`return Ok(None);`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@ impl Session {`
`564`	`564`	`publish_settings_diagnostics(self, client, root);`
`565`	`565`	`}`
`566`	`566`
`567`		`- if let Some(global_options) = combined_global_options.take() {`
	`567`	`+ if let Some(global_options) = combined_global_options {`
`568`	`568`	`let global_settings = global_options.into_settings();`
`569`	`569`	`if global_settings.diagnostic_mode().is_workspace() {`
`570`	`570`	`for project in self.projects.values_mut() {`