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

@ -163,14 +163,14 @@ namespace SourceGit
try
{
var resDic = new ResourceDictionary();
var schema = JsonSerializer.Deserialize(File.ReadAllText(colorsFile), JsonCodeGen.Default.DictionaryStringString);
foreach (var kv in schema)
resDic[kv.Key] = Color.Parse(kv.Value);
app.Resources.MergedDictionaries.Add(resDic);
app._colorOverrides = resDic;
}
}
catch
{
}

View file

@ -52,12 +52,12 @@ namespace SourceGit.Commands
var refName = parts[0];
if (refName.EndsWith("/HEAD", StringComparison.Ordinal))
return;
if (refName.StartsWith(PREFIX_DETACHED, StringComparison.Ordinal))
{
branch.IsHead = true;
}
if (refName.StartsWith(PREFIX_LOCAL, StringComparison.Ordinal))
{
branch.Name = refName.Substring(PREFIX_LOCAL.Length);

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}";
@ -19,7 +20,7 @@ namespace SourceGit.Commands
{
var commit = new Models.Commit();
var lines = rs.StdOut.Split('\n');
if (lines.Length < 8)
if (lines.Length < 8)
return null;
commit.SHA = lines[0];

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

@ -38,8 +38,8 @@ namespace SourceGit.Converters
});
public static readonly FuncValueConverter<Models.DecoratorType, FontWeight> ToFontWeight =
new FuncValueConverter<Models.DecoratorType, FontWeight>(v =>
v is Models.DecoratorType.CurrentBranchHead or Models.DecoratorType.CurrentCommitHead
new FuncValueConverter<Models.DecoratorType, FontWeight>(v =>
v is Models.DecoratorType.CurrentBranchHead or Models.DecoratorType.CurrentCommitHead
? FontWeight.Bold : FontWeight.Regular
);
}

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)
@ -70,7 +64,7 @@ namespace SourceGit.Converters
public static readonly FuncValueConverter<string, string> ToShortSHA =
new FuncValueConverter<string, string>(v => v == null ? string.Empty : (v.Length > 10 ? v.Substring(0, 10) : v));
public static readonly FuncValueConverter<string, bool> UnderRecommendGitVersion =
new(v =>
{

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

@ -182,7 +182,7 @@ namespace SourceGit.Models
{
var focus = _source.Rows[row.RowIndex];
if (focus is IExpander expander && HasChildren(focus))
expander.IsExpanded = !expander.IsExpanded;
expander.IsExpanded = !expander.IsExpanded;
else
_rowDoubleTapped?.Invoke(this, e);
@ -455,7 +455,7 @@ namespace SourceGit.Models
foreach (var c in children)
return true;
}
return false;
}
}

View file

@ -52,7 +52,7 @@ namespace SourceGit.ViewModels
{
get => Type == BranchTreeNodeType.Branch;
}
public bool IsDetachedHead
{
get => Type == BranchTreeNodeType.DetachedHead;
@ -219,7 +219,7 @@ namespace SourceGit.ViewModels
start = sepIdx + 1;
sepIdx = branch.Name.IndexOf('/', start);
}
lastFolder.Children.Add(new BranchTreeNode()
{
Name = Path.GetFileName(branch.Name),
@ -242,7 +242,7 @@ namespace SourceGit.ViewModels
{
return l.Name.CompareTo(r.Name);
}
return (int)l.Type - (int)r.Type;
});

View file

