code_review: PR #2070

- Use `HotKey` binding for buttons
- Better error handling

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/ViewModels/Conflict.cs

@@ -121,11 +121,7 @@ public async Task UseMineAsync()
         public async Task MergeAsync()
         {
             if (CanMerge)
-            {
-                var ctx = new MergeConflictEditor(_repo, _change.Path);
-                await ctx.LoadAsync();
-                await App.ShowDialog(ctx);
-            }
+                await App.ShowDialog(new MergeConflictEditor(_repo, _change.Path));
         }
 
         public async Task MergeExternalAsync()

src/ViewModels/MergeConflictEditor.cs

@@ -5,7 +5,6 @@
 using System.Threading.Tasks;
 
 using Avalonia;
-using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
@@ -17,12 +16,6 @@ public string FilePath
             get => _filePath;
         }
 
-        public bool IsLoading
-        {
-            get => _isLoading;
-            private set => SetProperty(ref _isLoading, value);
-        }
-
         public string Error
         {
             get => _error;
@@ -78,43 +71,25 @@ public Models.ConflictSelectedChunk SelectedChunk
         public IReadOnlyList<Models.ConflictRegion> ConflictRegions => _conflictRegions;
         public bool HasUnresolvedConflicts => _unresolvedConflictCount > 0;
         public bool HasUnsavedChanges => _unresolvedConflictCount < _conflictRegions.Count;
-        public bool CanSave => _unresolvedConflictCount == 0;
 
         public MergeConflictEditor(Repository repo, string filePath)
         {
             _repo = repo;
             _filePath = filePath;
-        }
 
-        public async Task LoadAsync()
-        {
-            IsLoading = true;
+            var workingCopyPath = Path.Combine(_repo.FullPath, _filePath);
+            var workingCopyContent = string.Empty;
+            if (File.Exists(workingCopyPath))
+                workingCopyContent = File.ReadAllText(workingCopyPath);
 
-            try
+            if (workingCopyContent.IndexOf('\0', StringComparison.Ordinal) >= 0)
             {
-                var workingCopyPath = Path.Combine(_repo.FullPath, _filePath);
-                var workingCopyContent = string.Empty;
-                if (File.Exists(workingCopyPath))
-                    workingCopyContent = await File.ReadAllTextAsync(workingCopyPath).ConfigureAwait(false);
-
-                if (workingCopyContent.IndexOf('\0', StringComparison.Ordinal) >= 0)
-                    throw new Exception("Binary file is not supported!!!");
-
-                Dispatcher.UIThread.Post(() =>
-                {
-                    ParseOriginalContent(workingCopyContent);
-                    RefreshDisplayData();
-                    IsLoading = false;
-                });
-            }
-            catch (Exception ex)
-            {
-                Dispatcher.UIThread.Post(() =>
-                {
-                    IsLoading = false;
-                    Error = ex.Message;
-                });
+                _error = "Binary file is not supported.";
+                return;
             }
+
+            ParseOriginalContent(workingCopyContent);
+            RefreshDisplayData();
         }
 
         public Models.ConflictLineState GetLineState(int line)
@@ -153,7 +128,7 @@ public async Task<bool> SaveAndStageAsync()
 
             if (_unresolvedConflictCount > 0)
             {
-                App.RaiseException(_repo.FullPath, "Cannot save: there are still unresolved conflicts.");
+                Error = "Cannot save: there are still unresolved conflicts.";
                 return false;
             }
 
@@ -203,7 +178,7 @@ public async Task<bool> SaveAndStageAsync()
             {
                 // Write merged content to file
                 var fullPath = Path.Combine(_repo.FullPath, _filePath);
-                await File.WriteAllTextAsync(fullPath, builder.ToString()).ConfigureAwait(false);
+                await File.WriteAllTextAsync(fullPath, builder.ToString());
 
                 // Stage the file
                 var pathSpecFile = Path.GetTempFileName();
@@ -216,11 +191,16 @@ public async Task<bool> SaveAndStageAsync()
             }
             catch (Exception ex)
             {
-                App.RaiseException(_repo.FullPath, $"Failed to save and stage: {ex.Message}");
+                Error = $"Failed to save and stage: {ex.Message}";
                 return false;
             }
         }
 
+        public void ClearErrorMessage()
+        {
+            Error = string.Empty;
+        }
+
         private void ParseOriginalContent(string content)
         {
             _originalContent = content;
@@ -491,12 +471,10 @@ private void RefreshDisplayData()
             _unresolvedConflictCount = unresolved.Count;
             OnPropertyChanged(nameof(StatusText));
             OnPropertyChanged(nameof(HasUnresolvedConflicts));
-            OnPropertyChanged(nameof(CanSave));
         }
 
         private readonly Repository _repo;
         private readonly string _filePath;
-        private bool _isLoading = false;
         private string _originalContent = string.Empty;
         private int _unresolvedConflictCount = 0;
         private int _diffMaxLineNumber = 0;

src/Views/MergeConflictEditor.axaml

