Merge pull request #541 from github-for-unity/fixes/nested-meta-file

Nesting meta files in changes view

Author: StanleyGoldman

src/GitHub.Api/UI/TreeBase.cs

@@ -17,7 +17,9 @@ public interface ITreeNode
         string Path { get; set; }
         string Label { get; set; }
         int Level { get; set; }
+        bool IsContainer { get; set; }
         bool IsFolder { get; set; }
+        bool IsFolderOrContainer { get; }
         bool IsCollapsed { get; set; }
         bool IsHidden { get; set; }
         bool IsActive { get; set; }
@@ -52,29 +54,45 @@ public void Load(IEnumerable<TData> treeDatas)
             var isCheckable = IsCheckable;
 
             var isSelected = IsSelectable && selectedNodePath != null && Title == selectedNodePath;
-            AddNode(Title, Title, -1 + displayRootLevel, true, false, false, false, isSelected, false, null);
+            AddNode(Title, Title, -1 + displayRootLevel, true, false, false, false, isSelected, false, null, false);
 
             var hideChildren = false;
             var hideChildrenBelowLevel = 0;
 
             var folders = new HashSet<string>();
 
+            TNode lastAddedNode = null;
             foreach (var treeData in treeDatas)
             {
                 var parts = treeData.Path.Split(new[] { pathSeparator }, StringSplitOptions.None);
-                for (var i = 0; i < parts.Length; i++)
+                for (var level = 0; level < parts.Length; level++)
                 {
-                    var label = parts[i];
-                    var level = i + 1;
-                    var nodePath = String.Join(pathSeparator, parts, 0, level);
-                    var isFolder = i < parts.Length - 1;
+                    var label = parts[level];
+                    var nodePath = String.Join(pathSeparator, parts, 0, level + 1);
+                    var isFolder = level < parts.Length - 1;
+                    var parentIsPromoted = false;
+
+                    if (lastAddedNode != null)
+                    {
+                        if (!lastAddedNode.IsFolder)
+                        {
+                            if (PromoteNode(lastAddedNode, label))
+                            {
+                                Logger.Trace("Promoting Node Label:{0}", lastAddedNode.Label);
+
+                                parentIsPromoted = true;
+                                lastAddedNode.IsContainer = true;
+                            }
+                        }
+                    }
+
                     var alreadyExists = folders.Contains(nodePath);
                     if (!alreadyExists)
                     {
                         var nodeIsHidden = false;
                         if (hideChildren)
                         {
-                            if (level <= hideChildrenBelowLevel)
+                            if (level + 1 <= hideChildrenBelowLevel)
                             {
                                 hideChildren = false;
                             }
@@ -100,7 +118,7 @@ public void Load(IEnumerable<TData> treeDatas)
                                 if (!hideChildren)
                                 {
                                     hideChildren = true;
-                                    hideChildrenBelowLevel = level;
+                                    hideChildrenBelowLevel = level + 1;
                                 }
                             }
                         }
@@ -112,8 +130,9 @@ public void Load(IEnumerable<TData> treeDatas)
                         }
 
                         isSelected = selectedNodePath != null && nodePath == selectedNodePath;
-                        AddNode(nodePath, label, i + displayRootLevel, isFolder, isActive, nodeIsHidden,
-                            nodeIsCollapsed, isSelected, isChecked, treeNodeTreeData);
+
+                        lastAddedNode = AddNode(nodePath, label, level + displayRootLevel + (parentIsPromoted ? 1 : 0), isFolder, isActive, nodeIsHidden,
+                            nodeIsCollapsed, isSelected, isChecked, treeNodeTreeData, false);
                     }
                 }
             }
@@ -124,7 +143,7 @@ public void Load(IEnumerable<TData> treeDatas)
                 for (var index = nodes.Count - 1; index >= 0; index--)
                 {
                     var node = nodes[index];
-                    if (node.Level >= 0 && node.IsFolder)
+                    if (node.Level >= 0 && node.IsFolderOrContainer)
                     {
                         bool? anyChecked = null;
                         bool? allChecked = null;
@@ -150,6 +169,27 @@ public void Load(IEnumerable<TData> treeDatas)
             }
         }
 
