refactor: rewrite text-diff

This commit also contains a feature request #1722

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

Author: love-linger

src/Commands/Diff.cs

@@ -20,11 +20,7 @@ public partial class Diff : Command
 
         public Diff(string repo, Models.DiffOption opt, int unified, bool ignoreWhitespace)
         {
-            _result.TextDiff = new Models.TextDiff()
-            {
-                Repo = repo,
-                Option = opt,
-            };
+            _result.TextDiff = new Models.TextDiff() { Option = opt };
 
             WorkingDirectory = repo;
             Context = repo;

src/Models/DiffResult.cs

@@ -1,8 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
-
-using Avalonia;
 using Avalonia.Media.Imaging;
 
 namespace SourceGit.Models
@@ -62,13 +60,10 @@ public bool IsInRange(int idx)
     public partial class TextDiff
     {
         public string File { get; set; } = string.Empty;
+        public DiffOption Option { get; set; } = null;
         public List<TextDiffLine> Lines { get; set; } = new List<TextDiffLine>();
-        public Vector ScrollOffset { get; set; } = Vector.Zero;
         public int MaxLineNumber = 0;
 
-        public string Repo { get; set; } = null;
-        public DiffOption Option { get; set; } = null;
-
         public TextDiffSelection MakeSelection(int startLine, int endLine, bool isCombined, bool isOldSide)
         {
             var rs = new TextDiffSelection();

src/ViewModels/BlockNavigation.cs

@@ -54,8 +54,8 @@ public BlockNavigation(object context)
             Current = -1;
 
             var lines = new List<Models.TextDiffLine>();
-            if (context is Models.TextDiff combined)
-                lines = combined.Lines;
+            if (context is CombinedTextDiff combined)
+                lines = combined.Data.Lines;
             else if (context is TwoSideTextDiff twoSide)
                 lines = twoSide.Old;
 
@@ -96,7 +96,10 @@ public BlockNavigation(object context)
 
         public Block GetCurrentBlock()
         {
-            return (_current >= 0 && _current < Blocks.Count) ? Blocks[_current] : null;
+            if (_current >= 0 && _current < Blocks.Count)
+                return Blocks[_current];
+
+            return Blocks.Count > 0 ? Blocks[0] : null;
         }
 
         public Block GotoFirst()
@@ -105,6 +108,7 @@ public Block GotoFirst()
                 return null;
 
             Current = 0;
+            OnPropertyChanged(nameof(Indicator));
             return Blocks[_current];
         }
 
@@ -117,6 +121,8 @@ public Block GotoPrev()
                 Current = 0;
             else if (_current > 0)
                 Current = _current - 1;
+
+            OnPropertyChanged(nameof(Indicator));
             return Blocks[_current];
         }
 
@@ -127,6 +133,8 @@ public Block GotoNext()
 
             if (_current < Blocks.Count - 1)
                 Current = _current + 1;
+
+            OnPropertyChanged(nameof(Indicator));
             return Blocks[_current];
         }
 
@@ -136,9 +144,35 @@ public Block GotoLast()
                 return null;
 
             Current = Blocks.Count - 1;
+            OnPropertyChanged(nameof(Indicator));
             return Blocks[_current];
         }
 
+        public void AutoUpdate(int start, int end)
+        {
+            if (_current >= 0 && _current < Blocks.Count)
+            {
+                var block = Blocks[_current];
+                if ((block.Start >= start && block.Start <= end) ||
+                    (block.End >= start && block.End <= end) ||
+                    (block.Start <= start && block.End >= end))
+                    return;
+            }
+
+            for (var i = 0; i < Blocks.Count; i++)
+            {
+                var block = Blocks[i];
+                if ((block.Start >= start && block.Start <= end) ||
+                    (block.End >= start && block.End <= end) ||
+                    (block.Start <= start && block.End >= end))
+                {
+                    Current = i;
+                    OnPropertyChanged(nameof(Indicator));
+                    return;
+                }
+            }
+        }
+
         private int _current = -1;
     }
 }

src/ViewModels/DiffContext.cs

@@ -1,9 +1,8 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-
+using Avalonia;
 using Avalonia.Threading;
