feature: supports filter displayed branches

love-linger · love-linger · commit 02e71d4d7513 · 2024-05-14T11:47:56.000+08:00
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
@@ -342,6 +342,7 @@
   <x:String x:Key="Text.Repository.Configure" xml:space="preserve">Configure this repository</x:String>
   <x:String x:Key="Text.Repository.Continue" xml:space="preserve">CONTINUE</x:String>
   <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Open In File Browser</x:String>
+  <x:String x:Key="Text.Repository.FilterBranchTip" xml:space="preserve">Filter Branches</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">LOCAL BRANCHES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Navigate To HEAD</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">Create Branch</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
@@ -342,6 +342,7 @@
   <x:String x:Key="Text.Repository.Configure" xml:space="preserve">配置本仓库</x:String>
   <x:String x:Key="Text.Repository.Continue" xml:space="preserve">下一步</x:String>
   <x:String x:Key="Text.Repository.Explore" xml:space="preserve">在文件浏览器中打开</x:String>
+  <x:String x:Key="Text.Repository.FilterBranchTip" xml:space="preserve">过滤显示分支</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">本地分支</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">定位HEAD</x:String>
   <x:String x:Key="Text.Repository.NewBranch" xml:space="preserve">新建分支</x:String>
diff --git a/src/ViewModels/BranchTreeNode.cs b/src/ViewModels/BranchTreeNode.cs
@@ -3,7 +3,7 @@
 
 using Avalonia.Collections;
 
