Skip to content

feat: select next and previous files when staging chunks #2028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Danielku15 wants to merge 1 commit into
base: develop
Choose a base branch
from
+69 −4
Open

feat: select next and previous files when staging chunks #2028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions src/Models/DiffResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.IO;
using System.Text.RegularExpressions;
using Avalonia.Media.Imaging;
using SourceGit.ViewModels;

namespace SourceGit.Models
{
Expand Down Expand Up @@ -49,6 +50,7 @@ public class TextDiffSelection
public bool HasChanges { get; set; } = false;
public int IgnoredAdds { get; set; } = 0;
public int IgnoredDeletes { get; set; } = 0;
public bool HasRemainingChanges { get; set; } = false;
}

public partial class TextDiff
Expand All @@ -65,10 +67,17 @@ public TextDiffSelection MakeSelection(int startLine, int endLine, bool isCombin
for (int i = 0; i < startLine - 1; i++)
{
var line = Lines[i];
if (line.Type == TextDiffLineType.Added)
rs.IgnoredAdds++;
else if (line.Type == TextDiffLineType.Deleted)
rs.IgnoredDeletes++;
switch (line.Type)
{
case TextDiffLineType.Added:
rs.IgnoredAdds++;
rs.HasRemainingChanges = true;
break;
case TextDiffLineType.Deleted:
rs.IgnoredDeletes++;
rs.HasRemainingChanges = true;
break;
}
}

for (int i = startLine - 1; i < endLine; i++)
Expand All @@ -92,6 +101,18 @@ public TextDiffSelection MakeSelection(int startLine, int endLine, bool isCombin
}
}

for (var i = endLine; i < Lines.Count; i++)
{
var line = Lines[i];
switch (line.Type)
{
case TextDiffLineType.Added:
case TextDiffLineType.Deleted:
rs.HasRemainingChanges = true;
break;
}
}

return rs;
}

Expand Down
13 changes: 13 additions & 0 deletions src/Views/Repository.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.VisualTree;

namespace SourceGit.Views
{
Expand Down Expand Up @@ -610,5 +611,17 @@ private async void OnBisectCommand(object sender, RoutedEventArgs e)

e.Handled = true;
}

public void SelectNextStagedChangeWithoutSelection()
{
this.FindDescendantOfType<WorkingCopy>()
?.SelectNextStagedChangeWithoutSelection();
}

public void SelectNextUnstagedChangeWithoutSelection()
{
this.FindDescendantOfType<WorkingCopy>()
?.SelectNextUnstagedChangeWithoutSelection();
}
}
}
13 changes: 13 additions & 0 deletions src/Views/TextDiffView.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1496,6 +1496,10 @@ private async void OnStageChunk(object _1, RoutedEventArgs _2)
await new Commands.Apply(repo.FullPath, tmpFile, true, "nowarn", "--cache --index").ExecAsync();
File.Delete(tmpFile);

if (!selection.HasRemainingChanges)
{
repoView.SelectNextUnstagedChangeWithoutSelection();
}
repo.MarkWorkingCopyDirtyManually();
}

Expand Down Expand Up @@ -1526,6 +1530,11 @@ private async void OnUnstageChunk(object _1, RoutedEventArgs _2)
await new Commands.Apply(repo.FullPath, tmpFile, true, "nowarn", "--cache --index --reverse").ExecAsync();
File.Delete(tmpFile);

if (!selection.HasRemainingChanges)
{
repoView.SelectNextStagedChangeWithoutSelection();
}

repo.MarkWorkingCopyDirtyManually();
}

Expand Down Expand Up @@ -1563,6 +1572,10 @@ private async void OnDiscardChunk(object _1, RoutedEventArgs _2)
await new Commands.Apply(repo.FullPath, tmpFile, true, "nowarn", "--reverse").ExecAsync();
File.Delete(tmpFile);

if (selection.HasRemainingChanges)
{
repoView.SelectNextUnstagedChangeWithoutSelection();
}
repo.MarkWorkingCopyDirtyManually();
}
}
Expand Down
18 changes: 18 additions & 0 deletions src/Views/WorkingCopy.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,15 @@ private async void OnUnstagedChangeDoubleTapped(object _, RoutedEventArgs e)
}
}

public void SelectNextUnstagedChangeWithoutSelection()
{
if (DataContext is ViewModels.WorkingCopy vm)
{
var next = UnstagedChangesView.GetNextChangeWithoutSelection();
vm.SelectedUnstaged = next != null ? [next] : [];
}
}

private async void OnStagedChangeDoubleTapped(object _, RoutedEventArgs e)
{
if (DataContext is ViewModels.WorkingCopy vm)
Expand All @@ -89,6 +98,15 @@ private async void OnStagedChangeDoubleTapped(object _, RoutedEventArgs e)
e.Handled = true;
}
}

public void SelectNextStagedChangeWithoutSelection()
{
if (DataContext is ViewModels.WorkingCopy vm)
{
var next = StagedChangesView.GetNextChangeWithoutSelection();
vm.SelectedStaged = next != null ? [next] : [];
}
}

private async void OnUnstagedKeyDown(object _, KeyEventArgs e)
{
Expand Down