-
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
@@ -24,7 +23,64 @@ public bool IgnoreWhitespace
                 {
                     Preferences.Instance.IgnoreWhitespaceChangesInDiff = value;
                     OnPropertyChanged();
-                    LoadDiffContent();
+
+                    if (_isTextDiff)
+                        LoadContent();
+                }
+            }
+        }
+
+        public bool ShowEntireFile
+        {
+            get => Preferences.Instance.UseFullTextDiff;
+            set
+            {
+                if (value != Preferences.Instance.UseFullTextDiff)
+                {
+                    Preferences.Instance.UseFullTextDiff = value;
+                    OnPropertyChanged();
+
+                    if (_isTextDiff)
+                    {
+                        if (Content is CombinedTextDiff combined)
+                            combined.ScrollOffset = Vector.Zero;
+                        else if (Content is TwoSideTextDiff twoSide)
+                            twoSide.Data.File = string.Empty;
+
+                        LoadContent();
+                    }
+                }
+            }
+        }
+
+        public bool UseBlockNavigation
+        {
+            get => Preferences.Instance.UseBlockNavigationInDiffView;
+            set
+            {
+                if (value != Preferences.Instance.UseBlockNavigationInDiffView)
+                {
+                    Preferences.Instance.UseBlockNavigationInDiffView = value;
+                    OnPropertyChanged();
+
+                    if (Content is CombinedTextDiff combined)
+                        combined.BlockNavigation = value ? new BlockNavigation(combined) : null;
+                    else if (Content is TwoSideTextDiff twoSide)
+                        twoSide.BlockNavigation = value ? new BlockNavigation(twoSide) : null;
+                }
+            }
+        }
+
+        public bool UseSideBySide
+        {
+            get => Preferences.Instance.UseSideBySideDiff;
+            set
+            {
+                if (value != Preferences.Instance.UseSideBySideDiff)
+                {
+                    Preferences.Instance.UseSideBySideDiff = value;
+                    OnPropertyChanged();
+                    SwitchTextDiffMode();
                 }
             }
         }
@@ -72,33 +128,37 @@ public DiffContext(string repo, Models.DiffOption option, DiffContext previous =
             else
                 Title = $"{_option.OrgPath} → {_option.Path}";
 
-            LoadDiffContent();
-        }
-
-        public void ToggleFullTextDiff()
-        {
-            Preferences.Instance.UseFullTextDiff = !Preferences.Instance.UseFullTextDiff;
-            LoadDiffContent();
+            LoadContent();
         }
 
         public void IncrUnified()
         {
             UnifiedLines = _unifiedLines + 1;
-            LoadDiffContent();
+            LoadContent();
         }
 
         public void DecrUnified()
         {
             UnifiedLines = Math.Max(4, _unifiedLines - 1);
-            LoadDiffContent();
+            LoadContent();
         }
 
         public void OpenExternalMergeTool()
         {
             new Commands.DiffTool(_repo, _option).Open();
         }
 
-        private void LoadDiffContent()
+        public void SwitchTextDiffMode()
+        {
+            var useSideBySide = Preferences.Instance.UseSideBySideDiff;
+            var hasBlockNavigation = Preferences.Instance.UseBlockNavigationInDiffView;
+            if (useSideBySide && _content is CombinedTextDiff combined)
+                Content = new TwoSideTextDiff(combined.Data, hasBlockNavigation);
+            else if (!useSideBySide && _content is TwoSideTextDiff twoSide)
+                Content = new CombinedTextDiff(twoSide.Data, hasBlockNavigation);
+        }
+
+        private void LoadContent()
         {
             if (_option.Path.EndsWith('/'))
             {
@@ -228,12 +288,23 @@ private void LoadDiffContent()
 
                 Dispatcher.UIThread.Post(() =>
                 {
-                    if (_content is Models.TextDiff old && rs is Models.TextDiff cur && old.File == cur.File)
-                        cur.ScrollOffset = old.ScrollOffset;
-
                     FileModeChange = latest.FileModeChange;
-                    Content = rs;
-                    IsTextDiff = rs is Models.TextDiff;
+
+                    if (rs is Models.TextDiff cur)
+                    {
+                        IsTextDiff = true;
+
+                        var hasBlockNavigation = Preferences.Instance.UseBlockNavigationInDiffView;
+                        if (Preferences.Instance.UseSideBySideDiff)
+                            Content = new TwoSideTextDiff(cur, hasBlockNavigation, _content as TwoSideTextDiff);
+                        else
+                            Content = new CombinedTextDiff(cur, hasBlockNavigation, _content as CombinedTextDiff);
+                    }
+                    else
+                    {
+                        IsTextDiff = false;
+                        Content = rs;
+                    }
                 });
             });
         }

