Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Hide code lens' blocks in folds (#60011)

Kirill Bulatov5837e7ef50f6
diff --git a/crates/diagnostics/src/diagnostics_tests.rs b/crates/diagnostics/src/diagnostics_tests.rs
index 613b485c946..7bac26fac70 100644
--- a/crates/diagnostics/src/diagnostics_tests.rs
+++ b/crates/diagnostics/src/diagnostics_tests.rs
@@ -412,7 +412,6 @@ async fn test_diagnostics_with_folds(cx: &mut TestAppContext) {
"§ main.js
§ -----
⋯
-
tset(); § no method `tset`"
}
);
diff --git a/crates/editor/src/display_map/block_map.rs b/crates/editor/src/display_map/block_map.rs
index 064e49ee3e0..c8e1a4424b1 100644
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -1075,6 +1075,18 @@ impl BlockMap {
.iter()
.filter_map(|block| {
let placement = block.placement.to_wrap_row(wrap_snapshot)?;
+ if !matches!(placement, BlockPlacement::Replace(_))
+ && wrap_snapshot.intersects_fold(Point::new(
+ block
+ .placement
+ .start()
+ .to_point(wrap_snapshot.buffer_snapshot())
+ .row,
+ 0,
+ ))
+ {
+ return None;
+ }
if let BlockPlacement::Above(row) = placement
&& row < new_start
{
@@ -2934,7 +2946,8 @@ mod tests {
use super::*;
use crate::{
display_map::{
- Companion, fold_map::FoldMap, inlay_map::InlayMap, tab_map::TabMap, wrap_map::WrapMap,
+ Companion, fold_map::FoldMap, fold_map::FoldPlaceholder, inlay_map::InlayMap,
+ tab_map::TabMap, wrap_map::WrapMap,
},
test::test_font,
};
@@ -3144,6 +3157,74 @@ mod tests {
assert_eq!(snapshot.text(), "aaa\n\nb!!!\n\n\nbb\nccc\nddd\n\n\n");
}
+ #[gpui::test]
+ fn test_blocks_hidden_in_folds(cx: &mut gpui::TestAppContext) {
+ cx.update(init_test);
+
+ let text = "line0\nline1\nline2\nline3\nline4";
+
+ let buffer = cx.update(|cx| MultiBuffer::build_simple(text, cx));
+ let buffer_snapshot = cx.update(|cx| buffer.read(cx).snapshot(cx));
+ let tab_size = 1.try_into().unwrap();
+ let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
+ let (mut fold_map, fold_snapshot) = FoldMap::new(inlay_snapshot);
+ let (mut tab_map, tab_snapshot) = TabMap::new(fold_snapshot, tab_size);
+ let (wrap_map, wraps_snapshot) =
+ cx.update(|cx| WrapMap::new(tab_snapshot, font("Helvetica"), px(14.0), None, cx));
+ let mut block_map = BlockMap::new(wraps_snapshot.clone(), 1, 1);
+
+ let above = |row| BlockProperties {
+ style: BlockStyle::Fixed,
+ placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(row, 0))),
+ height: Some(1),
+ render: Arc::new(|_| div().into_any()),
+ priority: 0,
+ };
+ let below = |row| BlockProperties {
+ placement: BlockPlacement::Below(buffer_snapshot.anchor_after(Point::new(row, 0))),
+ ..above(row)
+ };
+
+ let mut writer = block_map.write(wraps_snapshot.clone(), Default::default(), None);
+ let block_ids = writer.insert(vec![above(1), above(2), below(2), above(4)]);
+ let (block_a, block_b, block_c, block_d) =
+ (block_ids[0], block_ids[1], block_ids[2], block_ids[3]);
+
+ let present_blocks =
+ |block_map: &mut BlockMap, wraps_snapshot: WrapSnapshot, wrap_edits: WrapPatch| {
+ let snapshot = block_map.read(wraps_snapshot, wrap_edits, None);
+ let max_row = snapshot.max_point().row;
+ snapshot
+ .blocks_in_range(BlockRow(0)..BlockRow(max_row + 1))
+ .filter_map(|(_, block)| Some(block.as_custom()?.id))
+ .collect::<HashSet<_>>()
+ };
+
+ assert_eq!(
+ present_blocks(&mut block_map, wraps_snapshot, Default::default()),
+ HashSet::from_iter([block_a, block_b, block_c, block_d]),
+ "every block is present before folding",
+ );
+
+ // Fold lines 2 and 3 entirely, leaving line1 (the fold start) visible.
+ let (inlay_snapshot, inlay_edits) = inlay_map.sync(buffer_snapshot.clone(), vec![]);
+ let (mut fold_writer, _, _) = fold_map.write(inlay_snapshot, inlay_edits);
+ let (fold_snapshot, fold_edits) = fold_writer.fold(vec![(
+ Point::new(1, 5)..Point::new(3, 5),
+ FoldPlaceholder::test(),
+ )]);
+ let (tab_snapshot, tab_edits) = tab_map.sync(fold_snapshot, fold_edits, tab_size);
+ let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
+ wrap_map.sync(tab_snapshot, tab_edits, cx)
+ });
+
+ assert_eq!(
+ present_blocks(&mut block_map, wraps_snapshot, wrap_edits),
+ HashSet::from_iter([block_a, block_d]),
+ "blocks B and C anchored to folded lines are dropped, A (fold-start line) and D (past the fold) stay",
+ );
+ }
+
#[gpui::test]
fn test_multibuffer_headers_and_footers(cx: &mut App) {
init_test(cx);
diff --git a/crates/editor/src/test.rs b/crates/editor/src/test.rs
index 13be412b95a..e217398faa8 100644
--- a/crates/editor/src/test.rs
+++ b/crates/editor/src/test.rs
@@ -6,17 +6,14 @@ use std::{rc::Rc, sync::LazyLock};
pub use crate::rust_analyzer_ext::expand_macro_recursively;
use crate::{
DisplayPoint, Editor, EditorMode, FoldPlaceholder, MultiBuffer, SelectionEffects, Size,
- display_map::{
- Block, BlockPlacement, CustomBlockId, DisplayMap, DisplayRow, DisplaySnapshot,
- ToDisplayPoint,
- },
+ display_map::{Block, CustomBlockId, DisplayMap, DisplayRow, DisplaySnapshot, ToDisplayPoint},
};
use collections::HashMap;
use gpui::{
AppContext as _, Context, Entity, EntityId, Font, FontFeatures, FontStyle, FontWeight, Pixels,
VisualTestContext, Window, font, size,
};
-use multi_buffer::{MultiBufferOffset, ToPoint};
+use multi_buffer::MultiBufferOffset;
use pretty_assertions::assert_eq;
use project::{Project, project_settings::DiagnosticSeverity};
use ui::{App, BorrowAppContext, IntoElement, px};
@@ -207,11 +204,6 @@ pub fn editor_content_with_blocks_and_size(
for (row, block) in blocks {
match block {
Block::Custom(custom_block) => {
- if let BlockPlacement::Near(x) = &custom_block.placement
- && snapshot.intersects_fold(x.to_point(&snapshot.buffer_snapshot()))
- {
- continue;
- };
let content = block_content_for_tests(editor, custom_block.id, cx)
.expect("block content not found");
// 2: "related info 1 for diagnostic 0"