-namespace SourceGit.Models
+namespace SourceGit.ViewModels
 {
     public enum BranchTreeNodeType
     {
@@ -23,12 +23,12 @@ public class BranchTreeNode
 
         public bool IsUpstreamTrackStatusVisible
         {
-            get => IsBranch && !string.IsNullOrEmpty((Backend as Branch).UpstreamTrackStatus);
+            get => IsBranch && !string.IsNullOrEmpty((Backend as Models.Branch).UpstreamTrackStatus);
         }
 
         public string UpstreamTrackStatus
         {
-            get => Type == BranchTreeNodeType.Branch ? (Backend as Branch).UpstreamTrackStatus : "";
+            get => Type == BranchTreeNodeType.Branch ? (Backend as Models.Branch).UpstreamTrackStatus : "";
         }
 
         public bool IsRemote
@@ -48,15 +48,15 @@ public bool IsBranch
 
         public bool IsCurrent
         {
-            get => IsBranch && (Backend as Branch).IsCurrent;
+            get => IsBranch && (Backend as Models.Branch).IsCurrent;
         }
 
         public class Builder
         {
             public List<BranchTreeNode> Locals => _locals;
             public List<BranchTreeNode> Remotes => _remotes;
 
-            public void Run(List<Branch> branches, List<Remote> remotes)
+            public void Run(List<Models.Branch> branches, List<Models.Remote> remotes, bool bForceExpanded)
             {
                 foreach (var remote in remotes)
                 {
@@ -66,7 +66,7 @@ public void Run(List<Branch> branches, List<Remote> remotes)
                         Name = remote.Name,
                         Type = BranchTreeNodeType.Remote,
                         Backend = remote,
-                        IsExpanded = _expanded.Contains(path),
+                        IsExpanded = bForceExpanded || _expanded.Contains(path),
                     };
 
                     _maps.Add(path, node);
@@ -78,13 +78,13 @@ public void Run(List<Branch> branches, List<Remote> remotes)
                     var isFiltered = _filters.Contains(branch.FullName);
                     if (branch.IsLocal)
                     {
-                        MakeBranchNode(branch, _locals, "local", isFiltered);
+                        MakeBranchNode(branch, _locals, "local", isFiltered, bForceExpanded);
                     }
                     else
                     {
                         var remote = _remotes.Find(x => x.Name == branch.Remote);
                         if (remote != null)
-                            MakeBranchNode(branch, remote.Children, $"remote/{remote.Name}", isFiltered);
+                            MakeBranchNode(branch, remote.Children, $"remote/{remote.Name}", isFiltered, bForceExpanded);
                     }
                 }
 
@@ -113,7 +113,7 @@ private void CollectExpandedNodes(List<BranchTreeNode> nodes, string prefix)
                 }
             }
 
-            private void MakeBranchNode(Branch branch, List<BranchTreeNode> roots, string prefix, bool isFiltered)
+            private void MakeBranchNode(Models.Branch branch, List<BranchTreeNode> roots, string prefix, bool isFiltered, bool bForceExpanded)
             {
                 var subs = branch.Name.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
 
@@ -132,8 +132,8 @@ private void MakeBranchNode(Branch branch, List<BranchTreeNode> roots, string pr
                 }
 
                 BranchTreeNode lastFolder = null;
-                string path = prefix;
-                for (int i = 0; i < subs.Length - 1; i++)
+                var path = prefix;
+                for (var i = 0; i < subs.Length - 1; i++)
                 {
                     path = string.Concat(path, "/", subs[i]);
                     if (_maps.TryGetValue(path, out var value))
@@ -146,7 +146,7 @@ private void MakeBranchNode(Branch branch, List<BranchTreeNode> roots, string pr
                         {
                             Name = subs[i],
                             Type = BranchTreeNodeType.Folder,
-                            IsExpanded = branch.IsCurrent || _expanded.Contains(path),
+                            IsExpanded = bForceExpanded || branch.IsCurrent || _expanded.Contains(path),
                         };
                         roots.Add(lastFolder);
                         _maps.Add(path, lastFolder);
@@ -157,7 +157,7 @@ private void MakeBranchNode(Branch branch, List<BranchTreeNode> roots, string pr
                         {
                             Name = subs[i],
                             Type = BranchTreeNodeType.Folder,
-                            IsExpanded = branch.IsCurrent || _expanded.Contains(path),
+                            IsExpanded = bForceExpanded || branch.IsCurrent || _expanded.Contains(path),
                         };
                         _maps.Add(path, folder);
                         lastFolder.Children.Add(folder);
@@ -186,7 +186,7 @@ private void SortNodes(List<BranchTreeNode> nodes)
                     }
                     else
                     {
-                        return (int)(l.Type) - (int)(r.Type);
+                        return (int)l.Type - (int)r.Type;
                     }
                 });
 
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
@@ -89,6 +89,21 @@ public object SelectedView
             set => SetProperty(ref _selectedView, value);
         }
 
+        [JsonIgnore]
+        public string SearchBranchFilter
+        {
+            get => _searchBranchFilter;
+            set
+            {
+                if (SetProperty(ref _searchBranchFilter, value))
+                {
+                    var builder = BuildBranchTree(_branches, _remotes);
+                    LocalBranchTrees = builder.Locals;
+                    RemoteBranchTrees = builder.Remotes;
+                }
+            }
+        }
+
         [JsonIgnore]
         public List<Models.Remote> Remotes
         {
@@ -104,14 +119,14 @@ public List<Models.Branch> Branches
         }
 
         [JsonIgnore]
-        public List<Models.BranchTreeNode> LocalBranchTrees
+        public List<BranchTreeNode> LocalBranchTrees
         {
             get => _localBranchTrees;
             private set => SetProperty(ref _localBranchTrees, value);
         }
 
         [JsonIgnore]
-        public List<Models.BranchTreeNode> RemoteBranchTrees
+        public List<BranchTreeNode> RemoteBranchTrees
         {
             get => _remoteBranchTrees;
             private set => SetProperty(ref _remoteBranchTrees, value);
@@ -422,6 +437,11 @@ public void StartSearchCommits()
             SearchedCommits = visible;
         }
 
+        public void ClearSearchBranchFilter()
+        {
+            SearchBranchFilter = string.Empty;
+        }
+
         public void SetWatcherEnabled(bool enabled)
         {
             if (_watcher != null)
@@ -533,12 +553,7 @@ public void RefreshBranches()
         {
             var branches = new Commands.QueryBranches(FullPath).Result();
             var remotes = new Commands.QueryRemotes(FullPath).Result();
-
-            var builder = new Models.BranchTreeNode.Builder();
-            builder.SetFilters(Filters);
-            builder.CollectExpandedNodes(_localBranchTrees, true);
-            builder.CollectExpandedNodes(_remoteBranchTrees, false);
-            builder.Run(branches, remotes);
+            var builder = BuildBranchTree(branches, remotes);
 
             Dispatcher.UIThread.Invoke(() =>
             {
@@ -1354,6 +1369,32 @@ public ContextMenu CreateContextMenuForSubmodule(string submodule)
             return menu;
         }
 
+        private BranchTreeNode.Builder BuildBranchTree(List<Models.Branch> branches, List<Models.Remote> remotes)
+        {
+            var builder = new BranchTreeNode.Builder();
+            builder.SetFilters(Filters);
+
+            if (string.IsNullOrEmpty(_searchBranchFilter))
+            {
+                builder.CollectExpandedNodes(_localBranchTrees, true);
+                builder.CollectExpandedNodes(_remoteBranchTrees, false);
+                builder.Run(branches, remotes, false);
+            }
+            else
+            {
+                var visibles = new List<Models.Branch>();
+                foreach (var b in branches)
+                {
+                    if (b.FullName.Contains(_searchBranchFilter, StringComparison.OrdinalIgnoreCase))
+                        visibles.Add(b);
+                }
+
+                builder.Run(visibles, remotes, true);
+            }
+
+            return builder;
+        }
+
         private string _fullpath = string.Empty;
         private string _gitDir = string.Empty;
         private Models.GitFlow _gitflow = new Models.GitFlow();
@@ -1372,10 +1413,12 @@ public ContextMenu CreateContextMenuForSubmodule(string submodule)
         private bool _isTagGroupExpanded = false;
         private bool _isSubmoduleGroupExpanded = false;
 
+        private string _searchBranchFilter = string.Empty;
+
         private List<Models.Remote> _remotes = new List<Models.Remote>();
         private List<Models.Branch> _branches = new List<Models.Branch>();
-        private List<Models.BranchTreeNode> _localBranchTrees = new List<Models.BranchTreeNode>();
-        private List<Models.BranchTreeNode> _remoteBranchTrees = new List<Models.BranchTreeNode>();
+        private List<BranchTreeNode> _localBranchTrees = new List<BranchTreeNode>();
+        private List<BranchTreeNode> _remoteBranchTrees = new List<BranchTreeNode>();
         private List<Models.Tag> _tags = new List<Models.Tag>();
         private List<string> _submodules = new List<string>();
         private bool _canCommitWithPush = false;
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
@@ -109,7 +109,7 @@
       </Grid.ColumnDefinitions>
 
       <!-- Left Normal Mode -->
-      <Grid Grid.Column="0" RowDefinitions="28,Auto,28,Auto,28,*,28,Auto,28,Auto" Margin="0,0,0,4" IsVisible="{Binding !IsSearching}">
+      <Grid Grid.Column="0" RowDefinitions="28,Auto,5,28,28,Auto,28,*,28,Auto,28,Auto" Margin="0,0,0,4" IsVisible="{Binding !IsSearching}">
         <!-- WorkingCopy -->
         <TextBlock Grid.Row="0" Classes="group_header_label" Text="{DynamicResource Text.Repository.Workspace}"/>
         <ListBox Grid.Row="1" Classes="page_switcher" Background="Transparent" SelectedIndex="{Binding SelectedViewIndex, Mode=TwoWay}">
@@ -159,9 +159,42 @@
           </ListBoxItem>
         </ListBox>
 
+        <!-- Filter Branches -->
+        <Rectangle Grid.Row="2" Height=".65" HorizontalAlignment="Stretch" VerticalAlignment="Center" Fill="{DynamicResource Brush.Border2}"/>
+        <TextBox Grid.Row="3"
+                 Margin="4,2,4,0"
+                 Height="24"
+                 BorderThickness="1"
+                 BorderBrush="{DynamicResource Brush.Border2}"
+                 Background="{DynamicResource Brush.Contents}"
+                 Watermark="{DynamicResource Text.Repository.FilterBranchTip}"
+                 Text="{Binding SearchBranchFilter, Mode=TwoWay}"
+                 VerticalContentAlignment="Center">
+          <TextBox.InnerLeftContent>
+            <Path Width="14" Height="14"
+                  Margin="6,0,0,0"
+                  Fill="{DynamicResource Brush.FG2}"
+                  Data="{StaticResource Icons.Search}"/>
+          </TextBox.InnerLeftContent>
+
+          <TextBox.InnerRightContent>
+            <Button Classes="icon_button"
+                    Width="16"
+                    Margin="0,0,6,0"
+                    Command="{Binding ClearSearchBranchFilter}"
+                    IsVisible="{Binding SearchBranchFilter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                    HorizontalAlignment="Right">
+              <Path Width="14" Height="14"
+                    Margin="0,1,0,0"
+                    Fill="{DynamicResource Brush.FG1}"
+                    Data="{StaticResource Icons.Clear}"/>
+            </Button>
+          </TextBox.InnerRightContent>
+        </TextBox>
+        
         <!-- Local Branches -->
-        <TextBlock Grid.Row="2" Classes="group_header_label" Text="{DynamicResource Text.Repository.LocalBranches}"/>
-        <TreeView Grid.Row="3"
+        <TextBlock Grid.Row="4" Classes="group_header_label" Text="{DynamicResource Text.Repository.LocalBranches}"/>
+        <TreeView Grid.Row="5"
                   x:Name="localBranchTree"
                   MaxHeight="400"
                   ItemsSource="{Binding LocalBranchTrees}"
@@ -170,12 +203,12 @@
                   LostFocus="OnLocalBranchTreeLostFocus"
                   SelectionChanged="OnLocalBranchTreeSelectionChanged">
           <TreeView.Styles>
-            <Style Selector="TreeViewItem" x:DataType="m:BranchTreeNode">
+            <Style Selector="TreeViewItem" x:DataType="vm:BranchTreeNode">
               <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
             </Style>
           </TreeView.Styles>
           <TreeView.ItemTemplate>
-            <TreeDataTemplate ItemsSource="{Binding Children}" x:DataType="{x:Type m:BranchTreeNode}">
+            <TreeDataTemplate ItemsSource="{Binding Children}" x:DataType="{x:Type vm:BranchTreeNode}">
               <Grid Height="24" ColumnDefinitions="20,*,Auto,Auto" Background="Transparent" ContextRequested="OnLocalBranchContextMenuRequested" DoubleTapped="OnDoubleTappedLocalBranchNode">
                 <Path Grid.Column="0" Classes="folder_icon" Width="12" Height="12" HorizontalAlignment="Left" Margin="0,1,0,0" IsVisible="{Binding IsFolder}"/>
                 <Path Grid.Column="0" Width="12" Height="12" HorizontalAlignment="Left" Margin="0,2,0,0" Data="{StaticResource Icons.Check}" IsVisible="{Binding IsCurrent}" VerticalAlignment="Center"/>
@@ -208,27 +241,27 @@
         </TreeView>
 
         <!-- Remotes -->
-        <Grid Grid.Row="4" ColumnDefinitions="*,Auto">
+        <Grid Grid.Row="6" ColumnDefinitions="*,Auto">
           <TextBlock Grid.Column="0" Classes="group_header_label" Text="{DynamicResource Text.Repository.Remotes}"/>
           <Button Grid.Column="1" Classes="icon_button" Width="14" Margin="8,0" Command="{Binding AddRemote}" ToolTip.Tip="{DynamicResource Text.Repository.Remotes.Add}">
             <Path Width="12" Height="12" Data="{StaticResource Icons.Remote.Add}"/>
           </Button>
         </Grid>
-        <TreeView Grid.Row="5"
+        <TreeView Grid.Row="7"
                   x:Name="remoteBranchTree"
                   ItemsSource="{Binding RemoteBranchTrees}"
                   ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                   ScrollViewer.VerticalScrollBarVisibility="Auto"
                   LostFocus="OnRemoteBranchTreeLostFocus"
                   SelectionChanged="OnRemoteBranchTreeSelectionChanged">
           <TreeView.Styles>
-            <Style Selector="TreeViewItem" x:DataType="m:BranchTreeNode">
+            <Style Selector="TreeViewItem" x:DataType="vm:BranchTreeNode">
               <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}"/>
             </Style>
           </TreeView.Styles>
 
           <TreeView.ItemTemplate>
-            <TreeDataTemplate ItemsSource="{Binding Children}" x:DataType="{x:Type m:BranchTreeNode}">
+            <TreeDataTemplate ItemsSource="{Binding Children}" x:DataType="{x:Type vm:BranchTreeNode}">
               <Grid Height="24" ColumnDefinitions="20,*,Auto" Background="Transparent" ContextRequested="OnRemoteBranchContextMenuRequested">
                 <Path Grid.Column="0" Classes="folder_icon" Width="10" Height="10" HorizontalAlignment="Left" Margin="0,2,0,0" IsVisible="{Binding IsFolder}" VerticalAlignment="Center"/>
                 <Path Grid.Column="0" Width="12" Height="12" HorizontalAlignment="Left" Margin="0,2,0,0" Data="{StaticResource Icons.Remote}" IsVisible="{Binding IsRemote}" VerticalAlignment="Center"/>
@@ -250,7 +283,7 @@
         </TreeView>
 
         <!-- Tags -->
-        <ToggleButton Grid.Row="6" Classes="group_expander" IsChecked="{Binding IsTagGroupExpanded, Mode=TwoWay}">
+        <ToggleButton Grid.Row="8" Classes="group_expander" IsChecked="{Binding IsTagGroupExpanded, Mode=TwoWay}">
           <Grid ColumnDefinitions="Auto,*,Auto">
             <TextBlock Grid.Column="0" Classes="group_header_label" Margin="4,0,0,0" Text="{DynamicResource Text.Repository.Tags}"/>
             <TextBlock Grid.Column="1" Text="{Binding Tags, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
@@ -259,7 +292,7 @@
             </Button>
           </Grid>
         </ToggleButton>
-        <DataGrid Grid.Row="7"
+        <DataGrid Grid.Row="9"
                   MaxHeight="200"
                   Background="Transparent"
                   ItemsSource="{Binding Tags}"
@@ -310,7 +343,7 @@
         </DataGrid>
 
         <!-- Submodules -->
-        <ToggleButton Grid.Row="8" Classes="group_expander" IsChecked="{Binding IsSubmoduleGroupExpanded, Mode=TwoWay}">
+        <ToggleButton Grid.Row="10" Classes="group_expander" IsChecked="{Binding IsSubmoduleGroupExpanded, Mode=TwoWay}">
           <Grid ColumnDefinitions="Auto,*,Auto,Auto">
             <TextBlock Grid.Column="0" Classes="group_header_label" Margin="4,0,0,0" Text="{DynamicResource Text.Repository.Submodules}"/>
             <TextBlock Grid.Column="1" Text="{Binding Submodules, Converter={x:Static c:ListConverters.ToCount}}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold"/>
@@ -328,7 +361,7 @@
             </Button>
           </Grid>
         </ToggleButton>
-        <DataGrid Grid.Row="9"
+        <DataGrid Grid.Row="11"
                   MaxHeight="200"
                   Background="Transparent"
                   ItemsSource="{Binding Submodules}"
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`using Avalonia.Collections;`
`5`	`5`
`6`		`-namespace SourceGit.Models`
	`6`	`+namespace SourceGit.ViewModels`
`7`	`7`	`{`
`8`	`8`	`public enum BranchTreeNodeType`
`9`	`9`	`{`
`@@ -23,12 +23,12 @@ public class BranchTreeNode`
`23`	`23`
`24`	`24`	`public bool IsUpstreamTrackStatusVisible`
`25`	`25`	`{`
`26`		`- get => IsBranch && !string.IsNullOrEmpty((Backend as Branch).UpstreamTrackStatus);`
	`26`	`+ get => IsBranch && !string.IsNullOrEmpty((Backend as Models.Branch).UpstreamTrackStatus);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public string UpstreamTrackStatus`
`30`	`30`	`{`
`31`		`- get => Type == BranchTreeNodeType.Branch ? (Backend as Branch).UpstreamTrackStatus : "";`
	`31`	`+ get => Type == BranchTreeNodeType.Branch ? (Backend as Models.Branch).UpstreamTrackStatus : "";`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public bool IsRemote`
`@@ -48,15 +48,15 @@ public bool IsBranch`
`48`	`48`
`49`	`49`	`public bool IsCurrent`
`50`	`50`	`{`
`51`		`- get => IsBranch && (Backend as Branch).IsCurrent;`
	`51`	`+ get => IsBranch && (Backend as Models.Branch).IsCurrent;`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public class Builder`
`55`	`55`	`{`
`56`	`56`	`public List<BranchTreeNode> Locals => _locals;`
`57`	`57`	`public List<BranchTreeNode> Remotes => _remotes;`
`58`	`58`
`59`		`- public void Run(List<Branch> branches, List<Remote> remotes)`
	`59`	`+ public void Run(List<Models.Branch> branches, List<Models.Remote> remotes, bool bForceExpanded)`
`60`	`60`	`{`
`61`	`61`	`foreach (var remote in remotes)`
`62`	`62`	`{`
`@@ -66,7 +66,7 @@ public void Run(List<Branch> branches, List<Remote> remotes)`
`66`	`66`	`Name = remote.Name,`
`67`	`67`	`Type = BranchTreeNodeType.Remote,`
`68`	`68`	`Backend = remote,`
`69`		`- IsExpanded = _expanded.Contains(path),`
	`69`	`+ IsExpanded = bForceExpanded \|\| _expanded.Contains(path),`
`70`	`70`	`};`
`71`	`71`
`72`	`72`	`_maps.Add(path, node);`
`@@ -78,13 +78,13 @@ public void Run(List<Branch> branches, List<Remote> remotes)`
`78`	`78`	`var isFiltered = _filters.Contains(branch.FullName);`
`79`	`79`	`if (branch.IsLocal)`
`80`	`80`	`{`
`81`		`- MakeBranchNode(branch, _locals, "local", isFiltered);`
	`81`	`+ MakeBranchNode(branch, _locals, "local", isFiltered, bForceExpanded);`
`82`	`82`	`}`
`83`	`83`	`else`
`84`	`84`	`{`
`85`	`85`	`var remote = _remotes.Find(x => x.Name == branch.Remote);`
`86`	`86`	`if (remote != null)`
`87`		`- MakeBranchNode(branch, remote.Children, $"remote/{remote.Name}", isFiltered);`
	`87`	`+ MakeBranchNode(branch, remote.Children, $"remote/{remote.Name}", isFiltered, bForceExpanded);`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
`@@ -113,7 +113,7 @@ private void CollectExpandedNodes(List<BranchTreeNode> nodes, string prefix)`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`		`- private void MakeBranchNode(Branch branch, List<BranchTreeNode> roots, string prefix, bool isFiltered)`
	`116`	`+ private void MakeBranchNode(Models.Branch branch, List<BranchTreeNode> roots, string prefix, bool isFiltered, bool bForceExpanded)`
`117`	`117`	`{`
`118`	`118`	`var subs = branch.Name.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries);`
`119`	`119`
`@@ -132,8 +132,8 @@ private void MakeBranchNode(Branch branch, List<BranchTreeNode> roots, string pr`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`BranchTreeNode lastFolder = null;`
`135`		`- string path = prefix;`
`136`		`- for (int i = 0; i < subs.Length - 1; i++)`
	`135`	`+ var path = prefix;`
	`136`	`+ for (var i = 0; i < subs.Length - 1; i++)`
`137`	`137`	`{`
`138`	`138`	`path = string.Concat(path, "/", subs[i]);`
`139`	`139`	`if (_maps.TryGetValue(path, out var value))`
`@@ -146,7 +146,7 @@ private void MakeBranchNode(Branch branch, List<BranchTreeNode> roots, string pr`
`146`	`146`	`{`
`147`	`147`	`Name = subs[i],`
`148`	`148`	`Type = BranchTreeNodeType.Folder,`
`149`		`- IsExpanded = branch.IsCurrent \|\| _expanded.Contains(path),`
	`149`	`+ IsExpanded = bForceExpanded \|\| branch.IsCurrent \|\| _expanded.Contains(path),`
`150`	`150`	`};`
`151`	`151`	`roots.Add(lastFolder);`
`152`	`152`	`_maps.Add(path, lastFolder);`
`@@ -157,7 +157,7 @@ private void MakeBranchNode(Branch branch, List<BranchTreeNode> roots, string pr`
`157`	`157`	`{`
`158`	`158`	`Name = subs[i],`
`159`	`159`	`Type = BranchTreeNodeType.Folder,`
`160`		`- IsExpanded = branch.IsCurrent \|\| _expanded.Contains(path),`
	`160`	`+ IsExpanded = bForceExpanded \|\| branch.IsCurrent \|\| _expanded.Contains(path),`
`161`	`161`	`};`
`162`	`162`	`_maps.Add(path, folder);`
`163`	`163`	`lastFolder.Children.Add(folder);`
`@@ -186,7 +186,7 @@ private void SortNodes(List<BranchTreeNode> nodes)`
`186`	`186`	`}`
`187`	`187`	`else`
`188`	`188`	`{`
`189`		`- return (int)(l.Type) - (int)(r.Type);`
	`189`	`+ return (int)l.Type - (int)r.Type;`
`190`	`190`	`}`
`191`	`191`	`});`
`192`	`192`