Added phantom files and file renaming focus

Author: FastestMolasses

CodeEdit/Features/CEWorkspace/Models/CEWorkspaceFile.swift

@@ -164,6 +164,9 @@ final class CEWorkspaceFile: Codable, Comparable, Hashable, Identifiable, Editor
         FileIcon.iconColor(fileType: type)
     }
 
+    /// Indicates whether the file is phantom (not yet created on disk)
+    var isPhantom: Bool = false
+
     init(
         id: String,
         url: URL,

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

@@ -81,20 +81,35 @@ extension ProjectNavigatorMenu {
         try? process.run()
     }
 
-    // TODO: allow custom file names
     /// Action that creates a new untitled file
     @objc
     func newFile() {
         guard let item else { return }
-        do {
-            if let newFile = try workspace?.workspaceFileManager?.addFile(fileName: "untitled", toFile: item) {
-                workspace?.listenerModel.highlightedFileItem = newFile
-                workspace?.editorManager?.openTab(item: newFile)
+        let phantomFile = CEWorkspaceFile(
+            id: UUID().uuidString,
+            url: item.url.appendingPathComponent("Untitled"),
+            changeType: nil,
+            staged: false
+        )
+        phantomFile.isPhantom = true
+        phantomFile.parent = item
+
+        // Add phantom file to parent's children temporarily for display
+        if let workspace = workspace,
+           let fileManager = workspace.workspaceFileManager {
+            _ = fileManager.childrenOfFile(item)
+            fileManager.flattenedFileItems[phantomFile.id] = phantomFile
+            if fileManager.childrenMap[item.id] == nil {
+                fileManager.childrenMap[item.id] = []
             }
-        } catch {
-            let alert = NSAlert(error: error)
-            alert.addButton(withTitle: "Dismiss")
-            alert.runModal()
+            fileManager.childrenMap[item.id]?.append(phantomFile.id)
+        }
+
+        workspace?.listenerModel.highlightedFileItem = phantomFile
+        sender.outlineView.reloadData()
+
+        DispatchQueue.main.async {
+            self.renameFile()
         }
     }
 
@@ -103,11 +118,11 @@ extension ProjectNavigatorMenu {
     func renameFile() {
         guard let newFile = workspace?.listenerModel.highlightedFileItem else { return }
         let row = sender.outlineView.row(forItem: newFile)
-        guard row > 0,
+        guard row >= 0,
               let cell = sender.outlineView.view(
                 atColumn: 0,
                 row: row,
-                makeIfNecessary: false
+                makeIfNecessary: true
               ) as? ProjectNavigatorTableViewCell else {
             return
         }

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

@@ -56,15 +56,72 @@ final class ProjectNavigatorTableViewCell: FileSystemTableViewCell {
 
     override func controlTextDidEndEditing(_ obj: Notification) {
         guard let fileItem else { return }
-        textField?.backgroundColor = fileItem.validateFileName(for: textField?.stringValue ?? "") ? .none : errorRed
-        if fileItem.validateFileName(for: textField?.stringValue ?? "") {
-            let destinationURL = fileItem.url
-                .deletingLastPathComponent()
-                .appending(path: textField?.stringValue ?? "")
-            delegate?.moveFile(file: fileItem, to: destinationURL)
+
+        if fileItem.isPhantom {
+            handlePhantomFileCompletion(fileItem: fileItem, wasCancelled: false)
         } else {
-            textField?.stringValue = fileItem.labelFileName()
+            textField?.backgroundColor = fileItem.validateFileName(for: textField?.stringValue ?? "") ? .none : errorRed
+            if fileItem.validateFileName(for: textField?.stringValue ?? "") {
+                let destinationURL = fileItem.url
+                    .deletingLastPathComponent()
+                    .appending(path: textField?.stringValue ?? "")
+                delegate?.moveFile(file: fileItem, to: destinationURL)
+            } else {
+                textField?.stringValue = fileItem.labelFileName()
+            }
         }
         delegate?.cellDidFinishEditing()
     }
+
+    private func handlePhantomFileCompletion(fileItem: CEWorkspaceFile, wasCancelled: Bool) {
+        if wasCancelled {
+            if let workspace = delegate as? ProjectNavigatorViewController,
+               let workspaceFileManager = workspace.workspace?.workspaceFileManager {
+                removePhantomFile(fileItem: fileItem, fileManager: workspaceFileManager)
+            }
+            return
+        }
+
+        let newName = textField?.stringValue ?? ""
+        if !newName.isEmpty && newName.isValidFilename {
+            if let workspace = delegate as? ProjectNavigatorViewController,
+               let workspaceFileManager = workspace.workspace?.workspaceFileManager,
+               let parent = fileItem.parent {
+                do {
+                    let newFile = try workspaceFileManager.addFile(
+                        fileName: newName,
+                        toFile: parent
+                    )
+
+                    removePhantomFile(fileItem: fileItem, fileManager: workspaceFileManager)
+                    workspace.workspace?.listenerModel.highlightedFileItem = newFile
+                    workspace.workspace?.editorManager?.openTab(item: newFile)
+
+                } catch {
+                    let alert = NSAlert(error: error)
+                    alert.addButton(withTitle: "Dismiss")
+                    alert.runModal()
+                    removePhantomFile(fileItem: fileItem, fileManager: workspaceFileManager)
+                }
+            }
+        } else {
+            if let workspace = delegate as? ProjectNavigatorViewController,
+               let workspaceFileManager = workspace.workspace?.workspaceFileManager {
+                removePhantomFile(fileItem: fileItem, fileManager: workspaceFileManager)
+            }
+        }
+    }
+
+    private func removePhantomFile(fileItem: CEWorkspaceFile, fileManager: CEWorkspaceFileManager) {
+        fileManager.flattenedFileItems.removeValue(forKey: fileItem.id)
+
+        if let parent = fileItem.parent,
+           let childrenIds = fileManager.childrenMap[parent.id] {
+            fileManager.childrenMap[parent.id] = childrenIds.filter { $0 != fileItem.id }
+        }
+
+        if let workspace = delegate as? ProjectNavigatorViewController {
+            workspace.outlineView.reloadData()
+        }
+    }
 }

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

@@ -44,7 +44,7 @@ extension ProjectNavigatorViewController: NSOutlineViewDelegate {
 
         guard let item = outlineView.item(atRow: selectedIndex) as? CEWorkspaceFile else { return }
 
-        if !item.isFolder && shouldSendSelectionUpdate {
+        if !item.isFolder && !item.isPhantom && shouldSendSelectionUpdate {
             shouldSendSelectionUpdate = false
             if workspace?.editorManager?.activeEditor.selectedTab?.file != item {
                 workspace?.editorManager?.activeEditor.openTab(file: item, asTemporary: true)
@@ -131,6 +131,10 @@ extension ProjectNavigatorViewController: NSOutlineViewDelegate {
         outlineView.selectRowIndexes(.init(integer: row), byExtendingSelection: false)
         shouldSendSelectionUpdate = true
 
+        if fileItem.isPhantom {
+            return
+        }
+
         if row < 0 {
             let alert = NSAlert()
             alert.messageText = NSLocalizedString(