enhance: unify selection mode and hunk mode

love-linger · love-linger · commit 9de28530032e · 2024-07-18T16:26:39.000+08:00
diff --git a/src/Models/DiffResult.cs b/src/Models/DiffResult.cs
@@ -69,7 +69,7 @@ public partial class TextDiff
         public string Repo { get; set; } = null;
         public DiffOption Option { get; set; } = null;
 
-        public TextDiffSelection MakeSelection(int startLine, int endLine, bool isSideBySide, bool isOldSide)
+        public TextDiffSelection MakeSelection(int startLine, int endLine, bool isCombined, bool isOldSide)
         {
             var rs = new TextDiffSelection();
             rs.StartLine = startLine;
@@ -95,7 +95,7 @@ public TextDiffSelection MakeSelection(int startLine, int endLine, bool isSideBy
                 var line = Lines[i];
                 if (line.Type == TextDiffLineType.Added)
                 {
-                    if (!isSideBySide)
+                    if (isCombined)
                     {
                         rs.HasChanges = true;
                         break;
@@ -111,7 +111,7 @@ public TextDiffSelection MakeSelection(int startLine, int endLine, bool isSideBy
                 }
                 else if (line.Type == TextDiffLineType.Deleted)
                 {
-                    if (!isSideBySide)
+                    if (isCombined)
                     {
                         rs.HasChanges = true;
                         break;
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
@@ -307,9 +307,9 @@
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoNextMatch" xml:space="preserve">Find next match</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoPrevMatch" xml:space="preserve">Find previous match</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.Search" xml:space="preserve">Open search panel</x:String>
-  <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">Stage Hunk</x:String>
-  <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">Unstage Hunk</x:String>
-  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">Discard Hunk</x:String>
+  <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">Stage</x:String>
+  <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">Unstage</x:String>
+  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">Discard</x:String>
   <x:String x:Key="Text.Init" xml:space="preserve">Initialize Repository</x:String>
   <x:String x:Key="Text.Init.Path" xml:space="preserve">Path:</x:String>
   <x:String x:Key="Text.Init.Tip" xml:space="preserve">Invalid repository detected. Run `git init` under this path?</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
@@ -310,9 +310,9 @@
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoNextMatch" xml:space="preserve">定位到下一个匹配搜索的位置</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoPrevMatch" xml:space="preserve">定位到上一个匹配搜索的位置</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.Search" xml:space="preserve">打开搜索</x:String>
-  <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">暂存片断</x:String>
+  <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">暂存</x:String>
   <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">移出暂存区</x:String>
-  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">丢弃片断</x:String>
+  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">丢弃</x:String>
   <x:String x:Key="Text.Init" xml:space="preserve">初始化新仓库</x:String>
   <x:String x:Key="Text.Init.Path" xml:space="preserve">路径 ：</x:String>
   <x:String x:Key="Text.Init.Tip" xml:space="preserve">选择目录不是有效的Git仓库。是否需要在此目录执行`git init`操作？</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
@@ -310,9 +310,9 @@
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoNextMatch" xml:space="preserve">定位到下一個匹配搜尋的位置</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.GotoPrevMatch" xml:space="preserve">定位到上一個匹配搜尋的位置</x:String>
   <x:String x:Key="Text.Hotkeys.TextEditor.Search" xml:space="preserve">開啟搜尋</x:String>
-  <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">暫存片斷</x:String>
+  <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">暫存</x:String>
   <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">移出暫存區</x:String>
-  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">丟棄片斷</x:String>
+  <x:String x:Key="Text.Hunk.Discard" xml:space="preserve">丟棄</x:String>
   <x:String x:Key="Text.Init" xml:space="preserve">初始化新倉庫</x:String>
   <x:String x:Key="Text.Init.Path" xml:space="preserve">路徑 ：</x:String>
   <x:String x:Key="Text.Init.Tip" xml:space="preserve">選擇目錄不是有效的Git倉庫。是否需要在此目錄執行`git init`操作？</x:String>
diff --git a/src/ViewModels/TwoSideTextDiff.cs b/src/ViewModels/TwoSideTextDiff.cs
@@ -58,11 +58,11 @@ public TwoSideTextDiff(Models.TextDiff diff, TwoSideTextDiff previous = null)
 
         public void ConvertsToCombinedRange(Models.TextDiff combined, ref int startLine, ref int endLine, bool isOldSide)
         {
-            endLine = Math.Min(endLine, combined.Lines.Count);
+            endLine = Math.Min(endLine, combined.Lines.Count - 1);
 
             var oneSide = isOldSide ? Old : New;
             var firstContentLine = -1;
-            for (int i = startLine - 1; i < endLine; i++)
+            for (int i = startLine; i <= endLine; i++)
             {
                 var line = oneSide[i];
                 if (line.Type != Models.TextDiffLineType.None)
@@ -76,7 +76,7 @@ public void ConvertsToCombinedRange(Models.TextDiff combined, ref int startLine,
                 return;
 
             var endContentLine = -1;
-            for (int i = Math.Min(endLine - 1, oneSide.Count - 1); i >= startLine - 1; i--)
+            for (int i = Math.Min(endLine, oneSide.Count - 1); i >= startLine; i--)
             {
                 var line = oneSide[i];
                 if (line.Type != Models.TextDiffLineType.None)
@@ -91,8 +91,8 @@ public void ConvertsToCombinedRange(Models.TextDiff combined, ref int startLine,
 
             var firstContent = oneSide[firstContentLine];
             var endContent = oneSide[endContentLine];
-            startLine = combined.Lines.IndexOf(firstContent) + 1;
-            endLine = combined.Lines.IndexOf(endContent) + 1;
+            startLine = combined.Lines.IndexOf(firstContent);
+            endLine = combined.Lines.IndexOf(endContent);
         }
 
         private void FillEmptyLines()
diff --git a/src/Views/TextDiffView.axaml b/src/Views/TextDiffView.axaml
@@ -26,7 +26,7 @@
                                        UseSyntaxHighlighting="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSyntaxHighlighting}"
                                        WordWrap="{Binding Source={x:Static vm:Preference.Instance}, Path=EnableDiffViewWordWrap}"
                                        ShowHiddenSymbols="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowHiddenSymbolsInDiffView}"
-                                       HighlightChunk="{Binding #ThisControl.HighlightChunk, Mode=TwoWay}"/>
+                                       SelectedChunk="{Binding #ThisControl.SelectedChunk, Mode=TwoWay}"/>
         </DataTemplate>
 
         <DataTemplate DataType="vm:TwoSideTextDiff">
@@ -46,7 +46,7 @@
                                            UseSyntaxHighlighting="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSyntaxHighlighting}"
                                            WordWrap="{Binding Source={x:Static vm:Preference.Instance}, Path=EnableDiffViewWordWrap}"
                                            ShowHiddenSymbols="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowHiddenSymbolsInDiffView}"
-                                           HighlightChunk="{Binding #ThisControl.HighlightChunk, Mode=TwoWay}"/>
+                                           SelectedChunk="{Binding #ThisControl.SelectedChunk, Mode=TwoWay}"/>
 
             <Rectangle Grid.Column="1" Fill="{DynamicResource Brush.Border2}" Width="1" HorizontalAlignment="Center" VerticalAlignment="Stretch"/>
 
@@ -65,7 +65,7 @@
                                            UseSyntaxHighlighting="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSyntaxHighlighting}"
                                            WordWrap="{Binding Source={x:Static vm:Preference.Instance}, Path=EnableDiffViewWordWrap}"
                                            ShowHiddenSymbols="{Binding Source={x:Static vm:Preference.Instance}, Path=ShowHiddenSymbolsInDiffView}"
-                                           HighlightChunk="{Binding #ThisControl.HighlightChunk, Mode=TwoWay}"/>
+                                           SelectedChunk="{Binding #ThisControl.SelectedChunk, Mode=TwoWay}"/>
           </Grid>
         </DataTemplate>
       </ContentControl.DataTemplates>
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public partial class TextDiff`
`69`	`69`	`public string Repo { get; set; } = null;`
`70`	`70`	`public DiffOption Option { get; set; } = null;`
`71`	`71`
`72`		`- public TextDiffSelection MakeSelection(int startLine, int endLine, bool isSideBySide, bool isOldSide)`
	`72`	`+ public TextDiffSelection MakeSelection(int startLine, int endLine, bool isCombined, bool isOldSide)`
`73`	`73`	`{`
`74`	`74`	`var rs = new TextDiffSelection();`
`75`	`75`	`rs.StartLine = startLine;`
`@@ -95,7 +95,7 @@ public TextDiffSelection MakeSelection(int startLine, int endLine, bool isSideBy`
`95`	`95`	`var line = Lines[i];`
`96`	`96`	`if (line.Type == TextDiffLineType.Added)`
`97`	`97`	`{`
`98`		`- if (!isSideBySide)`
	`98`	`+ if (isCombined)`
`99`	`99`	`{`
`100`	`100`	`rs.HasChanges = true;`
`101`	`101`	`break;`
`@@ -111,7 +111,7 @@ public TextDiffSelection MakeSelection(int startLine, int endLine, bool isSideBy`
`111`	`111`	`}`
`112`	`112`	`else if (line.Type == TextDiffLineType.Deleted)`
`113`	`113`	`{`
`114`		`- if (!isSideBySide)`
	`114`	`+ if (isCombined)`
`115`	`115`	`{`
`116`	`116`	`rs.HasChanges = true;`
`117`	`117`	`break;`