code_style: run dotnet format

This commit is contained in:
leo 2024-06-06 15:31:02 +08:00
parent ed62174942
commit 4610f702b3
No known key found for this signature in database
GPG key ID: B528468E49CD0E58
29 changed files with 48 additions and 76 deletions

View file

@ -57,7 +57,8 @@ namespace SourceGit.Commands
if (line.Equals(_endOfBodyToken, StringComparison.Ordinal))
{
_nextPartIdx = 0;
if (!string.IsNullOrEmpty(_current.Message)) _current.Message = _current.Message.Trim();
if (!string.IsNullOrEmpty(_current.Message))
_current.Message = _current.Message.Trim();
}
else
{

View file

@ -6,7 +6,8 @@ namespace SourceGit.Commands
{
public class QuerySingleCommit : Command
{
public QuerySingleCommit(string repo, string sha) {
public QuerySingleCommit(string repo, string sha)
{
WorkingDirectory = repo;
Context = repo;
Args = $"show --no-show-signature --decorate=full --pretty=format:%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%B -s {sha}";

View file

@ -19,14 +19,5 @@ namespace SourceGit.Converters
return App.Current?.FindResource("Icons.Tree") as StreamGeometry;
}
});
public static readonly FuncValueConverter<Models.ChangeViewMode, bool> IsList =
new FuncValueConverter<Models.ChangeViewMode, bool>(v => v == Models.ChangeViewMode.List);
public static readonly FuncValueConverter<Models.ChangeViewMode, bool> IsGrid =
new FuncValueConverter<Models.ChangeViewMode, bool>(v => v == Models.ChangeViewMode.Grid);
public static readonly FuncValueConverter<Models.ChangeViewMode, bool> IsTree =
new FuncValueConverter<Models.ChangeViewMode, bool>(v => v == Models.ChangeViewMode.Tree);
}
}

View file

@ -25,14 +25,7 @@ namespace SourceGit.Converters
var selected = array[1] as ViewModels.LauncherPage;
var collections = array[2] as AvaloniaList<ViewModels.LauncherPage>;
if (selected != null && collections != null && (self == selected || collections.IndexOf(self) + 1 == collections.IndexOf(selected)))
{
return false;
}
else
{
return true;
}
return selected != null && collections != null && (self == selected || collections.IndexOf(self) + 1 == collections.IndexOf(selected));
});
}
}

View file

@ -30,17 +30,11 @@ namespace SourceGit.Converters
{
var theme = (string)value;
if (theme.Equals("Light", StringComparison.OrdinalIgnoreCase))
{
return ThemeVariant.Light;
}
else if (theme.Equals("Dark", StringComparison.OrdinalIgnoreCase))
{
return ThemeVariant.Dark;
}
else
{
return ThemeVariant.Default;
}
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

View file

@ -12,30 +12,20 @@ namespace SourceGit.Converters
new FuncValueConverter<WindowState, Thickness>(state =>
{
if (OperatingSystem.IsWindows() && state == WindowState.Maximized)
{
return new Thickness(6);
}
else if (OperatingSystem.IsLinux() && state != WindowState.Maximized)
{
return new Thickness(6);
}
else
{
return new Thickness(0);
}
});
public static readonly FuncValueConverter<WindowState, GridLength> ToTitleBarHeight =
new FuncValueConverter<WindowState, GridLength>(state =>
{
if (state == WindowState.Maximized)
{
return new GridLength(OperatingSystem.IsMacOS() ? 34 : 30);
}
else
{
return new GridLength(38);
}
});
public static readonly FuncValueConverter<WindowState, bool> IsNormal =

View file

@ -2,7 +2,7 @@
namespace SourceGit.ViewModels
{
public class CheckoutCommit: Popup
public class CheckoutCommit : Popup
{
public Models.Commit Commit
{

View file

@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Avalonia.Controls;
using Avalonia.Threading;

View file

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Platform.Storage;
using Avalonia.Threading;

View file

@ -21,7 +21,8 @@ namespace SourceGit.Views
Close();
}
private void OnRemoveButtonClicked(object sender, RoutedEventArgs e) {
private void OnRemoveButtonClicked(object sender, RoutedEventArgs e)
{
if (DataContext is ViewModels.AssumeUnchangedManager vm && sender is Button button)
vm.Remove(button.DataContext as string);

View file

@ -16,7 +16,7 @@ namespace SourceGit.Views
{
var datagrid = sender as DataGrid;
detail.ActivePageIndex = 1;
detail.SelectedChanges = new () { datagrid.SelectedItem as Models.Change };
detail.SelectedChanges = new() { datagrid.SelectedItem as Models.Change };
}
e.Handled = true;

View file

@ -8,7 +8,8 @@ namespace SourceGit.Views
{
public static void OpenContextMenu(this Control control, ContextMenu menu)
{
if (menu == null) return;
if (menu == null)
return;
menu.PlacementTarget = control;
menu.Closing += OnContextMenuClosing; // Clear context menu because it is dynamic.