zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 10:57:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't rely on Range::is_empty to check for selection emptiness

Browse Source 
This method returns true when `start > end`, so our `backspace` and
`delete` implementations were subtly wrong because they always deleted
one extra character for reversed selections.
This commit is contained in:
Antonio Scandurra 2021-04-29 09:29:00 +02:00
parent fdefd32de0
commit 0aacf858ce
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
zed/src/editor/buffer_view.rs
View File

@ -499,7 +499,8 @@ impl BufferView {
let buffer = self.buffer.read(ctx);
let map = self.display_map.read(ctx);
for selection in &mut selections {
if selection.range(buffer).is_empty() {
let range = selection.range(buffer);
if range.start == range.end {
let head = selection
.head()
.to_display_point(map, ctx.as_ref())
@ -529,7 +530,8 @@ impl BufferView {
let buffer = self.buffer.read(ctx);
let map = self.display_map.read(ctx);
for selection in &mut selections {
if selection.range(buffer).is_empty() {
let range = selection.range(buffer);
if range.start == range.end {
let head = selection
.head()
.to_display_point(map, ctx.as_ref())
@ -1174,15 +1176,19 @@ impl BufferView {
let app = ctx.as_ref();
let map = self.display_map.read(app);
for selection in self.selections(app) {
let (start, end) = selection.display_range(map, app).sorted();
let buffer_start_row = start.to_buffer_point(map, Bias::Left, app).unwrap().row;
let range = selection.display_range(map, app).sorted();
let buffer_start_row = range
.start
.to_buffer_point(map, Bias::Left, app)
.unwrap()
.row;
for row in (0..=end.row()).rev() {
for row in (0..=range.end.row()).rev() {
if self.is_line_foldable(row, app) && !map.is_line_folded(row) {
let fold_range = self.foldable_range_for_line(row, app).unwrap();
if fold_range.end.row >= buffer_start_row {
fold_ranges.push(fold_range);
if row <= start.row() {
if row <= range.start.row() {
break;
}
}
@ -1208,9 +1214,9 @@ impl BufferView {
.selections(app)
.iter()
.map(|s| {
let (start, end) = s.display_range(map, app).sorted();
let mut start = start.to_buffer_point(map, Bias::Left, app).unwrap();
let mut end = end.to_buffer_point(map, Bias::Left, app).unwrap();
let range = s.display_range(map, app).sorted();
let mut start = range.start.to_buffer_point(map, Bias::Left, app).unwrap();
let mut end = range.end.to_buffer_point(map, Bias::Left, app).unwrap();
start.column = 0;
end.column = buffer.line_len(end.row).unwrap();
start..end
@ -1282,12 +1288,14 @@ impl BufferView {
}
pub fn fold_selected_ranges(&mut self, _: &(), ctx: &mut ViewContext<Self>) {
use super::RangeExt;
self.display_map.update(ctx, |map, ctx| {
let buffer = self.buffer.read(ctx);
let ranges = self
.selections(ctx.as_ref())
.iter()
.map(|s| s.range(buffer))
.map(|s| s.range(buffer).sorted())
.collect::<Vec<_>>();
map.fold(ranges, ctx).unwrap();
});

9
zed/src/editor/mod.rs
View File

@ -12,14 +12,11 @@ use display_map::*;
use std::{cmp, ops::Range};
trait RangeExt<T> {
fn sorted(&self) -> (T, T);
fn sorted(&self) -> Range<T>;
}
impl<T: Ord + Clone> RangeExt<T> for Range<T> {
fn sorted(&self) -> (T, T) {
(
cmp::min(&self.start, &self.end).clone(),
cmp::max(&self.start, &self.end).clone(),
)
fn sorted(&self) -> Self {
cmp::min(&self.start, &self.end).clone()..cmp::max(&self.start, &self.end).clone()
}
}