Ensure when we add a folder we use a trailing slash

Author: Paul van Brenk

Common/Product/SharedProject/CommonUtils.cs

@@ -550,7 +550,8 @@ public static string EnsureEndSeparator(string path)
         {
             if (string.IsNullOrEmpty(path))
             {
-                return string.Empty;
+                Debug.Fail("what??");
+                return path;
             }
             else if (!HasEndSeparator(path))
             {

Nodejs/Product/Nodejs/SharedProject/CommonProjectNode.DiskMerger.cs

@@ -59,7 +59,7 @@ public async Task<bool> ContinueMergeAsync(bool hierarchyCreated)
             private async Task<bool> ContinueMergeAsyncWorker((string Name, HierarchyNode Parent) dir, bool hierarchyCreated)
             {
                 var wasExpanded = hierarchyCreated ? dir.Parent.GetIsExpanded() : false;
-                var missingChildren = new HashSet<HierarchyNode>(dir.Parent.AllChildren);
+                var missingOnDisk = new HashSet<HierarchyNode>(dir.Parent.AllChildren);
 
                 var thread = this.project.Site.GetUIThread();
 
@@ -92,15 +92,9 @@ private async Task<bool> ContinueMergeAsyncWorker((string Name, HierarchyNode Pa
                             this.project.CreateSymLinkWatcher(curDir);
                         }
 
-                        var existing = this.project.FindNodeByFullPath(curDir);
-                        if (existing == null)
-                        {
-                            existing = this.project.AddAllFilesFolder(dir.Parent, curDir + Path.DirectorySeparatorChar, hierarchyCreated);
-                        }
-                        else
-                        {
-                            missingChildren.Remove(existing);
-                        }
+                        var existing = this.project.AddAllFilesFolder(dir.Parent, curDir, hierarchyCreated);
+                        missingOnDisk.Remove(existing);
+
                         this.remainingDirs.Push((curDir, existing));
                     }
                 }
@@ -136,7 +130,7 @@ private async Task<bool> ContinueMergeAsyncWorker((string Name, HierarchyNode Pa
                         }
                         else
                         {
-                            missingChildren.Remove(existing);
+                            missingOnDisk.Remove(existing);
                         }
                     }
 
@@ -156,7 +150,7 @@ private async Task<bool> ContinueMergeAsyncWorker((string Name, HierarchyNode Pa
                 }
 
                 // remove the excluded children which are no longer there
-                this.RemoveMissingChildren(missingChildren);
+                this.RemoveMissingChildren(missingOnDisk);
 
                 if (hierarchyCreated)
                 {

Nodejs/Product/Nodejs/SharedProject/CommonProjectNode.FileSystemChange.cs

@@ -184,7 +184,7 @@ private async Task ChildCreatedAsync(HierarchyNode child)
                         this.project.CreateSymLinkWatcher(this.path);
                     }
 
-                    var folderNode = this.project.AddAllFilesFolder(parent, this.path + Path.DirectorySeparatorChar);
+                    var folderNode = this.project.AddAllFilesFolder(parent, this.path);
                     var folderNodeWasExpanded = folderNode.GetIsExpanded();
 
                     // then add the folder nodes

Nodejs/Product/Nodejs/SharedProject/CommonProjectNode.cs

@@ -693,10 +693,12 @@ private HierarchyNode AddAllFilesFile(HierarchyNode curParent, string file)
         /// </summary>
         private HierarchyNode AddAllFilesFolder(HierarchyNode curParent, string curDir, bool hierarchyCreated = true)
         {
-            var folderNode = FindNodeByFullPath(curDir);
+            var safePath = CommonUtils.EnsureEndSeparator(curDir);
+
+            var folderNode = FindNodeByFullPath(safePath);
             if (folderNode == null)
             {
-                folderNode = CreateFolderNode(new AllFilesProjectElement(curDir, "Folder", this));
+                folderNode = CreateFolderNode(new AllFilesProjectElement(safePath, "Folder", this));
                 AddAllFilesNode(curParent, folderNode);
 
                 if (hierarchyCreated)