+        protected bool PromoteNode(TNode previouslyAddedNode, string nextLabel)
+        {
+            if (!PromoteMetaFiles)
+            {
+                return false;
+            }
+
+            if (previouslyAddedNode == null)
+            {
+                return false;
+            }
+
+            if (!nextLabel.EndsWith(".meta"))
+            {
+                return false;
+            }
+
+            var substring = nextLabel.Substring(0, nextLabel.Length - 5);
+            return previouslyAddedNode.Label == substring;
+        }
+
         public void SetCheckStateOnAll(bool isChecked)
         {
             var nodeCheckState = isChecked ? CheckState.Checked : CheckState.Empty;
@@ -174,9 +214,9 @@ public void SetCheckStateOnAll(bool isChecked)
 
         protected abstract IEnumerable<string> GetCollapsedFolders();
 
-        protected void AddNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isSelected, bool isChecked, TData? treeData)
+        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)
         {
-            var node = CreateTreeNode(path, label, level, isFolder, isActive, isHidden, isCollapsed, isChecked, treeData);
+            var node = CreateTreeNode(path, label, level, isFolder, isActive, isHidden, isCollapsed, isChecked, treeData, isContainer);
 
             SetNodeIcon(node);
             Nodes.Add(node);
@@ -185,6 +225,8 @@ protected void AddNode(string path, string label, int level, bool isFolder, bool
             {
                 SelectedNode = node;
             }
+
+            return node;
         }
 
         protected void Clear()
@@ -198,7 +240,7 @@ protected void Clear()
 
         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);
+        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 void OnClear();
 
@@ -212,7 +254,7 @@ protected void ToggleNodeVisibility(int idx, TNode node)
             for (; idx < Nodes.Count && Nodes[idx].Level > nodeLevel; idx++)
             {
                 Nodes[idx].IsHidden = node.IsCollapsed;
-                if (Nodes[idx].IsFolder && !node.IsCollapsed && Nodes[idx].IsCollapsed)
+                if (Nodes[idx].IsFolderOrContainer && !node.IsCollapsed && Nodes[idx].IsCollapsed)
                 {
                     var level = Nodes[idx].Level;
                     for (idx++; idx < Nodes.Count && Nodes[idx].Level > level; idx++)
@@ -245,11 +287,7 @@ protected void ToggleNodeChecked(int idx, TNode node)
                     break;
             }
 
-            if (node.IsFolder)
-            {
-                ToggleChildrenChecked(idx, node, isChecked);
-            }
-            else
+            if (!node.IsFolder)
             {
                 if (isChecked)
                 {
@@ -261,6 +299,11 @@ protected void ToggleNodeChecked(int idx, TNode node)
                 }
             }
 
+            if (node.IsFolderOrContainer)
+            {
+                ToggleChildrenChecked(idx, node, isChecked);
+            }
+
             ToggleParentFoldersChecked(idx, node, isChecked);
         }
 
@@ -272,11 +315,7 @@ private void ToggleChildrenChecked(int idx, TNode node, bool isChecked)
                 var wasChecked = childNode.CheckState == CheckState.Checked;
                 childNode.CheckState = isChecked ? CheckState.Checked : CheckState.Empty;
 
-                if (childNode.IsFolder)
-                {
-                    ToggleChildrenChecked(i, childNode, isChecked);
-                }
-                else
+                if (!childNode.IsFolder)
                 {
                     if (isChecked && !wasChecked)
                     {
@@ -287,6 +326,11 @@ private void ToggleChildrenChecked(int idx, TNode node, bool isChecked)
                         RemoveCheckedNode(childNode);
                     }
                 }
+
+                if (childNode.IsFolderOrContainer)
+                {
+                    ToggleChildrenChecked(i, childNode, isChecked);
+                }
             }
         }
 
@@ -367,5 +411,6 @@ private void ToggleParentFoldersChecked(int idx, TNode node, bool isChecked)
         public abstract bool IsSelectable { get; set; }
         public abstract bool IsCheckable { get; set; }
         public abstract string PathSeparator { get; set; }
+        protected abstract bool PromoteMetaFiles { get; }
     }
 }

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

@@ -85,6 +85,11 @@ public override string PathSeparator
             set { pathSeparator = value; }
         }
 
