From 81f02a20c5708653939fc08aaaa30d094a0ea992 Mon Sep 17 00:00:00 2001
From: qiufeng <172344058@qq.com>
Date: Sat, 12 Apr 2025 11:45:52 +0800
Subject: [PATCH] Using the new syntax

---
 src/ViewModels/Launcher.cs | 63 +++++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
index 9ae99b33..8df914fb 100644
--- a/src/ViewModels/Launcher.cs
+++ b/src/ViewModels/Launcher.cs
@@ -48,7 +48,7 @@ namespace SourceGit.ViewModels
         {
             _ignoreIndexChange = true;
 
-            Pages = new AvaloniaList<LauncherPage>();
+            Pages = [];
             AddNewTab();
 
             var pref = Preferences.Instance;
@@ -205,8 +205,7 @@ namespace SourceGit.ViewModels
                 return;
             }
 
-            if (page == null)
-                page = _activePage;
+            page ??= _activePage;
 
             var removeIdx = Pages.IndexOf(page);
             var activeIdx = Pages.IndexOf(_activePage);
@@ -239,7 +238,7 @@ namespace SourceGit.ViewModels
                     CloseRepositoryInTab(one);
             }
 
-            Pages = new AvaloniaList<LauncherPage> { ActivePage };
+            Pages = [ActivePage];
             ActiveWorkspace.ActiveIdx = 0;
             OnPropertyChanged(nameof(Pages));
 
@@ -360,9 +359,11 @@ namespace SourceGit.ViewModels
                 var icon = App.CreateMenuIcon(workspace.IsActive ? "Icons.Check" : "Icons.Workspace");
                 icon.Fill = workspace.Brush;
 
-                var item = new MenuItem();
-                item.Header = workspace.Name;
-                item.Icon = icon;
+                var item = new MenuItem
+                {
+                    Header = workspace.Name,
+                    Icon = icon
+                };
                 item.Click += (_, e) =>
                 {
                     if (!workspace.IsActive)
@@ -376,8 +377,10 @@ namespace SourceGit.ViewModels
 
             menu.Items.Add(new MenuItem() { Header = "-" });
 
-            var configure = new MenuItem();
-            configure.Header = App.Text("Workspace.Configure");
+            var configure = new MenuItem
+            {
+                Header = App.Text("Workspace.Configure")
+            };
             configure.Click += (_, e) =>
             {
                 App.OpenDialog(new Views.ConfigureWorkspace() { DataContext = new ConfigureWorkspace() });
@@ -394,9 +397,11 @@ namespace SourceGit.ViewModels
                 return null;
 
             var menu = new ContextMenu();
-            var close = new MenuItem();
-            close.Header = App.Text("PageTabBar.Tab.Close");
-            close.InputGesture = KeyGesture.Parse(OperatingSystem.IsMacOS() ? "⌘+W" : "Ctrl+W");
+            var close = new MenuItem
+            {
+                Header = App.Text("PageTabBar.Tab.Close"),
+                InputGesture = KeyGesture.Parse(OperatingSystem.IsMacOS() ? "⌘+W" : "Ctrl+W")
+            };
             close.Click += (_, e) =>
             {
                 CloseTab(page);
@@ -404,8 +409,10 @@ namespace SourceGit.ViewModels
             };
             menu.Items.Add(close);
 
-            var closeOthers = new MenuItem();
-            closeOthers.Header = App.Text("PageTabBar.Tab.CloseOther");
+            var closeOthers = new MenuItem
+            {
+                Header = App.Text("PageTabBar.Tab.CloseOther")
+            };
             closeOthers.Click += (_, e) =>
             {
                 CloseOtherTabs();
@@ -413,8 +420,10 @@ namespace SourceGit.ViewModels
             };
             menu.Items.Add(closeOthers);
 
-            var closeRight = new MenuItem();
-            closeRight.Header = App.Text("PageTabBar.Tab.CloseRight");
+            var closeRight = new MenuItem
+            {
+                Header = App.Text("PageTabBar.Tab.CloseRight")
+            };
             closeRight.Click += (_, e) =>
             {
                 CloseRightTabs();
@@ -424,9 +433,11 @@ namespace SourceGit.ViewModels
 
             if (page.Node.IsRepository)
             {
-                var bookmark = new MenuItem();
-                bookmark.Header = App.Text("PageTabBar.Tab.Bookmark");
-                bookmark.Icon = App.CreateMenuIcon("Icons.Bookmark");
+                var bookmark = new MenuItem
+                {
+                    Header = App.Text("PageTabBar.Tab.Bookmark"),
+                    Icon = App.CreateMenuIcon("Icons.Bookmark")
+                };
 
                 for (int i = 0; i < Models.Bookmarks.Supported.Count; i++)
                 {
@@ -436,8 +447,10 @@ namespace SourceGit.ViewModels
                         icon.Fill = Models.Bookmarks.Brushes[i];
 
                     var dupIdx = i;
-                    var setter = new MenuItem();
-                    setter.Header = icon;
+                    var setter = new MenuItem
+                    {
+                        Header = icon
+                    };
                     setter.Click += (_, e) =>
                     {
                         page.Node.Bookmark = dupIdx;
@@ -448,9 +461,11 @@ namespace SourceGit.ViewModels
                 menu.Items.Add(new MenuItem() { Header = "-" });
                 menu.Items.Add(bookmark);
 
-                var copyPath = new MenuItem();
-                copyPath.Header = App.Text("PageTabBar.Tab.CopyPath");
-                copyPath.Icon = App.CreateMenuIcon("Icons.Copy");
+                var copyPath = new MenuItem
+                {
+                    Header = App.Text("PageTabBar.Tab.CopyPath"),
+                    Icon = App.CreateMenuIcon("Icons.Copy")
+                };
                 copyPath.Click += (_, e) =>
                 {
                     page.CopyPath();