Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prepare for inlay and text highlight unification

Browse source
This commit is contained in:
Kirill Bulatov 2023-08-22 22:06:48 +03:00
parent 4cc9f2f525
commit 420f8b7b15
5 changed files with 30 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/editor/src/editor.rs
View file

@ -65,7 +65,7 @@ use language::{
OffsetUtf16, Point, Selection, SelectionGoal, TransactionId,
};
use link_go_to_definition::{
hide_link_definition, show_link_definition, InlayCoordinates, LinkGoToDefinitionState,
hide_link_definition, show_link_definition, InlayRange, LinkGoToDefinitionState,
};
use log::error;
use multi_buffer::ToOffsetUtf16;
@ -7720,7 +7720,7 @@ impl Editor {
pub fn highlight_inlays<T: 'static>(
&mut self,
ranges: Vec<InlayCoordinates>,
ranges: Vec<InlayRange>,
style: HighlightStyle,
cx: &mut ViewContext<Self>,
) {
@ -7737,20 +7737,7 @@ impl Editor {
self.display_map.read(cx).text_highlights(TypeId::of::<T>())
}
pub fn clear_text_highlights<T: 'static>(
&mut self,
cx: &mut ViewContext<Self>,
) -> Option<Arc<(HighlightStyle, Vec<Range<Anchor>>)>> {
let highlights = self
.display_map
.update(cx, |map, _| map.clear_text_highlights(TypeId::of::<T>()));
if highlights.is_some() {
cx.notify();
}
highlights
}
pub fn clear_highlights<T: 'static>(&mut self, cx: &mut ViewContext<Self>) {
pub fn clear_text_highlights<T: 'static>(&mut self, cx: &mut ViewContext<Self>) {
let text_highlights = self
.display_map
.update(cx, |map, _| map.clear_text_highlights(TypeId::of::<T>()));
@ -8353,7 +8340,7 @@ impl View for Editor {
self.link_go_to_definition_state.task = None;
self.clear_highlights::<LinkGoToDefinitionState>(cx);
self.clear_text_highlights::<LinkGoToDefinitionState>(cx);
}
false