From ab080b53b12f7f2a0dd88abc0d7abd74085228ec Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 24 Jan 2025 11:40:44 +0800
Subject: [PATCH] enhance: exclude indicators or empty blocks in diff text view
 while copying text (#924)

---
 src/Views/TextDiffView.axaml.cs | 74 ++++++++++++++++++++++++++++++++-
 1 file changed, 73 insertions(+), 1 deletion(-)

diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index cca3751d..bd01a0a4 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -669,6 +669,8 @@ namespace SourceGit.Views
             TextArea.TextView.PointerWheelChanged += OnTextViewPointerWheelChanged;
             TextArea.TextView.VisualLinesChanged += OnTextViewVisualLinesChanged;
 
+            TextArea.AddHandler(KeyDownEvent, OnTextAreaKeyDown, RoutingStrategies.Tunnel);
+
             UpdateTextMate();
             OnTextViewVisualLinesChanged(null, null);
         }
@@ -677,6 +679,8 @@ namespace SourceGit.Views
         {
             base.OnUnloaded(e);
 
+            TextArea.RemoveHandler(KeyDownEvent, OnTextAreaKeyDown);
+
             TextArea.TextView.ContextRequested -= OnTextViewContextRequested;
             TextArea.TextView.PointerEntered -= OnTextViewPointerChanged;
             TextArea.TextView.PointerMoved -= OnTextViewPointerChanged;
@@ -732,6 +736,21 @@ namespace SourceGit.Views
             }
         }
 
+        private void OnTextAreaKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyModifiers.Equals(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control))
+            {
+                if (e.Key == Key.C)
+                {
+                    CopyWithoutIndicators();
+                    e.Handled = true;
+                }
+            }
+
+            if (!e.Handled)
+                base.OnKeyDown(e);
+        }
+
         private void OnBlockNavigationPropertyChanged(object _1, PropertyChangedEventArgs _2)
         {
             TextArea?.TextView?.Redraw();
@@ -748,7 +767,7 @@ namespace SourceGit.Views
             copy.Icon = App.CreateMenuIcon("Icons.Copy");
             copy.Click += (_, ev) =>
             {
-                App.CopyText(SelectedText);
+                CopyWithoutIndicators();
                 ev.Handled = true;
             };
 
@@ -941,6 +960,59 @@ namespace SourceGit.Views
             }
         }
 
+        private void CopyWithoutIndicators()
+        {
+            var selection = TextArea.Selection;
+            if (selection.IsEmpty)
+            {
+                App.CopyText(string.Empty);
+                return;
+            }
+
+            var lines = GetLines();
+            var startIdx = Math.Min(selection.StartPosition.Line - 1, lines.Count - 1);
+            var endIdx = Math.Min(selection.EndPosition.Line - 1, lines.Count - 1);
+
+            if (startIdx == endIdx)
+            {
+                var line = lines[startIdx];
+                if (line.Type == Models.TextDiffLineType.Indicator ||
+                    line.Type == Models.TextDiffLineType.None)
+                {
+                    App.CopyText(string.Empty);
+                    return;
+                }
+
+                App.CopyText(SelectedText);
+                return;
+            }
+
+            var builder = new StringBuilder();
+            for (var i = startIdx; i <= endIdx; i++)
+            {
+                var line = lines[i];
+                if (line.Type == Models.TextDiffLineType.Indicator ||
+                    line.Type == Models.TextDiffLineType.None)
+                    continue;
+
+                if (i == startIdx && selection.StartPosition.Column > 1)
+                {
+                    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));
+                    continue;
+                }
+
+                builder.AppendLine(line.Content);
+            }
+
+            App.CopyText(builder.ToString());
+        }
+
         private TextMate.Installation _textMate = null;
         private TextLocation _lastSelectStart = TextLocation.Empty;
         private TextLocation _lastSelectEnd = TextLocation.Empty;