Fix file not being created if FS event occured

Author: FastestMolasses

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

@@ -152,6 +152,12 @@ extension CEWorkspaceFileManager {
         let directoryContentsUrlsRelativePaths = directoryContentsUrls.map({ $0.relativePath })
         for (idx, oldURL) in (childrenMap[fileItem.id] ?? []).map({ URL(filePath: $0) }).enumerated().reversed()
         where !directoryContentsUrlsRelativePaths.contains(oldURL.relativePath) {
+            // Don't remove phantom files, they don't exist on disk yet
+            // They will be cleaned up when the user finishes editing
+            if let existingFile = flattenedFileItems[oldURL.relativePath],
+               existingFile.phantomFile != nil {
+                continue
+            }
             flattenedFileItems.removeValue(forKey: oldURL.relativePath)
             childrenMap[fileItem.id]?.remove(at: idx)
         }

CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorOutlineView.swift

@@ -85,15 +85,49 @@ struct ProjectNavigatorOutlineView: NSViewControllerRepresentable {
             guard let outlineView = controller?.outlineView else { return }
             let selectedRows = outlineView.selectedRowIndexes.compactMap({ outlineView.item(atRow: $0) })
 
-            // If some text view inside the outline view is first responder right now, push the update off
-            // until editing is finished using the `shouldReloadAfterDoneEditing` flag.
+            // Check if we're currently editing a phantom file and capture its text
+            var editingPhantomFile: CEWorkspaceFile?
+            var capturedText: String?
+            var capturedSelectionRange: NSRange?
+
             if outlineView.window?.firstResponder !== outlineView
                 && outlineView.window?.firstResponder is NSTextView
                 && (outlineView.window?.firstResponder as? NSView)?.isDescendant(of: outlineView) == true {
-                controller?.shouldReloadAfterDoneEditing = true
-            } else {
-                for item in updatedItems {
-                    outlineView.reloadItem(item, reloadChildren: true)
+                // Find the cell being edited by traversing up from the text view
+                var currentView = outlineView.window?.firstResponder as? NSView
+                capturedSelectionRange = (outlineView.window?.firstResponder as? NSTextView)?.selectedRange
+
+                while let view = currentView {
+                    if let cell = view as? ProjectNavigatorTableViewCell,
+                       let fileItem = cell.fileItem,
+                       fileItem.phantomFile != nil {
+                        editingPhantomFile = fileItem
+                        capturedText = cell.textField?.stringValue
+                        break
+                    }
+                    currentView = view.superview
+                }
+            }
+
+            // Reload all items with children
+            for item in updatedItems {
+                outlineView.reloadItem(item, reloadChildren: true)
+            }
+
+            // If we were editing a phantom file, restore the text field and focus
+            if let phantomFile = editingPhantomFile, let text = capturedText {
+                let row = outlineView.row(forItem: phantomFile)
+                if row >= 0,
+                   let cell = outlineView.view(
+                    atColumn: 0,
+                    row: row,
+                    makeIfNecessary: false
+                   ) as? ProjectNavigatorTableViewCell {
+                    cell.textField?.stringValue = text
+                    outlineView.window?.makeFirstResponder(cell.textField)
+                    if let selectionRange = capturedSelectionRange {
+                        cell.textField?.currentEditor()?.selectedRange = selectionRange
+                    }
                 }
             }
 
@@ -102,6 +136,12 @@ struct ProjectNavigatorOutlineView: NSViewControllerRepresentable {
             controller?.shouldSendSelectionUpdate = false
             outlineView.selectRowIndexes(IndexSet(selectedIndexes), byExtendingSelection: false)
             controller?.shouldSendSelectionUpdate = true
+
+            // Reselect the file that is currently active in the editor so it still appears highlighted
+            if outlineView.selectedRowIndexes.isEmpty,
+               let activeFileID = workspace?.editorManager?.activeEditor.selectedTab?.file.id {
+                controller?.updateSelection(itemID: activeFileID)
+            }
         }
 
         deinit {

CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorTableViewCell.swift

@@ -58,9 +58,11 @@ final class ProjectNavigatorTableViewCell: FileSystemTableViewCell {
         guard let fileItem else { return }
 
         if fileItem.phantomFile != nil {
+            // Capture the text field value before any async work
+            let enteredName = textField?.stringValue ?? ""
             DispatchQueue.main.async { [weak fileItem, weak self] in
                 guard let fileItem, let self = self else { return }
-                self.handlePhantomFileCompletion(fileItem: fileItem, wasCancelled: false)
+                self.handlePhantomFileCompletion(fileItem: fileItem, wasCancelled: false, enteredName: enteredName)
             }
         } else {
             textField?.backgroundColor = fileItem.validateFileName(for: textField?.stringValue ?? "") ? .none : errorRed
@@ -76,7 +78,7 @@ final class ProjectNavigatorTableViewCell: FileSystemTableViewCell {
         delegate?.cellDidFinishEditing()
     }
 
-    private func handlePhantomFileCompletion(fileItem: CEWorkspaceFile, wasCancelled: Bool) {
+    private func handlePhantomFileCompletion(fileItem: CEWorkspaceFile, wasCancelled: Bool, enteredName: String = "") {
         if wasCancelled {
             if let workspace = delegate as? ProjectNavigatorViewController,
                let workspaceFileManager = workspace.workspace?.workspaceFileManager {
@@ -85,7 +87,7 @@ final class ProjectNavigatorTableViewCell: FileSystemTableViewCell {
             return
         }
 
-        let newName = textField?.stringValue ?? ""
+        let newName = enteredName.isEmpty ? (textField?.stringValue ?? "") : enteredName
         if !newName.isEmpty && newName.isValidFilename {
             if let workspace = delegate as? ProjectNavigatorViewController,
                let workspaceFileManager = workspace.workspace?.workspaceFileManager,

CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorViewController+OutlineTableViewCellDelegate.swift

@@ -41,7 +41,6 @@ extension ProjectNavigatorViewController: OutlineTableViewCellDelegate {
     }
 
     func cellDidFinishEditing() {
-        guard shouldReloadAfterDoneEditing else { return }
         outlineView.reloadData()
     }
 }

CodeEdit/Features/NavigatorArea/ProjectNavigator/OutlineView/ProjectNavigatorViewController.swift

@@ -64,8 +64,6 @@ final class ProjectNavigatorViewController: NSViewController {
     /// to open the file a second time.
     var shouldSendSelectionUpdate: Bool = true
 
-    var shouldReloadAfterDoneEditing: Bool = false
-
     var filterIsEmpty: Bool {
         workspace?.navigatorFilter.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true
     }