diff --git a/src/Native/OS.cs b/src/Native/OS.cs index 177bbf9f..3a688654 100644 --- a/src/Native/OS.cs +++ b/src/Native/OS.cs @@ -25,7 +25,8 @@ namespace SourceGit.Native void OpenWithDefaultEditor(string file); } - public static string DataDir { + public static string DataDir + { get; private set; } = string.Empty; @@ -61,12 +62,14 @@ namespace SourceGit.Native private set; } = new Version(0, 0, 0); - public static string ShellOrTerminal { + public static string ShellOrTerminal + { get; set; } = string.Empty; - public static List ExternalTools { + public static List ExternalTools + { get; set; } = []; diff --git a/src/ViewModels/FileHistories.cs b/src/ViewModels/FileHistories.cs index ab12e596..7e248274 100644 --- a/src/ViewModels/FileHistories.cs +++ b/src/ViewModels/FileHistories.cs @@ -295,7 +295,7 @@ namespace SourceGit.ViewModels public void NavigateToCommit(Models.Commit commit) { _repo.NavigateToCommit(commit.SHA); - } + } private readonly Repository _repo = null; private readonly string _file = null; diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs index b5754d33..03f216de 100644 --- a/src/ViewModels/Histories.cs +++ b/src/ViewModels/Histories.cs @@ -285,7 +285,7 @@ namespace SourceGit.ViewModels if (canCherryPick || canMerge) multipleMenu.Items.Add(new MenuItem() { Header = "-" }); - } + } var saveToPatchMultiple = new MenuItem(); saveToPatchMultiple.Icon = App.CreateMenuIcon("Icons.Diff"); @@ -589,7 +589,7 @@ namespace SourceGit.ViewModels menu.Items.Add(interactiveRebase); menu.Items.Add(new MenuItem() { Header = "-" }); } - } + } if (current.Head != commit.SHA) { @@ -937,7 +937,7 @@ namespace SourceGit.ViewModels submenu.Items.Add(finish); submenu.Items.Add(new MenuItem() { Header = "-" }); } - } + } var copy = new MenuItem(); copy.Header = App.Text("BranchCM.CopyName"); @@ -983,7 +983,7 @@ namespace SourceGit.ViewModels e.Handled = true; }; submenu.Items.Add(merge); - } + } var rename = new MenuItem(); rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", branch.Name); @@ -1025,7 +1025,7 @@ namespace SourceGit.ViewModels submenu.Items.Add(finish); submenu.Items.Add(new MenuItem() { Header = "-" }); } - } + } var copy = new MenuItem(); copy.Header = App.Text("BranchCM.CopyName"); @@ -1131,7 +1131,7 @@ namespace SourceGit.ViewModels e.Handled = true; }; submenu.Items.Add(merge); - } + } var delete = new MenuItem(); delete.Header = new Views.NameHighlightedTextBlock("TagCM.Delete", tag.Name); diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs index c7f2e86f..45a05b34 100644 --- a/src/ViewModels/Repository.cs +++ b/src/ViewModels/Repository.cs @@ -1500,7 +1500,7 @@ namespace SourceGit.ViewModels menu.Items.Add(fastForward); menu.Items.Add(pull); } - } + } menu.Items.Add(push); } @@ -1518,7 +1518,7 @@ namespace SourceGit.ViewModels }; menu.Items.Add(checkout); menu.Items.Add(new MenuItem() { Header = "-" }); - } + } var worktree = _worktrees.Find(x => x.Branch == branch.FullName); var upstream = _branches.Find(x => x.FullName == branch.Upstream); @@ -1577,7 +1577,7 @@ namespace SourceGit.ViewModels menu.Items.Add(merge); menu.Items.Add(rebase); - } + } var compareWithHead = new MenuItem(); compareWithHead.Header = App.Text("BranchCM.CompareWithHead"); @@ -1629,7 +1629,7 @@ namespace SourceGit.ViewModels menu.Items.Add(new MenuItem() { Header = "-" }); menu.Items.Add(finish); } - } + } var rename = new MenuItem(); rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", branch.Name); @@ -1702,7 +1702,7 @@ namespace SourceGit.ViewModels }; menu.Items.Add(tracking); } - } + } var archive = new MenuItem(); archive.Icon = App.CreateMenuIcon("Icons.Archive"); diff --git a/src/Views/FileHistories.axaml.cs b/src/Views/FileHistories.axaml.cs index 6f86c70c..be5affc3 100644 --- a/src/Views/FileHistories.axaml.cs +++ b/src/Views/FileHistories.axaml.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using Avalonia.Controls; using Avalonia.Input; using Avalonia.Interactivity; @@ -56,7 +55,7 @@ namespace SourceGit.Views NotifyDonePanel.IsVisible = true; e.Handled = true; - } + } } } } diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs index 832cca80..b5f09d79 100644 --- a/src/Views/Launcher.axaml.cs +++ b/src/Views/Launcher.axaml.cs @@ -146,7 +146,8 @@ namespace SourceGit.Views return; } - if (e.Key == Key.Q) { + if (e.Key == Key.Q) + { App.Quit(0); e.Handled = true; return; diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs index bd01a0a4..15a2a212 100644 --- a/src/Views/TextDiffView.axaml.cs +++ b/src/Views/TextDiffView.axaml.cs @@ -1000,7 +1000,7 @@ namespace SourceGit.Views builder.AppendLine(line.Content.Substring(selection.StartPosition.Column - 1)); continue; } - + if (i == endIdx && selection.EndPosition.Column < line.Content.Length) { builder.AppendLine(line.Content.Substring(0, selection.EndPosition.Column));