+        protected override bool PromoteMetaFiles
+        {
+            get { return true; }
+        }
+
         public override ChangesTreeNode SelectedNode
         {
             get
@@ -189,7 +194,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)
+        protected override ChangesTreeNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isChecked, GitStatusEntryTreeData? treeData, bool isContainer)
         {
             var gitFileStatus = GitFileStatus.None;
             var projectPath = (string) null;

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

@@ -240,7 +240,7 @@ private bool HandleInput(Rect rect, TNode currentNode, int index, Action<TNode>
                     }
                     else if (directionX > 0)
                     {
-                        if (currentNode.IsFolder && currentNode.IsCollapsed)
+                        if (currentNode.IsFolderOrContainer && currentNode.IsCollapsed)
                         {
                             ToggleNodeVisibility(index, currentNode);
                         }
@@ -251,7 +251,7 @@ private bool HandleInput(Rect rect, TNode currentNode, int index, Action<TNode>
                     }
                     else if (directionX < 0)
                     {
-                        if (currentNode.IsFolder && !currentNode.IsCollapsed)
+                        if (currentNode.IsFolderOrContainer && !currentNode.IsCollapsed)
                         {
                             ToggleNodeVisibility(index, currentNode);
                         }
@@ -274,13 +274,13 @@ private bool HandleInput(Rect rect, TNode currentNode, int index, Action<TNode>
             return requiresRepaint;
         }
 
-        private int SelectNext(int index, bool foldersOnly)
+        private int SelectNext(int index, bool foldersOrContainersOnly)
         {
             for (index++; index < Nodes.Count; index++)
             {
                 if (Nodes[index].IsHidden)
                     continue;
-                if (!Nodes[index].IsFolder && foldersOnly)
+                if (!Nodes[index].IsFolderOrContainer && foldersOrContainersOnly)
                     continue;
                 break;
             }
@@ -296,13 +296,13 @@ private int SelectNext(int index, bool foldersOnly)
             return index;
         }
 
-        private int SelectPrevious(int index, bool foldersOnly)
+        private int SelectPrevious(int index, bool foldersOrContainersOnly)
         {
             for (index--; index >= 0; index--)
             {
                 if (Nodes[index].IsHidden)
                     continue;
-                if (!Nodes[index].IsFolder && foldersOnly)
+                if (!Nodes[index].IsFolderOrContainer && foldersOrContainersOnly)
                     continue;
                 break;
             }
@@ -344,6 +344,7 @@ public class TreeNode : ITreeNode
         public string label;
         public int level;
         public bool isFolder;
+        public bool isContainer;
         public bool isCollapsed;
         public bool isHidden;
         public bool isActive;
@@ -372,12 +373,23 @@ public int Level
             set { level = value; }
         }
 
+        public bool IsContainer
+        {
+            get { return isContainer; }
+            set { isContainer = value; }
+        }
+
         public bool IsFolder
         {
             get { return isFolder; }
             set { isFolder = value; }
         }
 
+        public bool IsFolderOrContainer
+        {
+            get { return IsFolder || IsContainer; }
+        }
+
         public bool IsCollapsed
         {
             get { return isCollapsed; }
@@ -459,7 +471,7 @@ public TreeNodeRenderResult Render(Rect rect, float indentation, bool isSelected
             }
 
             var styleOn = false;
-            if (IsFolder)
+            if (IsFolderOrContainer)
             {
                 styleOn = !IsCollapsed;
 
@@ -577,6 +589,11 @@ public override string PathSeparator
             set { pathSeparator = value; }
         }
 
+        protected override bool PromoteMetaFiles
+        {
+            get { return false; }
+        }
+
         public override TreeNode SelectedNode
         {
             get
@@ -643,13 +660,14 @@ 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)
+        protected override TreeNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isChecked, GitBranchTreeData? treeData, bool isContainer)
         {
             var node = new TreeNode {
                 Path = path,
                 Label = label,
                 Level = level,
                 IsFolder = isFolder,
+                IsContainer = isContainer,
                 IsActive = isActive,
                 IsHidden = isHidden,
                 IsCollapsed = isCollapsed,

src/tests/UnitTests/SetUpFixture.cs

@@ -14,8 +14,8 @@ public void SetUp()
             LogHelper.TracingEnabled = true;
 
             LogHelper.LogAdapter = new MultipleLogAdapter(
-                new FileLogAdapter($"..\\{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}-unit-tests.log")
-                //, new ConsoleLogAdapter()
+                new FileLogAdapter($"..\\{DateTime.UtcNow:yyyyMMddHHmmss}-unit-tests.log")
+                , new ConsoleLogAdapter()
             );
         }
     }