From 624eb1ee54e759c03d07c06e5e68dec7f36cb519 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 5 Jan 2021 16:57:05 +0300 Subject: More maintainable caps config The idea here is that we preserve client's config as is, without changes. This gets rid of state! --- crates/rust-analyzer/src/to_proto.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/rust-analyzer/src/to_proto.rs') diff --git a/crates/rust-analyzer/src/to_proto.rs b/crates/rust-analyzer/src/to_proto.rs index 999b18351..e0413ec06 100644 --- a/crates/rust-analyzer/src/to_proto.rs +++ b/crates/rust-analyzer/src/to_proto.rs @@ -605,7 +605,7 @@ pub(crate) fn goto_definition_response( src: Option, targets: Vec, ) -> Result { - if snap.config.client_caps.location_link { + if snap.config.location_link() { let links = targets .into_iter() .map(|nav| location_link(snap, src, nav)) @@ -785,7 +785,7 @@ pub(crate) fn unresolved_code_action( assert!(assist.source_change.is_none()); let res = lsp_ext::CodeAction { title: assist.label.to_string(), - group: assist.group.filter(|_| snap.config.client_caps.code_action_group).map(|gr| gr.0), + group: assist.group.filter(|_| snap.config.code_action_group()).map(|gr| gr.0), kind: Some(code_action_kind(assist.id.1)), edit: None, is_preferred: None, @@ -805,7 +805,7 @@ pub(crate) fn resolved_code_action( let res = lsp_ext::CodeAction { edit: Some(snippet_workspace_edit(snap, change)?), title: assist.label.to_string(), - group: assist.group.filter(|_| snap.config.client_caps.code_action_group).map(|gr| gr.0), + group: assist.group.filter(|_| snap.config.code_action_group()).map(|gr| gr.0), kind: Some(code_action_kind(assist.id.1)), is_preferred: None, data: None, -- cgit v1.2.3