@@ -1136,20 +1136,23 @@ impl Client {
11361136 Some(self.call::<lsp::request::CodeActionRequest>(params))
11371137 }
11381138
1139+ pub fn supports_rename(&self) -> bool {
1140+ let capabilities = self.capabilities.get().unwrap();
1141+ matches!(
1142+ capabilities.rename_provider,
1143+ Some(lsp::OneOf::Left(true) | lsp::OneOf::Right(_))
1144+ )
1145+ }
1146+
11391147 pub fn rename_symbol(
11401148 &self,
11411149 text_document: lsp::TextDocumentIdentifier,
11421150 position: lsp::Position,
11431151 new_name: String,
11441152 ) -> Option<impl Future<Output = Result<lsp::WorkspaceEdit>>> {
1145− let capabilities = self.capabilities.get().unwrap();
1146−
1147− // Return early if the language server does not support renaming.
1148− match capabilities.rename_provider {
1149− Some(lsp::OneOf::Left(true)) | Some(lsp::OneOf::Right(_)) => (),
1150− // None | Some(false)
1151− _ => return None,
1152− };
1153+ if !self.supports_rename() {
1154+ return None;
1155+ }
11531156
11541157 let params = lsp::RenameParams {
11551158 text_document_position: lsp::TextDocumentPositionParams {