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

Avoid inserting extra newlines when evaluating code (#15018)

Browse source 
When the evaluation range ends at the start of a line, back it up to the
end of the previous line. This avoids inserting extra newlines below the
evaluation range when they already exist.

Release Notes:

- N/A

Co-authored-by: Nathan <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2024-07-23 19:03:15 +02:00 • committed by GitHub
parent d9a00b6f8b
commit 53f828df7d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/repl/src/repl_editor.rs
View file

@ -143,25 +143,22 @@ fn snippet(
let buffer = editor.buffer().read(cx).snapshot(cx);
let selection = editor.selections.newest::<usize>(cx);
let selection = editor.selections.newest::<Point>(cx);
let multi_buffer_snapshot = editor.buffer().read(cx).snapshot(cx);
let range = if selection.is_empty() {
let cursor = selection.head();
let cursor_row = multi_buffer_snapshot.offset_to_point(cursor).row;
let start_offset = multi_buffer_snapshot.point_to_offset(Point::new(cursor_row, 0));
let end_point = Point::new(
cursor_row,
multi_buffer_snapshot.line_len(MultiBufferRow(cursor_row)),
);
let end_offset = start_offset.saturating_add(end_point.column as usize);
// Create a range from the start to the end of the line
start_offset..end_offset
Point::new(selection.start.row, 0)
..Point::new(
selection.start.row,
multi_buffer_snapshot.line_len(MultiBufferRow(selection.start.row)),
)
} else {
selection.range()
let mut range = selection.range();
if range.end.column == 0 {
range.end.row -= 1;
range.end.column = multi_buffer_snapshot.line_len(MultiBufferRow(range.end.row));
}
range
};
let anchor_range = range.to_anchors(&multi_buffer_snapshot);