mirror of
https://github.com/zed-industries/zed.git
synced 2024-09-20 02:47:34 +03:00
Account for folds when inserting/removing block decorations
This commit is contained in:
parent
7660159164
commit
0fc2db6d6e
@ -377,16 +377,13 @@ impl<'a> BlockMapWriter<'a> {
|
|||||||
|
|
||||||
let position = buffer.anchor_after(block.position);
|
let position = buffer.anchor_after(block.position);
|
||||||
let point = position.to_point(&buffer);
|
let point = position.to_point(&buffer);
|
||||||
let start_row = wrap_snapshot
|
let wrap_row = wrap_snapshot
|
||||||
.from_point(Point::new(point.row, 0), Bias::Left)
|
.from_point(Point::new(point.row, 0), Bias::Left)
|
||||||
.row();
|
.row();
|
||||||
let end_row = if point.row == buffer.max_point().row {
|
let start_row = wrap_snapshot.prev_row_boundary(WrapPoint::new(wrap_row, 0));
|
||||||
wrap_snapshot.max_point().row() + 1
|
let end_row = wrap_snapshot
|
||||||
} else {
|
.next_row_boundary(WrapPoint::new(wrap_row, 0))
|
||||||
wrap_snapshot
|
.unwrap_or(wrap_snapshot.max_point().row() + 1);
|
||||||
.from_point(Point::new(point.row + 1, 0), Bias::Left)
|
|
||||||
.row()
|
|
||||||
};
|
|
||||||
|
|
||||||
let block_ix = match self
|
let block_ix = match self
|
||||||
.0
|
.0
|
||||||
@ -431,16 +428,13 @@ impl<'a> BlockMapWriter<'a> {
|
|||||||
let buffer_row = block.position.to_point(&buffer).row;
|
let buffer_row = block.position.to_point(&buffer).row;
|
||||||
if last_block_buffer_row != Some(buffer_row) {
|
if last_block_buffer_row != Some(buffer_row) {
|
||||||
last_block_buffer_row = Some(buffer_row);
|
last_block_buffer_row = Some(buffer_row);
|
||||||
let start_row = wrap_snapshot
|
let wrap_row = wrap_snapshot
|
||||||
.from_point(Point::new(buffer_row, 0), Bias::Left)
|
.from_point(Point::new(buffer_row, 0), Bias::Left)
|
||||||
.row();
|
.row();
|
||||||
|
let start_row = wrap_snapshot.prev_row_boundary(WrapPoint::new(wrap_row, 0));
|
||||||
let end_row = wrap_snapshot
|
let end_row = wrap_snapshot
|
||||||
.from_point(
|
.next_row_boundary(WrapPoint::new(wrap_row, 0))
|
||||||
Point::new(buffer_row, buffer.line_len(buffer_row)),
|
.unwrap_or(wrap_snapshot.max_point().row() + 1);
|
||||||
Bias::Left,
|
|
||||||
)
|
|
||||||
.row()
|
|
||||||
+ 1;
|
|
||||||
edits.push(Edit {
|
edits.push(Edit {
|
||||||
old: start_row..end_row,
|
old: start_row..end_row,
|
||||||
new: start_row..end_row,
|
new: start_row..end_row,
|
||||||
@ -457,7 +451,7 @@ impl<'a> BlockMapWriter<'a> {
|
|||||||
|
|
||||||
impl BlockSnapshot {
|
impl BlockSnapshot {
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
fn text(&mut self) -> String {
|
pub fn text(&self) -> String {
|
||||||
self.chunks(0..self.transforms.summary().output_rows, None)
|
self.chunks(0..self.transforms.summary().output_rows, None)
|
||||||
.map(|chunk| chunk.text)
|
.map(|chunk| chunk.text)
|
||||||
.collect()
|
.collect()
|
||||||
@ -934,7 +928,7 @@ mod tests {
|
|||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
let mut snapshot = block_map.read(wraps_snapshot, vec![]);
|
let snapshot = block_map.read(wraps_snapshot, vec![]);
|
||||||
assert_eq!(snapshot.text(), "aaa\n\n\n\nbbb\nccc\nddd\n\n\n");
|
assert_eq!(snapshot.text(), "aaa\n\n\n\nbbb\nccc\nddd\n\n\n");
|
||||||
|
|
||||||
let blocks = snapshot
|
let blocks = snapshot
|
||||||
@ -1059,7 +1053,7 @@ mod tests {
|
|||||||
let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
|
let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
|
||||||
wrap_map.sync(tabs_snapshot, tab_edits, cx)
|
wrap_map.sync(tabs_snapshot, tab_edits, cx)
|
||||||
});
|
});
|
||||||
let mut snapshot = block_map.read(wraps_snapshot, wrap_edits);
|
let snapshot = block_map.read(wraps_snapshot, wrap_edits);
|
||||||
assert_eq!(snapshot.text(), "aaa\n\nb!!!\n\n\nbb\nccc\nddd\n\n\n");
|
assert_eq!(snapshot.text(), "aaa\n\nb!!!\n\n\nbb\nccc\nddd\n\n\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1097,7 +1091,7 @@ mod tests {
|
|||||||
|
|
||||||
// Blocks with an 'above' disposition go above their corresponding buffer line.
|
// Blocks with an 'above' disposition go above their corresponding buffer line.
|
||||||
// Blocks with a 'below' disposition go below their corresponding buffer line.
|
// Blocks with a 'below' disposition go below their corresponding buffer line.
|
||||||
let mut snapshot = block_map.read(wraps_snapshot, vec![]);
|
let snapshot = block_map.read(wraps_snapshot, vec![]);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
snapshot.text(),
|
snapshot.text(),
|
||||||
"one two \nthree\n\nfour five \nsix\n\nseven \neight"
|
"one two \nthree\n\nfour five \nsix\n\nseven \neight"
|
||||||
@ -1232,7 +1226,7 @@ mod tests {
|
|||||||
let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
|
let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
|
||||||
wrap_map.sync(tabs_snapshot, tab_edits, cx)
|
wrap_map.sync(tabs_snapshot, tab_edits, cx)
|
||||||
});
|
});
|
||||||
let mut blocks_snapshot = block_map.read(wraps_snapshot.clone(), wrap_edits);
|
let blocks_snapshot = block_map.read(wraps_snapshot.clone(), wrap_edits);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
blocks_snapshot.transforms.summary().input_rows,
|
blocks_snapshot.transforms.summary().input_rows,
|
||||||
wraps_snapshot.max_point().row() + 1
|
wraps_snapshot.max_point().row() + 1
|
||||||
|
@ -10,7 +10,7 @@ use gpui::{
|
|||||||
use language::Chunk;
|
use language::Chunk;
|
||||||
use lazy_static::lazy_static;
|
use lazy_static::lazy_static;
|
||||||
use smol::future::yield_now;
|
use smol::future::yield_now;
|
||||||
use std::{collections::VecDeque, mem, ops::Range, time::Duration};
|
use std::{cmp, collections::VecDeque, mem, ops::Range, time::Duration};
|
||||||
use sum_tree::{Bias, Cursor, SumTree};
|
use sum_tree::{Bias, Cursor, SumTree};
|
||||||
use text::Patch;
|
use text::Patch;
|
||||||
use theme::SyntaxTheme;
|
use theme::SyntaxTheme;
|
||||||
@ -694,6 +694,46 @@ impl WrapSnapshot {
|
|||||||
self.from_tab_point(self.tab_snapshot.clip_point(self.to_tab_point(point), bias))
|
self.from_tab_point(self.tab_snapshot.clip_point(self.to_tab_point(point), bias))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn prev_row_boundary(&self, mut point: WrapPoint) -> u32 {
|
||||||
|
if self.transforms.is_empty() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
*point.column_mut() = 0;
|
||||||
|
|
||||||
|
let mut cursor = self.transforms.cursor::<(WrapPoint, TabPoint)>();
|
||||||
|
cursor.seek(&point, Bias::Right, &());
|
||||||
|
if cursor.item().is_none() {
|
||||||
|
cursor.prev(&());
|
||||||
|
}
|
||||||
|
|
||||||
|
while let Some(transform) = cursor.item() {
|
||||||
|
if transform.is_isomorphic() && cursor.start().1.column() == 0 {
|
||||||
|
return cmp::min(cursor.end(&()).0.row(), point.row());
|
||||||
|
} else {
|
||||||
|
cursor.prev(&());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
unreachable!()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn next_row_boundary(&self, mut point: WrapPoint) -> Option<u32> {
|
||||||
|
point.0 += Point::new(1, 0);
|
||||||
|
|
||||||
|
let mut cursor = self.transforms.cursor::<(WrapPoint, TabPoint)>();
|
||||||
|
cursor.seek(&point, Bias::Right, &());
|
||||||
|
while let Some(transform) = cursor.item() {
|
||||||
|
if transform.is_isomorphic() && cursor.start().1.column() == 0 {
|
||||||
|
return Some(cmp::max(cursor.start().0.row(), point.row()));
|
||||||
|
} else {
|
||||||
|
cursor.next(&());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
fn check_invariants(&self) {
|
fn check_invariants(&self) {
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user