feature: support compact folders display mode in changes tree view (#1674) (#1729)

Signed-off-by: leo <[email protected]>

Author: love-linger

src/Resources/Locales/en_US.axaml

@@ -526,6 +526,7 @@
   <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">APPEARANCE</x:String>
   <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Default Font</x:String>
   <x:String x:Key="Text.Preferences.Appearance.EditorTabWidth" xml:space="preserve">Editor Tab Width</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.EnableCompactFolders" xml:space="preserve">Enable compact folders in changes tree</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Font Size</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">Default</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">Editor</x:String>

src/Resources/Locales/zh_CN.axaml

@@ -530,6 +530,7 @@
   <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">外观配置</x:String>
   <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">缺省字体</x:String>
   <x:String x:Key="Text.Preferences.Appearance.EditorTabWidth" xml:space="preserve">编辑器制表符宽度</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.EnableCompactFolders" xml:space="preserve">在变更列表树中启用紧凑文件夹模式</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">字体大小</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">默认</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">代码编辑器</x:String>

src/Resources/Locales/zh_TW.axaml

@@ -530,6 +530,7 @@
   <x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">外觀設定</x:String>
   <x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">預設字型</x:String>
   <x:String x:Key="Text.Preferences.Appearance.EditorTabWidth" xml:space="preserve">編輯器 Tab 寬度</x:String>
+  <x:String x:Key="Text.Preferences.Appearance.EnableCompactFolders" xml:space="preserve">在變更樹中啟用精簡文件夾顯示模式</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">字型大小</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">預設</x:String>
   <x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">程式碼</x:String>

src/ViewModels/ChangeTreeNode.cs

@@ -1,12 +1,13 @@
 using System.Collections.Generic;
-
+using System.IO;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
 {
     public class ChangeTreeNode : ObservableObject
     {
         public string FullPath { get; set; }
+        public string DisplayName { get; set; }
         public int Depth { get; private set; } = 0;
         public Models.Change Change { get; set; } = null;
         public List<ChangeTreeNode> Children { get; set; } = new List<ChangeTreeNode>();
@@ -32,22 +33,22 @@ public bool IsExpanded
             set => SetProperty(ref _isExpanded, value);
         }
 
-        public ChangeTreeNode(Models.Change c, int depth)
+        public ChangeTreeNode(Models.Change c)
         {
             FullPath = c.Path;
-            Depth = depth;
+            DisplayName = Path.GetFileName(c.Path);
             Change = c;
             IsExpanded = false;
         }
 
-        public ChangeTreeNode(string path, bool isExpanded, int depth)
+        public ChangeTreeNode(string path, bool isExpanded)
         {
             FullPath = path;
-            Depth = depth;
+            DisplayName = Path.GetFileName(path);
             IsExpanded = isExpanded;
         }
 
-        public static List<ChangeTreeNode> Build(IList<Models.Change> changes, HashSet<string> folded)
+        public static List<ChangeTreeNode> Build(IList<Models.Change> changes, HashSet<string> folded, bool compactFolders)
         {
             var nodes = new List<ChangeTreeNode>();
             var folders = new Dictionary<string, ChangeTreeNode>();
@@ -57,12 +58,11 @@ public static List<ChangeTreeNode> Build(IList<Models.Change> changes, HashSet<s
                 var sepIdx = c.Path.IndexOf('/');
                 if (sepIdx == -1)
                 {
-                    nodes.Add(new ChangeTreeNode(c, 0));
+                    nodes.Add(new ChangeTreeNode(c));
                 }
                 else
                 {
                     ChangeTreeNode lastFolder = null;
-                    int depth = 0;
 
                     while (sepIdx != -1)
                     {
@@ -73,27 +73,32 @@ public static List<ChangeTreeNode> Build(IList<Models.Change> changes, HashSet<s
                         }
                         else if (lastFolder == null)
                         {
-                            lastFolder = new ChangeTreeNode(folder, !folded.Contains(folder), depth);
+                            lastFolder = new ChangeTreeNode(folder, !folded.Contains(folder));
                             folders.Add(folder, lastFolder);
                             InsertFolder(nodes, lastFolder);
                         }
                         else
                         {
-                            var cur = new ChangeTreeNode(folder, !folded.Contains(folder), depth);
+                            var cur = new ChangeTreeNode(folder, !folded.Contains(folder));
                             folders.Add(folder, cur);
                             InsertFolder(lastFolder.Children, cur);
                             lastFolder = cur;
                         }
 
-                        depth++;
                         sepIdx = c.Path.IndexOf('/', sepIdx + 1);
                     }
 
-                    lastFolder?.Children.Add(new ChangeTreeNode(c, depth));
+                    lastFolder?.Children.Add(new ChangeTreeNode(c));
                 }
             }
 
-            Sort(nodes);
+            if (compactFolders)
+            {
+                foreach (var node in nodes)
+                    Compact(node);
+            }
+
+            SortAndSetDepth(nodes, 0);
 
             folders.Clear();
             return nodes;
@@ -113,12 +118,37 @@ private static void InsertFolder(List<ChangeTreeNode> collection, ChangeTreeNode
             collection.Add(subFolder);
         }
 
-        private static void Sort(List<ChangeTreeNode> nodes)
+        private static void Compact(ChangeTreeNode node)
+        {
+            var childrenCount = node.Children.Count;
+            if (childrenCount == 0)
+                return;
+
+            if (childrenCount > 1)
+            {
+                foreach (var c in node.Children)
+                    Compact(c);
+                return;
+            }
+
+            var child = node.Children[0];
+            if (child.Change != null)
+                return;
+
+            node.FullPath = $"{node.FullPath}/{child.DisplayName}";
+            node.DisplayName = $"{node.DisplayName} / {child.DisplayName}";
+            node.IsExpanded = child.IsExpanded;
+            node.Children = child.Children;
+            Compact(node);
+        }
+
+        private static void SortAndSetDepth(List<ChangeTreeNode> nodes, int depth)
         {
             foreach (var node in nodes)
             {
+                node.Depth = depth;
                 if (node.IsFolder)
-                    Sort(node.Children);
+                    SortAndSetDepth(node.Children, depth + 1);
             }
 
             nodes.Sort((l, r) =>

src/ViewModels/Preferences.cs

@@ -267,6 +267,12 @@ public int LFSImageActiveIdx
             set => SetProperty(ref _lfsImageActiveIdx, value);
         }
 
+        public bool EnableCompactFoldersInChangesTree
+        {
+            get => _enableCompactFoldersInChangesTree;
+            set => SetProperty(ref _enableCompactFoldersInChangesTree, value);
+        }
+
         public Models.ChangeViewMode UnstagedChangeViewMode
         {
             get => _unstagedChangeViewMode;
@@ -718,6 +724,7 @@ private bool RemoveInvalidRepositoriesRecursive(List<RepositoryNode> collection)
         private bool _useFullTextDiff = false;
         private bool _useBlockNavigationInDiffView = false;
         private int _lfsImageActiveIdx = 0;
+        private bool _enableCompactFoldersInChangesTree = false;
 
         private Models.ChangeViewMode _unstagedChangeViewMode = Models.ChangeViewMode.List;
         private Models.ChangeViewMode _stagedChangeViewMode = Models.ChangeViewMode.List;

src/Views/BranchCompare.axaml

@@ -125,6 +125,7 @@
           <!-- Changes -->
           <Border Grid.Row="1" Margin="0,4,0,0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}">
             <v:ChangeCollectionView ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode}"
+                                    EnableCompactFolders="{Binding Source={x:Static vm:Preferences.Instance}, Path=EnableCompactFoldersInChangesTree}"
                                     Changes="{Binding VisibleChanges}"
                                     SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
                                     ContextRequested="OnChangeContextRequested"/>

src/Views/ChangeCollectionView.axaml

@@ -65,8 +65,8 @@
                                   IsVisible="{Binding !IsFolder}"/>
 
               <StackPanel Grid.Column="2" Orientation="Horizontal" Margin="4,0,0,0">
-                <TextBlock Classes="primary" Text="{Binding ConflictMarker}" Foreground="DarkOrange" FontWeight="Bold" Margin="0,0,4,0" IsVisible="{Binding ShowConflictMarker}"/>
-                <TextBlock Classes="primary" Text="{Binding FullPath, Converter={x:Static c:PathConverters.PureFileName}}"/>
+                <TextBlock Classes="primary" Text="{Binding ConflictMarker, Mode=OneWay}" Foreground="DarkOrange" FontWeight="Bold" Margin="0,0,4,0" IsVisible="{Binding ShowConflictMarker}"/>
+                <TextBlock Classes="primary" Text="{Binding DisplayName, Mode=OneWay}"/>
               </StackPanel>
             </Grid>
           </DataTemplate>

src/Views/ChangeCollectionView.axaml.cs

@@ -109,6 +109,15 @@ public Models.ChangeViewMode ViewMode
             set => SetValue(ViewModeProperty, value);
         }
 
+        public static readonly StyledProperty<bool> EnableCompactFoldersProperty =
+            AvaloniaProperty.Register<ChangeCollectionView, bool>(nameof(EnableCompactFolders), false);
+
+        public bool EnableCompactFolders
+        {
+            get => GetValue(EnableCompactFoldersProperty);
+            set => SetValue(EnableCompactFoldersProperty, value);
+        }
+
         public static readonly StyledProperty<List<Models.Change>> ChangesProperty =
             AvaloniaProperty.Register<ChangeCollectionView, List<Models.Change>>(nameof(Changes));
 
@@ -254,6 +263,9 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
                 UpdateDataSource(false);
             else if (change.Property == SelectedChangesProperty)
                 UpdateSelection();
+
+            if (change.Property == EnableCompactFoldersProperty && ViewMode == Models.ChangeViewMode.Tree)
+                UpdateDataSource(true);
         }
 
         private void OnRowDataContextChanged(object sender, EventArgs e)
@@ -384,7 +396,7 @@ private void UpdateDataSource(bool onlyViewModeChange)
                 }
 
                 var tree = new ViewModels.ChangeCollectionAsTree();
-                tree.Tree = ViewModels.ChangeTreeNode.Build(changes, oldFolded);
+                tree.Tree = ViewModels.ChangeTreeNode.Build(changes, oldFolded, EnableCompactFolders);
 
                 var rows = new List<ViewModels.ChangeTreeNode>();
                 MakeTreeRows(rows, tree.Tree);

src/Views/CommitChanges.axaml

@@ -48,6 +48,7 @@
       <Border Grid.Row="1" Margin="0,4,0,0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}">
         <v:ChangeCollectionView SelectionMode="Single"
                                 ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=CommitChangeViewMode}"
+                                EnableCompactFolders="{Binding Source={x:Static vm:Preferences.Instance}, Path=EnableCompactFoldersInChangesTree}"
                                 Changes="{Binding VisibleChanges}"
                                 SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
                                 ContextRequested="OnChangeContextRequested"/>

src/Views/Preferences.axaml

@@ -159,7 +159,7 @@
           <TabItem.Header>
             <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.Appearance}"/>
           </TabItem.Header>
-          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
+          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
             <TextBlock Grid.Row="0" Grid.Column="0"
                        Text="{DynamicResource Text.Preferences.Appearance.Theme}"
                        HorizontalAlignment="Right"
@@ -266,6 +266,11 @@
                       IsChecked="{Binding UseFixedTabWidth, Mode=TwoWay}"/>
 
             <CheckBox Grid.Row="8" Grid.Column="1"
+                      Height="32"
+                      Content="{DynamicResource Text.Preferences.Appearance.EnableCompactFolders}"
+                      IsChecked="{Binding EnableCompactFoldersInChangesTree, Mode=TwoWay}"/>
+
+            <CheckBox Grid.Row="9" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.Appearance.UseNativeWindowFrame}"
                       IsChecked="{Binding UseSystemWindowFrame, Mode=OneTime}"