src/ViewModels/TwoSideTextDiff.cs src/ViewModels/TextDiffContext.cssrc/ViewModels/TwoSideTextDiff.cs renamed to src/ViewModels/TextDiffContext.cs

@@ -1,29 +1,70 @@
 using System;
 using System.Collections.Generic;
-
 using Avalonia;
-
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
 {
+    public class CombinedTextDiff : ObservableObject
+    {
+        public Models.TextDiff Data { get; }
+
+        public string File => Data.File;
+        public int MaxLineNumber => Data.MaxLineNumber;
+        public bool IsUnstaged => Data.Option.IsUnstaged;
+        public bool EnableChunkOption => Data.Option.WorkingCopyChange != null;
+
+        public Vector ScrollOffset
+        {
+            get => _scrollOffset;
+            set => SetProperty(ref _scrollOffset, value);
+        }
+
+        public BlockNavigation BlockNavigation
+        {
+            get => _blockNavigation;
+            set => SetProperty(ref _blockNavigation, value);
+        }
+
+        public CombinedTextDiff(Models.TextDiff diff, bool hasBlockNavigation, CombinedTextDiff previous = null)
+        {
+            Data = diff;
+            BlockNavigation = hasBlockNavigation ? new BlockNavigation(this) : null;
+
+            if (previous != null && previous.File.Equals(File, StringComparison.Ordinal))
+                ScrollOffset = previous.ScrollOffset;
+        }
+
+        private Vector _scrollOffset = Vector.Zero;
+        private BlockNavigation _blockNavigation = null;
+    }
+
     public class TwoSideTextDiff : ObservableObject
     {
-        public string File { get; set; }
-        public List<Models.TextDiffLine> Old { get; set; } = new List<Models.TextDiffLine>();
-        public List<Models.TextDiffLine> New { get; set; } = new List<Models.TextDiffLine>();
-        public int MaxLineNumber = 0;
+        public Models.TextDiff Data { get; }
+        public List<Models.TextDiffLine> Old { get; } = new List<Models.TextDiffLine>();
+        public List<Models.TextDiffLine> New { get; } = new List<Models.TextDiffLine>();
+
+        public string File => Data.File;
+        public int MaxLineNumber => Data.MaxLineNumber;
+        public bool IsUnstaged => Data.Option.IsUnstaged;
+        public bool EnableChunkOption => Data.Option.WorkingCopyChange != null;
 
         public Vector SyncScrollOffset
         {
             get => _syncScrollOffset;
             set => SetProperty(ref _syncScrollOffset, value);
         }
 
-        public TwoSideTextDiff(Models.TextDiff diff, TwoSideTextDiff previous = null)
+        public BlockNavigation BlockNavigation
         {
-            File = diff.File;
-            MaxLineNumber = diff.MaxLineNumber;
+            get => _blockNavigation;
+            set => SetProperty(ref _blockNavigation, value);
+        }
+
+        public TwoSideTextDiff(Models.TextDiff diff, bool hasBlockNavigation, TwoSideTextDiff previous = null)
+        {
+            Data = diff;
 
             foreach (var line in diff.Lines)
             {
@@ -45,8 +86,12 @@ public TwoSideTextDiff(Models.TextDiff diff, TwoSideTextDiff previous = null)
 
             FillEmptyLines();
 
-            if (previous != null && previous.File == File)
+            BlockNavigation = hasBlockNavigation ? new BlockNavigation(this) : null;
+            if (previous != null && previous.File.Equals(File, StringComparison.Ordinal))
+            {
                 _syncScrollOffset = previous._syncScrollOffset;
+                _blockNavigation = previous._blockNavigation;
+            }
         }
 
         public void ConvertsToCombinedRange(Models.TextDiff combined, ref int startLine, ref int endLine, bool isOldSide)
@@ -105,5 +150,6 @@ private void FillEmptyLines()
         }
 
         private Vector _syncScrollOffset = Vector.Zero;
+        private BlockNavigation _blockNavigation = null;
     }
 }