TreeBase does not have the functionality to evaluate containers

Author: StanleyGoldman

src/GitHub.Api/UI/TreeBase.cs

@@ -54,7 +54,7 @@ public void Load(IEnumerable<TData> treeDatas)
             TNode lastAddedNode = null;
 
             Clear();
-            AddNode(Title, Title, -1 + displayRootLevel, true, false, false, false, isSelected, false, null, false);
+            AddNode(Title, Title, -1 + displayRootLevel, true, false, false, false, isSelected, false, null);
 
             foreach (var treeData in treeDatas)
             {
@@ -123,8 +123,7 @@ public void Load(IEnumerable<TData> treeDatas)
 
                         isSelected = selectedNodePath != null && nodePath == selectedNodePath;
 
-                        lastAddedNode = AddNode(nodePath, label, level + displayRootLevel + (parentIsPromoted ? 1 : 0), isFolder, isActive, nodeIsHidden,
-                            nodeIsCollapsed, isSelected, isChecked, treeNodeTreeData, false);
+                        lastAddedNode = AddNode(nodePath, label, level + displayRootLevel + (parentIsPromoted ? 1 : 0), isFolder, isActive, nodeIsHidden, nodeIsCollapsed, isSelected, isChecked, treeNodeTreeData);
                     }
                 }
             }
@@ -204,9 +203,9 @@ public void SetCheckStateOnAll(bool isChecked)
             }
         }
 
-        protected TNode AddNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isSelected, bool isChecked, TData? treeData, bool isContainer)
+        protected TNode AddNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isSelected, bool isChecked, TData? treeData)
         {
-            var node = CreateTreeNode(path, label, level, isFolder, isActive, isHidden, isCollapsed, isChecked, treeData, isContainer);
+            var node = CreateTreeNode(path, label, level, isFolder, isActive, isHidden, isCollapsed, isChecked, treeData);
 
             SetNodeIcon(node);
             Nodes.Add(node);
@@ -407,7 +406,8 @@ private void ToggleParentFoldersChecked(int idx, TNode node, bool isChecked)
         protected abstract IEnumerable<string> GetCollapsedFolders();
         protected abstract void RemoveCheckedNode(TNode node);
         protected abstract void AddCheckedNode(TNode node);
-        protected abstract TNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isChecked, TData? treeData, bool isContainer);
+        protected abstract TNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isChecked, TData? treeData);
+
         protected abstract void SetNodeIcon(TNode node);
 
         public string SelectedNodePath => SelectedNode?.Path;

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesTreeControl.cs

@@ -186,7 +186,7 @@ protected Texture GetNodeIconBadge(ChangesTreeNode node)
             return Styles.GetFileStatusIcon(gitFileStatus, node.IsLocked);
         }
 
-        protected override ChangesTreeNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isChecked, GitStatusEntryTreeData? treeData, bool isContainer)
+        protected override ChangesTreeNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isChecked, GitStatusEntryTreeData? treeData)
         {
             var gitStatusEntry = GitStatusEntry.Default;
             var isLocked = false;

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs

@@ -660,14 +660,13 @@ protected Texture GetNodeIcon(TreeNode node)
             return nodeIcon;
         }
 
-        protected override TreeNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isChecked, GitBranchTreeData? treeData, bool isContainer)
+        protected override TreeNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isChecked, GitBranchTreeData? treeData)
         {
             var node = new TreeNode {
                 Path = path,
                 Label = label,
                 Level = level,
                 IsFolder = isFolder,
-                IsContainer = isContainer,
                 IsActive = isActive,
                 IsHidden = isHidden,
                 IsCollapsed = isCollapsed,

src/tests/UnitTests/UI/TreeBaseTests.cs

@@ -113,14 +113,13 @@ protected override void AddCheckedNode(TestTreeNode node)
             TestTreeListener.AddCheckedNode(node);
         }
 
-        protected override TestTreeNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isChecked, TestTreeData? treeData, bool isContainer)
+        protected override TestTreeNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isChecked, TestTreeData? treeData)
         {
             if (traceLogging)
             {
                 Logger.Trace(
-                    "CreateTreeNode(path: {0}, label: {1}, level: {2}, isFolder: {3}, " +
-                    "isActive: {4}, isHidden: {5}, isCollapsed: {6}, isChecked: {7}, treeData: {8})", path, label,
-                    level, isFolder, isActive, isHidden, isCollapsed, isChecked, treeData?.ToString() ?? "[NULL]");
+                    "CreateTreeNode(path: {0}, label: {1}, level: {2}, isFolder: {3}, isActive: {4}, isHidden: {5}, isCollapsed: {6}, isChecked: {7}, treeData: {8})",
+                    path, label, level, isFolder, isActive, isHidden, isCollapsed, isChecked, treeData?.ToString() ?? "[NULL]");
             }
 
             TestTreeListener.CreateTreeNode(path, label, level, isFolder, isActive, isHidden, isCollapsed, isChecked,