@@ -41,7 +41,6 @@
         <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center">
           <Path Width="14" Height="14" Data="{StaticResource Icons.File}"/>
           <TextBlock Margin="8" Text="{Binding FilePath}" VerticalAlignment="Center"/>
-          <v:LoadingIcon Width="14" Height="14" IsVisible="{Binding IsLoading}"/>
         </StackPanel>
 
         <!-- Navigation and Actions -->
@@ -51,13 +50,15 @@
                   Width="24"
                   ToolTip.Tip="{DynamicResource Text.MergeConflictEditor.PrevConflict}"
                   Click="OnGotoPrevConflict"
+                  HotKey="{OnPlatform Ctrl+Up, macOS=⌘+Up}"
                   IsEnabled="{Binding HasUnresolvedConflicts, Mode=OneWay}">
             <Path Width="12" Height="12" Margin="0,6,0,0" Data="{StaticResource Icons.Up}"/>
           </Button>
           <Button Classes="icon_button"
                   Width="24"
                   ToolTip.Tip="{DynamicResource Text.MergeConflictEditor.NextConflict}"
                   Click="OnGotoNextConflict"
+                  HotKey="{OnPlatform Ctrl+Down, macOS=⌘+Down}"
                   IsEnabled="{Binding HasUnresolvedConflicts, Mode=OneWay}">
             <Path Width="12" Height="12" Margin="0,6,0,0" Data="{StaticResource Icons.Down}"/>
           </Button>
@@ -71,7 +72,7 @@
                   Margin="0,2" Padding="6,3"
                   Content="{DynamicResource Text.MergeConflictEditor.SaveAndStage}"
                   Click="OnSaveAndStage"
-                  IsEnabled="{Binding CanSave, Mode=OneWay}"/>
+                  HotKey="{OnPlatform Ctrl+S, macOS=⌘+S}"/>
         </StackPanel>
       </Grid>
     </Border>
@@ -257,12 +258,18 @@
             Effect="drop-shadow(0 0 12 #60000000)"
             IsVisible="{Binding Error, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
       <StackPanel Orientation="Vertical">
-        <Path Width="28" Height="28" Data="{StaticResource Icons.Error}"/>
+        <Path Width="32" Height="32" Fill="Orange" Data="{StaticResource Icons.Error}"/>
         <TextBlock Text="{Binding Error, Mode=OneWay}"
                    MaxWidth="500"
-                   Margin="0,12,0,0"
-                   FontSize="16"
+                   Margin="0,16"
                    TextWrapping="Wrap"/>
+        <Button Classes="flat primary"
+                MinWidth="80"
+                Margin="0"
+                HorizontalAlignment="Center"
+                Content="{DynamicResource Text.Sure}"
+                Command="{Binding ClearErrorMessage}"
+                HotKey="Escape"/>
       </StackPanel>
     </Border>
   </Grid>

src/Views/MergeConflictEditor.axaml.cs

@@ -232,7 +232,7 @@ private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs
 
         private void OnTextViewPointerChanged(object sender, PointerEventArgs e)
         {
-            if (DataContext is not ViewModels.MergeConflictEditor { IsLoading: false } vm)
+            if (DataContext is not ViewModels.MergeConflictEditor vm)
                 return;
 
             if (sender is not TextView view)
@@ -540,39 +540,6 @@ protected override void OnDataContextChanged(EventArgs e)
                 vm.PropertyChanged += OnViewModelPropertyChanged;
         }
 
-        protected override void OnKeyDown(KeyEventArgs e)
-        {
-            base.OnKeyDown(e);
-
-            if (e.Handled)
-                return;
-
-            var vm = DataContext as ViewModels.MergeConflictEditor;
-            if (vm == null)
-                return;
-
-            var modifier = OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control;
-
-            if (e.KeyModifiers == modifier)
-            {
-                if (e.Key == Key.S && vm.CanSave)
-                {
-                    OnSaveAndStage(null, null);
-                    e.Handled = true;
-                }
-                else if (e.Key == Key.Up)
-                {
-                    OnGotoPrevConflict(null, null);
-                    e.Handled = true;
-                }
-                else if (e.Key == Key.Down)
-                {
-                    OnGotoNextConflict(null, null);
-                    e.Handled = true;
-                }
-            }
-        }
-
         protected override async void OnClosing(WindowClosingEventArgs e)
         {
             base.OnClosing(e);

src/Views/WorkingCopy.axaml.cs

@@ -343,9 +343,7 @@ private ContextMenu CreateContextMenuForUnstagedChanges(ViewModels.WorkingCopy v
                         mergeBuiltin.Icon = App.CreateMenuIcon("Icons.Conflict");
                         mergeBuiltin.Click += async (_, e) =>
                         {
-                            var ctx = new ViewModels.MergeConflictEditor(repo, change.Path);
-                            await ctx.LoadAsync();
-                            await App.ShowDialog(ctx);
+                            await App.ShowDialog(new ViewModels.MergeConflictEditor(repo, change.Path));
                             e.Handled = true;
                         };