From ccdc849baab7e22d7984fc293e7e81b7467bbff5 Mon Sep 17 00:00:00 2001 From: leo Date: Tue, 15 Oct 2024 09:39:01 +0800 Subject: [PATCH] code_style: run `dotnet format` --- src/Commands/Stash.cs | 6 +++--- src/Models/RepositorySettings.cs | 2 +- src/Native/MacOS.cs | 2 +- src/ViewModels/CherryPick.cs | 4 ++-- src/ViewModels/Discard.cs | 2 +- src/ViewModels/Histories.cs | 4 ++-- src/ViewModels/Merge.cs | 2 +- src/ViewModels/RenameBranch.cs | 2 +- src/ViewModels/Repository.cs | 2 +- src/ViewModels/WorkingCopy.cs | 2 +- src/Views/ChangeStatusIcon.cs | 4 ++-- src/Views/CommitRefsPresenter.cs | 4 ++-- src/Views/InteractiveRebase.axaml.cs | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Commands/Stash.cs b/src/Commands/Stash.cs index 1eb7d03d..fbdb6bd4 100644 --- a/src/Commands/Stash.cs +++ b/src/Commands/Stash.cs @@ -25,7 +25,7 @@ namespace SourceGit.Commands { foreach (var c in changes) pathsBuilder.Append($"\"{c.Path}\" "); - + var paths = pathsBuilder.ToString(); Args = $"stash push --staged -m \"{message}\" -- {paths}"; } @@ -51,11 +51,11 @@ namespace SourceGit.Commands new Add(WorkingDirectory, needAdd).Exec(); needAdd.Clear(); } - + var paths = pathsBuilder.ToString(); Args = $"stash push -m \"{message}\" -- {paths}"; } - + return Exec(); } diff --git a/src/Models/RepositorySettings.cs b/src/Models/RepositorySettings.cs index 4fb96efa..f2fd1bc6 100644 --- a/src/Models/RepositorySettings.cs +++ b/src/Models/RepositorySettings.cs @@ -9,7 +9,7 @@ namespace SourceGit.Models get; set; } = string.Empty; - + public DealWithLocalChanges DealWithLocalChangesOnCheckoutBranch { get; diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs index ffbc21b7..316e509c 100644 --- a/src/Native/MacOS.cs +++ b/src/Native/MacOS.cs @@ -27,7 +27,7 @@ namespace SourceGit.Native startInfo.CreateNoWindow = true; startInfo.RedirectStandardOutput = true; startInfo.StandardOutputEncoding = Encoding.UTF8; - + try { var proc = new Process() { StartInfo = startInfo }; diff --git a/src/ViewModels/CherryPick.cs b/src/ViewModels/CherryPick.cs index e4058309..dde43662 100644 --- a/src/ViewModels/CherryPick.cs +++ b/src/ViewModels/CherryPick.cs @@ -81,7 +81,7 @@ namespace SourceGit.ViewModels Targets[0].SHA, !AutoCommit, AppendSourceToMessage, - $"-m {MainlineForMergeCommit+1}").Exec(); + $"-m {MainlineForMergeCommit + 1}").Exec(); } else { @@ -96,7 +96,7 @@ namespace SourceGit.ViewModels AppendSourceToMessage, string.Empty).Exec(); } - + CallUIThread(() => _repo.SetWatcherEnabled(true)); return succ; }); diff --git a/src/ViewModels/Discard.cs b/src/ViewModels/Discard.cs index e6653d02..e5b413db 100644 --- a/src/ViewModels/Discard.cs +++ b/src/ViewModels/Discard.cs @@ -29,7 +29,7 @@ namespace SourceGit.ViewModels set; } = 0; } - + public class Discard : Popup { public object Mode diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs index d03d13c2..179f6d97 100644 --- a/src/ViewModels/Histories.cs +++ b/src/ViewModels/Histories.cs @@ -156,7 +156,7 @@ namespace SourceGit.ViewModels if (_repo.SearchResultSelectedCommit == null || _repo.SearchResultSelectedCommit.SHA != commit.SHA) { - _repo.SearchResultSelectedCommit = _repo.SearchedCommits.Find(x => x.SHA == commit.SHA); + _repo.SearchResultSelectedCommit = _repo.SearchedCommits.Find(x => x.SHA == commit.SHA); } AutoSelectedCommit = commit; @@ -445,7 +445,7 @@ namespace SourceGit.ViewModels PopupHost.ShowPopup(new CherryPick(_repo, commit, parents)); } } - + e.Handled = true; }; menu.Items.Add(cherryPick); diff --git a/src/ViewModels/Merge.cs b/src/ViewModels/Merge.cs index fb1dccab..b7630101 100644 --- a/src/ViewModels/Merge.cs +++ b/src/ViewModels/Merge.cs @@ -54,7 +54,7 @@ namespace SourceGit.ViewModels return Models.MergeMode.Supported[2]; if (config.Equals("--no-commit", StringComparison.Ordinal) || config.Equals("--no-ff --no-commit", StringComparison.Ordinal)) return Models.MergeMode.Supported[3]; - + return Models.MergeMode.Supported[0]; } diff --git a/src/ViewModels/RenameBranch.cs b/src/ViewModels/RenameBranch.cs index 9b387f9d..04a9b4c4 100644 --- a/src/ViewModels/RenameBranch.cs +++ b/src/ViewModels/RenameBranch.cs @@ -62,7 +62,7 @@ namespace SourceGit.ViewModels _repo.Settings.Filters.Remove(oldName); _repo.Settings.Filters.Add($"refs/heads/{_name}"); } - + _repo.MarkBranchesDirtyManually(); _repo.SetWatcherEnabled(true); }); diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs index 1a9b9955..eda70ba6 100644 --- a/src/ViewModels/Repository.cs +++ b/src/ViewModels/Repository.cs @@ -862,7 +862,7 @@ namespace SourceGit.ViewModels { if (_settings.Filters.Count != 0) Dispatcher.UIThread.Invoke(() => _settings.Filters.Clear()); - + limits += "--exclude=refs/stash --all"; } diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs index e4acf8ca..98ae7776 100644 --- a/src/ViewModels/WorkingCopy.cs +++ b/src/ViewModels/WorkingCopy.cs @@ -1202,7 +1202,7 @@ namespace SourceGit.ViewModels { if (_useAmend) return new Commands.QueryStagedChangesWithAmend(_repo.FullPath).Result(); - + var rs = new List(); foreach (var c in _cached) { diff --git a/src/Views/ChangeStatusIcon.cs b/src/Views/ChangeStatusIcon.cs index d11a504a..5d34be09 100644 --- a/src/Views/ChangeStatusIcon.cs +++ b/src/Views/ChangeStatusIcon.cs @@ -62,7 +62,7 @@ namespace SourceGit.Views ]; private static readonly string[] INDICATOR = ["?", "±", "T", "+", "−", "➜", "❏", "U", "★"]; - private static readonly string[] TIPS = ["Unknown", "Modified", "Type Changed", "Added", "Deleted", "Renamed", "Copied", "Unmerged", "Untracked" ]; + private static readonly string[] TIPS = ["Unknown", "Modified", "Type Changed", "Added", "Deleted", "Renamed", "Copied", "Unmerged", "Untracked"]; public static readonly StyledProperty IsUnstagedChangeProperty = AvaloniaProperty.Register(nameof(IsUnstagedChange)); @@ -142,7 +142,7 @@ namespace SourceGit.Views ToolTip.SetTip(this, c.IsConflit ? "Conflict" : TIPS[(int)c.WorkTree]); else ToolTip.SetTip(this, TIPS[(int)c.Index]); - + InvalidateVisual(); } } diff --git a/src/Views/CommitRefsPresenter.cs b/src/Views/CommitRefsPresenter.cs index 628a7cd3..e575360b 100644 --- a/src/Views/CommitRefsPresenter.cs +++ b/src/Views/CommitRefsPresenter.cs @@ -83,7 +83,6 @@ namespace SourceGit.Views context.DrawRectangle(item.Brush, null, entireRect); context.DrawText(item.Label, new Point(x + 16, 8.0 - item.Label.Height * 0.5)); - context.DrawRectangle(null, new Pen(item.Brush), entireRect); } else { @@ -93,9 +92,10 @@ namespace SourceGit.Views context.DrawLine(new Pen(item.Brush), new Point(x + 16, 0), new Point(x + 16, 16)); context.DrawText(item.Label, new Point(x + 20, 8.0 - item.Label.Height * 0.5)); - context.DrawRectangle(null, new Pen(item.Brush), entireRect); } + context.DrawRectangle(null, new Pen(item.Brush), entireRect); + using (context.PushTransform(Matrix.CreateTranslation(x + 3, 3))) context.DrawGeometry(fg, null, item.Icon); diff --git a/src/Views/InteractiveRebase.axaml.cs b/src/Views/InteractiveRebase.axaml.cs index 19b753dd..8f75cc26 100644 --- a/src/Views/InteractiveRebase.axaml.cs +++ b/src/Views/InteractiveRebase.axaml.cs @@ -23,7 +23,7 @@ namespace SourceGit.Views var item = vm.SelectedItem; if (item == null) { - base.OnKeyDown(e); + base.OnKeyDown(e); return; }