From 59b7fd8c617be28da53d18117cadcb970c921dad Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 7 Mar 2024 16:54:09 +0800
Subject: [PATCH] optimize: better supports for LFS object

---
 src/Commands/Diff.cs     | 18 ++++++++++++++++--
 src/Views/DiffView.axaml |  4 ++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/Commands/Diff.cs b/src/Commands/Diff.cs
index 51a592de..611bb9a2 100644
--- a/src/Commands/Diff.cs
+++ b/src/Commands/Diff.cs
@@ -5,7 +5,9 @@ using System.Text.RegularExpressions;
 namespace SourceGit.Commands {
     public class Diff : Command {
         private static readonly Regex REG_INDICATOR = new Regex(@"^@@ \-(\d+),?\d* \+(\d+),?\d* @@");
-        private static readonly string PREFIX_LFS = " version https://git-lfs.github.com/spec/";
+        private static readonly string PREFIX_LFS_NEW = "+version https://git-lfs.github.com/spec/";
+        private static readonly string PREFIX_LFS_DEL = "-version https://git-lfs.github.com/spec/";
+        private static readonly string PREFIX_LFS_MODIFY = " version https://git-lfs.github.com/spec/";
 
         public Diff(string repo, Models.DiffOption opt) {
             WorkingDirectory = repo;
@@ -77,9 +79,21 @@ namespace SourceGit.Commands {
 
                 var ch = line[0];
                 if (ch == '-') {
+                    if (_oldLine == 1 && _newLine == 0 && line.StartsWith(PREFIX_LFS_DEL, StringComparison.Ordinal)) {
+                        _result.IsLFS = true;
+                        _result.LFSDiff = new Models.LFSDiff();
+                        return;
+                    }
+
                     _deleted.Add(new Models.TextDiffLine(Models.TextDiffLineType.Deleted, line.Substring(1), _oldLine, 0));
                     _oldLine++;
                 } else if (ch == '+') {
+                    if (_oldLine == 0 && _newLine == 1 && line.StartsWith(PREFIX_LFS_NEW, StringComparison.Ordinal)) {
+                        _result.IsLFS = true;
+                        _result.LFSDiff = new Models.LFSDiff();
+                        return;
+                    }
+
                     _added.Add(new Models.TextDiffLine(Models.TextDiffLineType.Added, line.Substring(1), 0, _newLine));
                     _newLine++;
                 } else if (ch != '\\') {
@@ -90,7 +104,7 @@ namespace SourceGit.Commands {
                         _newLine = int.Parse(match.Groups[2].Value);
                         _result.TextDiff.Lines.Add(new Models.TextDiffLine(Models.TextDiffLineType.Indicator, line, 0, 0));
                     } else {
-                        if (line.StartsWith(PREFIX_LFS)) {
+                        if (_oldLine == 1 && _newLine == 1 && line.StartsWith(PREFIX_LFS_MODIFY, StringComparison.Ordinal)) {
                             _result.IsLFS = true;
                             _result.LFSDiff = new Models.LFSDiff();
                             return;
diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index af870bcf..83796133 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -72,7 +72,7 @@
                 <TextBlock Grid.Row="0" Grid.Column="1" Classes="monospace" Text="{Binding OldSize}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right" FontSize="16" Margin="8,0"/>
                 <TextBlock Grid.Row="0" Grid.Column="2" Classes="monospace" Text="{DynamicResource Text.Bytes}" Foreground="{DynamicResource Brush.FG2}" FontSize="16"/>
 
-                <Border Grid.Row="1" Grid.Column="0" Height="16" Background="{DynamicResource Brush.Accent1}" CornerRadius="8" VerticalAlignment="Center">
+                <Border Grid.Row="1" Grid.Column="0" Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center">
                   <TextBlock Classes="monospace" Text="{DynamicResource Text.Diff.Binary.New}" Margin="8,0" FontSize="10"/>
                 </Border>
 
@@ -99,7 +99,7 @@
                 <TextBlock Grid.Row="0" Grid.Column="1" Classes="monospace" Text="{Binding Old.Size}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right" FontSize="16" Margin="8,0"/>
                 <TextBlock Grid.Row="0" Grid.Column="2" Classes="monospace" Text="{DynamicResource Text.Bytes}" Foreground="{DynamicResource Brush.FG2}" FontSize="16"/>
 
-                <Border Grid.Row="1" Grid.Column="0" Height="16" Background="{DynamicResource Brush.Accent1}" CornerRadius="8" VerticalAlignment="Center">
+                <Border Grid.Row="1" Grid.Column="0" Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center">
                   <TextBlock Classes="monospace" Text="{DynamicResource Text.Diff.Binary.New}" Margin="8,0" FontSize="10"/>
                 </Border>