Catch Odd Case in getFile

Author: thecoolwinter

CodeEdit/Features/CEWorkspace/Models/CEWorkspaceFileManager+FileManagement.swift

@@ -101,8 +101,8 @@ extension CEWorkspaceFileManager {
                 throw CocoaError.error(.fileWriteUnknown, url: fileUrl)
             }
 
-            try rebuildFiles(fromItem: file)
-            notifyObservers(updatedItems: [file])
+            try rebuildFiles(fromItem: file.isFolder ? file : file.parent ?? file)
+            notifyObservers(updatedItems: [file.isFolder ? file : file.parent ?? file])
 
             // Create if not found here because this should be indexed if we're creating it.
             // It's not often a user makes a file and then doesn't use it.
@@ -286,6 +286,12 @@ extension CEWorkspaceFileManager {
                 notifyObservers(updatedItems: [parent])
             }
 
+            // If we have the new parent file, let's rebuild that directory too
+            if let newFileParent = getFile(newLocation.deletingLastPathComponent().path) {
+                try rebuildFiles(fromItem: newFileParent)
+                notifyObservers(updatedItems: [newFileParent])
+            }
+
             return getFile(newLocation.absoluteURL.path)
         } catch {
             logger.error("Failed to move file: \(error, privacy: .auto)")

CodeEdit/Features/CEWorkspace/Models/CEWorkspaceFileManager.swift

@@ -120,7 +120,16 @@ final class CEWorkspaceFileManager {
                 }
             }
 
-            return flattenedFileItems[url.relativePath]
+            if let file = flattenedFileItems[url.relativePath] {
+                return file
+            } else if let parent = getFile(currentURL.deletingLastPathComponent().path) {
+                // This catches the case where each parent dir has been loaded, their children cached, and this is a new
+                // file, so we still need to create it and add it to the cache.
+                let newFileItem = createChild(url, forParent: parent)
+                flattenedFileItems[newFileItem.id] = newFileItem
+                childrenMap[parent.id]?.append(newFileItem.id)
+                return newFileItem
+            }
         }
 
         return nil