lsp: Use LspCommand.check_capabilities consistently (#14733)

This is a follow-up to #14666 in which I noticed that we don't need that
additional check, since each request will check whether it's supported
via the call to `check_capabilities` before sending the request.


Release Notes:

- N/A
This commit is contained in:
Thorsten Ball 2024-07-18 14:38:27 +02:00 committed by GitHub
parent 80558a3986
commit 76ce1a8f50
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 30 deletions

View file

@ -1354,6 +1354,14 @@ impl LspCommand for GetHover {
type LspRequest = lsp::request::HoverRequest;
type ProtoRequest = proto::GetHover;
fn check_capabilities(&self, capabilities: AdapterServerCapabilities) -> bool {
match capabilities.server_capabilities.hover_provider {
Some(lsp::HoverProviderCapability::Simple(enabled)) => enabled,
Some(lsp::HoverProviderCapability::Options(_)) => true,
None => false,
}
}
fn to_lsp(
&self,
path: &Path,
@ -2062,17 +2070,6 @@ impl GetCodeActions {
})
.unwrap_or(false)
}
pub fn supports_code_actions(capabilities: &ServerCapabilities) -> bool {
capabilities
.code_action_provider
.as_ref()
.map(|options| match options {
lsp::CodeActionProviderCapability::Simple(is_supported) => *is_supported,
lsp::CodeActionProviderCapability::Options(_) => true,
})
.unwrap_or(false)
}
}
#[async_trait(?Send)]