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

Uncomment the rest of the tests

Browse source
This commit is contained in:
Kirill Bulatov 2023-09-14 22:05:02 +03:00
parent 47e0535f1c
commit 396efec6e1
4 changed files with 33 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/editor/src/display_map.rs
View file

@ -761,6 +761,14 @@ impl DisplaySnapshot {
let type_id = TypeId::of::<Tag>(); let type_id = TypeId::of::<Tag>();
self.text_highlights.get(&Some(type_id)).cloned() self.text_highlights.get(&Some(type_id)).cloned()
} }
#[cfg(any(test, feature = "test-support"))]
pub fn inlay_highlight_ranges<Tag: ?Sized + 'static>(
&self,
) -> Option<Arc<(HighlightStyle, Vec<InlayHighlight>)>> {
let type_id = TypeId::of::<Tag>();
self.inlay_highlights.get(&Some(type_id)).cloned()
}
} }
#[derive(Copy, Clone, Default, Eq, Ord, PartialOrd, PartialEq)] #[derive(Copy, Clone, Default, Eq, Ord, PartialOrd, PartialEq)]

1
crates/editor/src/display_map/inlay_map.rs
View file

@ -1711,7 +1711,6 @@ mod tests {
.filter_map(|i| { .filter_map(|i| {
let (_, inlay) = &inlays[i]; let (_, inlay) = &inlays[i];
let inlay_text_len = inlay.text.len(); let inlay_text_len = inlay.text.len();
// TODO kb gen_range
match inlay_text_len { match inlay_text_len {
0 => None, 0 => None,
1 => Some(InlayHighlight { 1 => Some(InlayHighlight {

52
crates/editor/src/hover_popover.rs
View file

@ -796,6 +796,7 @@ mod tests {
inlay_hint_cache::tests::{cached_hint_labels, visible_hint_labels}, inlay_hint_cache::tests::{cached_hint_labels, visible_hint_labels},
link_go_to_definition::update_inlay_link_and_hover_points, link_go_to_definition::update_inlay_link_and_hover_points,
test::editor_lsp_test_context::EditorLspTestContext, test::editor_lsp_test_context::EditorLspTestContext,
InlayId,
}; };
use collections::BTreeSet; use collections::BTreeSet;
use gpui::fonts::Weight; use gpui::fonts::Weight;
@ -1462,29 +1463,19 @@ mod tests {
.advance_clock(Duration::from_millis(HOVER_DELAY_MILLIS + 100)); .advance_clock(Duration::from_millis(HOVER_DELAY_MILLIS + 100));
cx.foreground().run_until_parked(); cx.foreground().run_until_parked();
cx.update_editor(|editor, cx| { cx.update_editor(|editor, cx| {
let snapshot = editor.snapshot(cx);
let hover_state = &editor.hover_state; let hover_state = &editor.hover_state;
assert!(hover_state.diagnostic_popover.is_none() && hover_state.info_popover.is_some()); assert!(hover_state.diagnostic_popover.is_none() && hover_state.info_popover.is_some());
let popover = hover_state.info_popover.as_ref().unwrap(); let popover = hover_state.info_popover.as_ref().unwrap();
let buffer_snapshot = editor.buffer().update(cx, |buffer, cx| buffer.snapshot(cx)); let buffer_snapshot = editor.buffer().update(cx, |buffer, cx| buffer.snapshot(cx));
let entire_inlay_start = snapshot.display_point_to_inlay_offset( assert_eq!(
inlay_range.start.to_display_point(&snapshot), popover.symbol_range,
Bias::Left, RangeInEditor::Inlay(InlayHighlight {
inlay: InlayId::Hint(0),
inlay_position: buffer_snapshot.anchor_at(inlay_range.start, Bias::Right),
range: ": ".len()..": ".len() + new_type_label.len(),
}),
"Popover range should match the new type label part"
); );
let expected_new_type_label_start = InlayOffset(entire_inlay_start.0 + ": ".len());
// TODO kb
// assert_eq!(
// popover.symbol_range,
// RangeInEditor::Inlay(InlayRange {
// inlay_position: buffer_snapshot.anchor_at(inlay_range.start, Bias::Right),
// highlight_start: expected_new_type_label_start,
// highlight_end: InlayOffset(
// expected_new_type_label_start.0 + new_type_label.len()
// ),
// }),
// "Popover range should match the new type label part"
// );
assert_eq!( assert_eq!(
popover popover
.rendered_content .rendered_content
@ -1529,27 +1520,20 @@ mod tests {
.advance_clock(Duration::from_millis(HOVER_DELAY_MILLIS + 100)); .advance_clock(Duration::from_millis(HOVER_DELAY_MILLIS + 100));
cx.foreground().run_until_parked(); cx.foreground().run_until_parked();
cx.update_editor(|editor, cx| { cx.update_editor(|editor, cx| {
let snapshot = editor.snapshot(cx);
let hover_state = &editor.hover_state; let hover_state = &editor.hover_state;
assert!(hover_state.diagnostic_popover.is_none() && hover_state.info_popover.is_some()); assert!(hover_state.diagnostic_popover.is_none() && hover_state.info_popover.is_some());
let popover = hover_state.info_popover.as_ref().unwrap(); let popover = hover_state.info_popover.as_ref().unwrap();
let buffer_snapshot = editor.buffer().update(cx, |buffer, cx| buffer.snapshot(cx)); let buffer_snapshot = editor.buffer().update(cx, |buffer, cx| buffer.snapshot(cx));
let entire_inlay_start = snapshot.display_point_to_inlay_offset( assert_eq!(
inlay_range.start.to_display_point(&snapshot), popover.symbol_range,
Bias::Left, RangeInEditor::Inlay(InlayHighlight {
inlay: InlayId::Hint(0),
inlay_position: buffer_snapshot.anchor_at(inlay_range.start, Bias::Right),
range: ": ".len() + new_type_label.len() + "<".len()
..": ".len() + new_type_label.len() + "<".len() + struct_label.len(),
}),
"Popover range should match the struct label part"
); );
let expected_struct_label_start =
InlayOffset(entire_inlay_start.0 + ": ".len() + new_type_label.len() + "<".len());
// TODO kb
// assert_eq!(
// popover.symbol_range,
// RangeInEditor::Inlay(InlayRange {
// inlay_position: buffer_snapshot.anchor_at(inlay_range.start, Bias::Right),
// highlight_start: expected_struct_label_start,
// highlight_end: InlayOffset(expected_struct_label_start.0 + struct_label.len()),
// }),
// "Popover range should match the struct label part"
// );
assert_eq!( assert_eq!(
popover popover
.rendered_content .rendered_content

19
crates/editor/src/link_go_to_definition.rs
View file

@ -1196,22 +1196,17 @@ mod tests {
cx.update_editor(|editor, cx| { cx.update_editor(|editor, cx| {
let snapshot = editor.snapshot(cx); let snapshot = editor.snapshot(cx);
let actual_ranges = snapshot let actual_ranges = snapshot
.text_highlight_ranges::<LinkGoToDefinitionState>() .inlay_highlight_ranges::<LinkGoToDefinitionState>()
.map(|ranges| ranges.as_ref().clone().1) .map(|ranges| ranges.as_ref().clone().1)
.unwrap_or_default(); .unwrap_or_default();
let buffer_snapshot = editor.buffer().update(cx, |buffer, cx| buffer.snapshot(cx)); let buffer_snapshot = editor.buffer().update(cx, |buffer, cx| buffer.snapshot(cx));
let expected_highlight_start = snapshot.display_point_to_inlay_offset( let expected_ranges = vec![InlayHighlight {
inlay_range.start.to_display_point(&snapshot), inlay: InlayId::Hint(0),
Bias::Left, inlay_position: buffer_snapshot.anchor_at(inlay_range.start, Bias::Right),
); range: 0..hint_label.len(),
// TODO kb }];
// let expected_ranges = vec![InlayRange { assert_set_eq!(actual_ranges, expected_ranges);
// inlay_position: buffer_snapshot.anchor_at(inlay_range.start, Bias::Right),
// highlight_start: expected_highlight_start,
// highlight_end: InlayOffset(expected_highlight_start.0 + hint_label.len()),
// }];
// assert_set_eq!(actual_ranges, expected_ranges);
}); });
// Unpress cmd causes highlight to go away // Unpress cmd causes highlight to go away