diff options
Diffstat (limited to 'crates/ra_assists/src/assist_ctx.rs')
-rw-r--r-- | crates/ra_assists/src/assist_ctx.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crates/ra_assists/src/assist_ctx.rs b/crates/ra_assists/src/assist_ctx.rs index d88ae4413..82f61bc8f 100644 --- a/crates/ra_assists/src/assist_ctx.rs +++ b/crates/ra_assists/src/assist_ctx.rs | |||
@@ -38,8 +38,7 @@ impl AssistInfo { | |||
38 | 38 | ||
39 | pub(crate) fn into_resolved(self) -> Option<ResolvedAssist> { | 39 | pub(crate) fn into_resolved(self) -> Option<ResolvedAssist> { |
40 | let label = self.label; | 40 | let label = self.label; |
41 | let group_label = self.group_label; | 41 | self.action.map(|action| ResolvedAssist { label, action }) |
42 | self.action.map(|action| ResolvedAssist { label, group_label, action }) | ||
43 | } | 42 | } |
44 | } | 43 | } |
45 | 44 | ||
@@ -100,7 +99,7 @@ impl<'a> AssistCtx<'a> { | |||
100 | label: impl Into<String>, | 99 | label: impl Into<String>, |
101 | f: impl FnOnce(&mut ActionBuilder), | 100 | f: impl FnOnce(&mut ActionBuilder), |
102 | ) -> Option<Assist> { | 101 | ) -> Option<Assist> { |
103 | let label = AssistLabel::new(id, label.into()); | 102 | let label = AssistLabel::new(id, label.into(), None); |
104 | 103 | ||
105 | let mut info = AssistInfo::new(label); | 104 | let mut info = AssistInfo::new(label); |
106 | if self.should_compute_edit { | 105 | if self.should_compute_edit { |
@@ -158,7 +157,7 @@ impl<'a> AssistGroup<'a> { | |||
158 | label: impl Into<String>, | 157 | label: impl Into<String>, |
159 | f: impl FnOnce(&mut ActionBuilder), | 158 | f: impl FnOnce(&mut ActionBuilder), |
160 | ) { | 159 | ) { |
161 | let label = AssistLabel::new(id, label.into()); | 160 | let label = AssistLabel::new(id, label.into(), Some(self.group.clone())); |
162 | 161 | ||
163 | let mut info = AssistInfo::new(label).with_group(self.group.clone()); | 162 | let mut info = AssistInfo::new(label).with_group(self.group.clone()); |
164 | if self.ctx.should_compute_edit { | 163 | if self.ctx.should_compute_edit { |