michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-25 21:07:20 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

code_style: run dotnet format

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2024-12-08 21:51:33 +08:00
parent 723263d099
commit 962055dd2a
No known key found for this signature in database
4 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/ViewModels/BlockNavigation.cs
View file

@ -40,19 +40,19 @@ namespace SourceGit.ViewModels
{
if (Blocks.Count == 0)
return "-/-";
if (_current >= 0 && _current < Blocks.Count)
return $"{_current+1}/{Blocks.Count}";
return $"{_current + 1}/{Blocks.Count}";
return $"-/{Blocks.Count}";
}
}
public BlockNavigation(object context)
{
Blocks.Clear();
Current = -1;
var lines = new List<Models.TextDiffLine>();
if (context is Models.TextDiff combined)
lines = combined.Lines;
@ -61,12 +61,12 @@ namespace SourceGit.ViewModels
if (lines.Count == 0)
return;
var lineIdx = 0;
var blockStartIdx = 0;
var isNewBlock = true;
var blocks = new List<Block>();
foreach (var line in lines)
{
lineIdx++;
@ -89,7 +89,7 @@ namespace SourceGit.ViewModels
}
}
}
if (!isNewBlock)
blocks.Add(new Block(blockStartIdx, lines.Count - 1));
@ -103,16 +103,18 @@ namespace SourceGit.ViewModels
public Block GotoNext()
{
if (Blocks.Count == 0) return null;
if (Blocks.Count == 0)
return null;
Current = (_current + 1) % Blocks.Count;
return Blocks[_current];
}
public Block GotoPrev()
{
if (Blocks.Count == 0) return null;
if (Blocks.Count == 0)
return null;
Current = _current == -1 ? Blocks.Count - 1 : (_current - 1 + Blocks.Count) % Blocks.Count;
return Blocks[_current];
}

7
src/ViewModels/CommitDetail.cs
View file

@ -121,7 +121,7 @@ namespace SourceGit.ViewModels
if (SetProperty(ref _revisionFileSearchFilter, value))
{
RevisionFileSearchSuggestion.Clear();
if (!string.IsNullOrEmpty(value))
{
if (_revisionFiles.Count == 0)
@ -132,7 +132,8 @@ namespace SourceGit.ViewModels
{
var files = new Commands.QueryRevisionFileNames(_repo.FullPath, sha).Result();
Dispatcher.UIThread.Invoke(() => {
Dispatcher.UIThread.Invoke(() =>
{
if (sha == Commit.SHA)
{
_revisionFiles.Clear();
@ -795,7 +796,7 @@ namespace SourceGit.ViewModels
var suggestion = new List<string>();
foreach (var file in _revisionFiles)
{
if (file.Contains(_revisionFileSearchFilter, StringComparison.OrdinalIgnoreCase) &&
if (file.Contains(_revisionFileSearchFilter, StringComparison.OrdinalIgnoreCase) &&
file.Length != _revisionFileSearchFilter.Length)
suggestion.Add(file);

2
src/Views/RepositoryToolbar.axaml.cs
View file

@ -1,5 +1,3 @@
using System;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Interactivity;

16
src/Views/TextDiffView.axaml.cs
View file

@ -557,7 +557,7 @@ namespace SourceGit.Views
return;
}
var firstLineIdx = DisplayRange.StartIdx;
if (firstLineIdx <= 1)
return;
@ -600,7 +600,7 @@ namespace SourceGit.Views
}
public void GotoNextChange()
{
{
var blockNavigation = BlockNavigation;
if (blockNavigation != null)
{
@ -613,7 +613,7 @@ namespace SourceGit.Views
return;
}
var lines = GetLines();
var lastLineIdx = DisplayRange.EndIdx;
if (lastLineIdx >= lines.Count - 1)
@ -724,7 +724,7 @@ namespace SourceGit.Views
oldValue.PropertyChanged -= OnBlockNavigationPropertyChanged;
if (newValue != null)
newValue.PropertyChanged += OnBlockNavigationPropertyChanged;
InvalidateVisual();
}
}
@ -1557,7 +1557,7 @@ namespace SourceGit.Views
get => GetValue(BlockNavigationProperty);
set => SetValue(BlockNavigationProperty, value);
}
public static readonly StyledProperty<string> BlockNavigationIndicatorProperty =
AvaloniaProperty.Register<TextDiffView, string>(nameof(BlockNavigationIndicator));
@ -1599,7 +1599,7 @@ namespace SourceGit.Views
{
InitializeComponent();
}
public void GotoPrevChange()
{
var presenter = this.FindDescendantOfType<ThemedTextDiffPresenter>();
@ -1609,7 +1609,7 @@ namespace SourceGit.Views
presenter.GotoPrevChange();
if (presenter is SingleSideTextDiffPresenter singleSide)
singleSide.ForceSyncScrollOffset();
BlockNavigationIndicator = BlockNavigation?.Indicator ?? string.Empty;
}
@ -1622,7 +1622,7 @@ namespace SourceGit.Views
presenter.GotoNextChange();
if (presenter is SingleSideTextDiffPresenter singleSide)
singleSide.ForceSyncScrollOffset();
BlockNavigationIndicator = BlockNavigation?.Indicator ?? string.Empty;
}