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

Rearrange git tests in worktree

Browse source 
Add support for renaming work directories
This commit is contained in:
Mikayla Maki 2023-05-19 16:23:21 -07:00
parent 623a177fe6
commit c795c9b844
No known key found for this signature in database
3 changed files with 503 additions and 412 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,6 @@ use language::{
};
use project::ProjectPath;
use smallvec::SmallVec;
use text::Point;
use std::{
borrow::Cow,
cmp::{self, Ordering},
@ -51,6 +50,7 @@ use std::{
ops::Range,
sync::Arc,
};
use text::Point;
use workspace::{item::Item, GitGutterSetting, WorkspaceSettings};
enum FoldMarkers {}
@ -1059,8 +1059,10 @@ impl EditorElement {
.buffer_snapshot
.git_diff_hunks_in_range(0..(max_row.floor() as u32), false)
{
let start_display = Point::new(hunk.buffer_range.start, 0).to_display_point(&layout.position_map.snapshot.display_snapshot);
let end_display = Point::new(hunk.buffer_range.end, 0).to_display_point(&layout.position_map.snapshot.display_snapshot);
let start_display = Point::new(hunk.buffer_range.start, 0)
.to_display_point(&layout.position_map.snapshot.display_snapshot);
let end_display = Point::new(hunk.buffer_range.end, 0)
.to_display_point(&layout.position_map.snapshot.display_snapshot);
let start_y = y_for_row(start_display.row() as f32);
let mut end_y = if hunk.buffer_range.start == hunk.buffer_range.end {
y_for_row((end_display.row() + 1) as f32)

6
crates/editor/src/git.rs
View file

@ -1,4 +1,3 @@
use std::ops::Range;
use git::diff::{DiffHunk, DiffHunkStatus};
@ -78,10 +77,7 @@ pub fn diff_hunk_to_display(hunk: DiffHunk<u32>, snapshot: &DisplaySnapshot) ->
} else {
let start = hunk_start_point.to_display_point(snapshot).row();
let hunk_end_row_inclusive = hunk
.buffer_range
.end
.max(hunk.buffer_range.start);
let hunk_end_row_inclusive = hunk.buffer_range.end.max(hunk.buffer_range.start);
let hunk_end_point = Point::new(hunk_end_row_inclusive, 0);
let end = hunk_end_point.to_display_point(snapshot).row();