@ -2,14 +2,14 @@
namespace SourceGit.ViewModels
{
public class CheckoutCommit: Popup
public class CheckoutCommit : Popup
{
public Models.Commit Commit
{
get;
private set;
}
public bool HasLocalChanges
{
get => _repo.WorkingCopyChangesCount > 0;
@ -32,7 +32,7 @@ namespace SourceGit.ViewModels
{
_repo.SetWatcherEnabled(false);
ProgressDescription = $"Checkout Commit '{Commit.SHA}' ...";
return Task.Run(() =>
{
var needPopStash = false;

View file

@ -228,7 +228,7 @@ namespace SourceGit.ViewModels
e.Handled = true;
};
menu.Items.Add(copyFileName);
return menu;
}

View file

@ -2,7 +2,7 @@
using System.Threading.Tasks;
namespace SourceGit.ViewModels
{
{
public class CreateBranch : Popup
{
[Required(ErrorMessage = "Branch name is required!")]
@ -19,13 +19,13 @@ namespace SourceGit.ViewModels
get;
private set;
}
public Models.DealWithLocalChanges PreAction
{
get => _preAction;
set => SetProperty(ref _preAction, value);
}
public bool CheckoutAfterCreated
{
get;

View file

@ -58,7 +58,7 @@ namespace SourceGit.ViewModels
{
SetProgressDescription("Deleting tracking remote branch...");
Commands.Branch.DeleteRemote(_repo.FullPath, TrackingRemoteBranch.Remote, TrackingRemoteBranch.Name);
}
}
}
else
{

View file

@ -17,7 +17,7 @@ namespace SourceGit.ViewModels
Targets = branches;
View = new Views.DeleteMultipleBranches() { DataContext = this };
}
public override Task<bool> Sure()
{
_repo.SetWatcherEnabled(false);

View file

@ -122,7 +122,7 @@ namespace SourceGit.ViewModels
if (latest.TextDiff != null)
{
var repo = Preference.FindRepository(_repo);
if (repo != null && repo.Submodules.Contains(_option.Path))
if (repo != null && repo.Submodules.Contains(_option.Path))
{
var submoduleDiff = new Models.SubmoduleDiff();
var submoduleRoot = $"{_repo}/{_option.Path}".Replace("\\", "/");
@ -164,7 +164,7 @@ namespace SourceGit.ViewModels
{
var fullPath = Path.Combine(_repo, _option.Path);
(imgDiff.Old, imgDiff.OldFileSize) = BitmapFromRevisionFile(_repo, "HEAD", oldPath);
if (File.Exists(fullPath))
{
imgDiff.New = new Bitmap(fullPath);

View file

@ -136,7 +136,7 @@ namespace SourceGit.ViewModels
}
needPopStash = true;
}
}
else if (_preAction == Models.DealWithLocalChanges.Discard)
{
SetProgressDescription("Discard local changes ...");

View file

@ -192,7 +192,7 @@ namespace SourceGit.ViewModels
e.Handled = true;
};
menu.Items.Add(copyFileName);
return menu;
}

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;
@ -793,7 +792,7 @@ namespace SourceGit.ViewModels
App.CopyText(change.Path);
e.Handled = true;
};
var copyFileName = new MenuItem();
copyFileName.Header = App.Text("CopyFileName");
copyFileName.Icon = App.CreateMenuIcon("Icons.Copy");

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

@ -81,7 +81,7 @@ namespace SourceGit.Views
{
if (Content is TreeDataGrid tree && tree.Source is IDisposable disposable)
disposable.Dispose();
Content = null;
var changes = Changes;

View file

@ -17,7 +17,7 @@ namespace SourceGit.Views
var toplevel = TopLevel.GetTopLevel(this);
if (toplevel == null)
return;
var selected = await toplevel.StorageProvider.OpenFolderPickerAsync(options);
if (selected.Count == 1)
TxtParentFolder.Text = selected[0].Path.LocalPath;
@ -31,7 +31,7 @@ namespace SourceGit.Views
var toplevel = TopLevel.GetTopLevel(this);
if (toplevel == null)
return;
var selected = await toplevel.StorageProvider.OpenFilePickerAsync(options);
if (selected.Count == 1)
TxtSshKey.Text = selected[0].Path.LocalPath;

View file

@ -24,7 +24,7 @@ namespace SourceGit.Views
{
if (DataContext is ViewModels.CommitDetail detail && CanNavigate)
detail.NavigateTo((sender as Control).DataContext as string);
e.Handled = true;
}
}

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,8 +8,9 @@ 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.

View file

@ -18,7 +18,7 @@ namespace SourceGit.Views
{
base.OnLoaded(e);
if (IsVisible)
if (IsVisible)
StartAnim();
}
@ -37,7 +37,7 @@ namespace SourceGit.Views
if (IsVisible)
StartAnim();
else
StopAnim();
StopAnim();
}
}

View file

@ -88,7 +88,7 @@ namespace SourceGit.Views
ViewModels.BranchTreeNode prev = null;
foreach (var node in repo.LocalBranchTrees)
node.UpdateCornerRadius(ref prev);
if (tree.SelectedItems.Count == 1)
{
var node = tree.SelectedItem as ViewModels.BranchTreeNode;
@ -303,12 +303,12 @@ namespace SourceGit.Views
e.Handled = true;
}
private void CollectBranchesFromNode(List<Models.Branch> outs, ViewModels.BranchTreeNode node)
{
if (node == null || node.IsRemote)
return;
if (node.IsFolder)
{
foreach (var child in node.Children)