Splice remove suggesion hints when those are cleared in the editor. (#9088)

Closes https://github.com/zed-industries/zed/issues/6793 Release Notes: - Fixed copilot suggestions not disappearing after disabling the tool ([6793](https://github.com/zed-industries/zed/issues/6793))

Kirill Bulatov committed 2 years ago

Commit 146971f1 parent 34717803 files · +14 −12Browse files

Unified · Split

3 files

crates/copilot_ui/src/copilot_button.rs +2 −2
crates/editor/src/editor.rs +11 −9
crates/editor/src/inlay_hint_cache.rs +1 −1

crates/copilot_ui/src/copilot_button.rs+2−2

@@ -149,7 +149,7 @@ impl CopilotButton { · 148 unmodified lines
149	pub fn build_copilot_menu(&mut self, cx: &mut ViewContext<Self>) -> View<ContextMenu> {	149	pub fn build_copilot_menu(&mut self, cx: &mut ViewContext<Self>) -> View<ContextMenu> {
150	let fs = self.fs.clone();	150	let fs = self.fs.clone();
151		151
152	return ContextMenu::build(cx, move \|mut menu, cx\| {	152	ContextMenu::build(cx, move \|mut menu, cx\| {
153	if let Some(language) = self.language.clone() {	153	if let Some(language) = self.language.clone() {
154	let fs = fs.clone();	154	let fs = fs.clone();
155	let language_enabled =	155	let language_enabled =
@@ -216,7 +216,7 @@ impl CopilotButton { · 60 unmodified lines
216	.boxed_clone(),	216	.boxed_clone(),
217	)	217	)
218	.action("Sign Out", SignOut.boxed_clone())	218	.action("Sign Out", SignOut.boxed_clone())
219	});	219	})
220	}	220	}
221		221
222	pub fn update_enabled(&mut self, editor: View<Editor>, cx: &mut ViewContext<Self>) {	222	pub fn update_enabled(&mut self, editor: View<Editor>, cx: &mut ViewContext<Self>) {

crates/editor/src/editor.rs+11−9

     }
 }
+#[derive(Debug)]
 pub(crate) struct CopilotState {
     excerpt_id: Option<ExcerptId>,
     pending_refresh: Task<Option<()>>,
                     (InvalidationStrategy::RefreshRequested, None)
                 } else {
                     self.inlay_hint_cache.clear();
-                    self.splice_inlay_hints(
+                    self.splice_inlays(
                         self.visible_inlay_hints(cx)
                             .iter()
                             .map(|inlay| inlay.id)
                         to_remove,
                         to_insert,
                     })) => {
-                        self.splice_inlay_hints(to_remove, to_insert, cx);
+                        self.splice_inlays(to_remove, to_insert, cx);
                         return;
                     }
                     ControlFlow::Break(None) => return,
                     to_insert,
                 }) = self.inlay_hint_cache.remove_excerpts(excerpts_removed)
                 {
-                    self.splice_inlay_hints(to_remove, to_insert, cx);
+                    self.splice_inlays(to_remove, to_insert, cx);
                 }
                 return;
             }
             ignore_debounce,
             cx,
         ) {
-            self.splice_inlay_hints(to_remove, to_insert, cx);
+            self.splice_inlays(to_remove, to_insert, cx);
         }
     }
         self.display_map
             .read(cx)
             .current_inlays()
-            .filter(move |inlay| {
+            .filter(move |inlay| matches!(inlay.id, InlayId::Hint(_)))
-                Some(inlay.id) != self.copilot_state.suggestion.as_ref().map(|h| h.id)
-            })
             .cloned()
             .collect()
     }
         }
     }
-    fn splice_inlay_hints(
+    fn splice_inlays(
         &self,
         to_remove: Vec<InlayId>,
         to_insert: Vec<Inlay>,
     }
     fn clear_copilot_suggestions(&mut self, cx: &mut ViewContext<Self>) {
-        self.copilot_state = Default::default();
+        if let Some(old_suggestion) = self.copilot_state.suggestion.take() {
+            self.splice_inlays(vec![old_suggestion.id], Vec::new(), cx);
+        }
+        self.copilot_state = CopilotState::default();
         self.discard_copilot_suggestion(cx);
     }

crates/editor/src/inlay_hint_cache.rs+1−1

@@ -1255,7 +1255,7 @@ fn apply_hint_update( · 1254 unmodified lines
1255	editor.inlay_hint_cache.version += 1;	1255	editor.inlay_hint_cache.version += 1;
1256	}	1256	}
1257	if displayed_inlays_changed {	1257	if displayed_inlays_changed {
1258	editor.splice_inlay_hints(to_remove, to_insert, cx)	1258	editor.splice_inlays(to_remove, to_insert, cx)
1259	}	1259	}
1260	}	1260	}
1261		1261