diff --git a/src/Commands/QueryCommitFullMessage.cs b/src/Commands/QueryCommitFullMessage.cs index f4be9bc5..c8f1867d 100644 --- a/src/Commands/QueryCommitFullMessage.cs +++ b/src/Commands/QueryCommitFullMessage.cs @@ -12,7 +12,8 @@ namespace SourceGit.Commands public string Result() { var rs = ReadToEnd(); - if (rs.IsSuccess) return rs.StdOut.TrimEnd(); + if (rs.IsSuccess) + return rs.StdOut.TrimEnd(); return string.Empty; } } diff --git a/src/Commands/QueryCommits.cs b/src/Commands/QueryCommits.cs index a67ee106..401f1682 100644 --- a/src/Commands/QueryCommits.cs +++ b/src/Commands/QueryCommits.cs @@ -58,7 +58,7 @@ namespace SourceGit.Commands } nextPartIdx++; - + start = end + 1; end = rs.StdOut.IndexOf('\n', start); } diff --git a/src/ViewModels/LayoutInfo.cs b/src/ViewModels/LayoutInfo.cs index 80ce00a8..e78ad2cf 100644 --- a/src/ViewModels/LayoutInfo.cs +++ b/src/ViewModels/LayoutInfo.cs @@ -1,6 +1,6 @@ using System; -using System.Text.Json.Serialization; using System.Text.Json; +using System.Text.Json.Serialization; using Avalonia.Controls; diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs index d564c15a..e9468494 100644 --- a/src/ViewModels/Repository.cs +++ b/src/ViewModels/Repository.cs @@ -442,7 +442,7 @@ namespace SourceGit.ViewModels else { visible = new Commands.QueryCommits(FullPath, $"-1000 -- \"{_searchCommitFilter}\"", false).Result(); - } + } SearchedCommits = visible; } @@ -1002,7 +1002,7 @@ namespace SourceGit.ViewModels menu.Items.Add(new MenuItem() { Header = "-" }); menu.Items.Add(compareWithBranch); - } + } } var type = GitFlow.GetBranchType(branch.Name); diff --git a/src/ViewModels/Reword.cs b/src/ViewModels/Reword.cs index 7c5ad88a..47b1bd06 100644 --- a/src/ViewModels/Reword.cs +++ b/src/ViewModels/Reword.cs @@ -24,7 +24,7 @@ namespace SourceGit.ViewModels _repo = repo; _oldMessage = new Commands.QueryCommitFullMessage(_repo.FullPath, head.SHA).Result(); _message = _oldMessage; - + Head = head; View = new Views.Reword() { DataContext = this }; } diff --git a/src/ViewModels/Squash.cs b/src/ViewModels/Squash.cs index 6ada9318..c001dfab 100644 --- a/src/ViewModels/Squash.cs +++ b/src/ViewModels/Squash.cs @@ -28,7 +28,7 @@ namespace SourceGit.ViewModels { _repo = repo; _message = new Commands.QueryCommitFullMessage(_repo.FullPath, parent.SHA).Result(); - + Head = head; Parent = parent; View = new Views.Squash() { DataContext = this }; diff --git a/src/Views/CommitBaseInfo.axaml.cs b/src/Views/CommitBaseInfo.axaml.cs index eea7921c..3c8a9ea5 100644 --- a/src/Views/CommitBaseInfo.axaml.cs +++ b/src/Views/CommitBaseInfo.axaml.cs @@ -14,7 +14,7 @@ namespace SourceGit.Views get => GetValue(CanNavigateProperty); set => SetValue(CanNavigateProperty, value); } - + public static readonly StyledProperty MessageProperty = AvaloniaProperty.Register(nameof(Message), string.Empty); diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs index 7cae36dc..e22a5696 100644 --- a/src/Views/Launcher.axaml.cs +++ b/src/Views/Launcher.axaml.cs @@ -184,12 +184,12 @@ namespace SourceGit.Views var visual = (Visual)e.Source; BeginMoveDrag(new PointerPressedEventArgs( - e.Source, + e.Source, e.Pointer, - visual, - e.GetPosition(visual), - e.Timestamp, - new PointerPointProperties(RawInputModifiers.None, PointerUpdateKind.LeftButtonPressed), + visual, + e.GetPosition(visual), + e.Timestamp, + new PointerPointProperties(RawInputModifiers.None, PointerUpdateKind.LeftButtonPressed), e.KeyModifiers)); } diff --git a/src/Views/RevisionFiles.axaml.cs b/src/Views/RevisionFiles.axaml.cs index fec476fe..ebc7666a 100644 --- a/src/Views/RevisionFiles.axaml.cs +++ b/src/Views/RevisionFiles.axaml.cs @@ -116,7 +116,7 @@ namespace SourceGit.Views { SelectedObject = null; detail.ViewRevisionFile(null); - } + } } }; diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs index 204b5131..45fc7c2a 100644 --- a/src/Views/TextDiffView.axaml.cs +++ b/src/Views/TextDiffView.axaml.cs @@ -107,7 +107,7 @@ namespace SourceGit.Views protected override Type StyleKeyOverride => typeof(TextEditor); - public IThemedTextDiffPresenter(TextArea area, TextDocument doc): base(area, doc) + public IThemedTextDiffPresenter(TextArea area, TextDocument doc) : base(area, doc) { IsReadOnly = true; ShowLineNumbers = false; @@ -156,7 +156,7 @@ namespace SourceGit.Views TextArea.TextView.LineTransformers.Remove(_lineStyleTransformer); _textMate = Models.TextMateHelper.CreateForEditor(this); TextArea.TextView.LineTransformers.Add(_lineStyleTransformer); - Models.TextMateHelper.SetGrammarByFileName(_textMate, FileName); + Models.TextMateHelper.SetGrammarByFileName(_textMate, FileName); } } else