Merge pull request #202 from github-for-unity/fixes/deleted-files-and-folders

Fix to correct icon of deleted files

Author: shana

src/GitHub.Api/UI/TreeBuilder.cs

@@ -119,7 +119,6 @@ internal static FileTreeNode BuildTreeRoot(IList<GitStatusEntry> newEntries, Lis
                 }
             }
 
-            // TODO: Filter .meta files - consider adding them as children of the asset or folder they're supporting
             // TODO: In stead of completely rebuilding the tree structure, figure out a way to migrate open/closed states from the old tree to the new
             // Build tree structure
 

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

@@ -118,6 +118,12 @@ private void TreeNode(FileTreeNode node)
             var target = node.Target;
             var isFolder = node.Children.Any();
 
+            var isFolderForMeta = false;
+            if (node.Children.Count() == 1)
+            {
+                isFolderForMeta = node.Children.First().Label.Substring(node.Label.Length).Equals(".meta");
+            }
+
             GUILayout.BeginHorizontal();
             {
                 if (!Readonly)
@@ -186,7 +192,19 @@ private void TreeNode(FileTreeNode node)
 
                     if (Event.current.type == EventType.Repaint)
                     {
-                        var icon = (Texture) node.Icon ?? (isFolder ? Styles.FolderIcon : Styles.DefaultAssetIcon);
+                        var icon = (Texture) node.Icon;
+                        if (icon == null)
+                        {
+                            if (isFolderForMeta || !isFolder)
+                            {
+                                icon = Styles.DefaultAssetIcon;
+                            }
+                            else
+                            {
+                                icon = Styles.FolderIcon;
+                            }
+                        }
+
                         if (icon != null)
                         {
                             GUI.DrawTexture(iconRect,