Added folder renaming

Author: FastestMolasses

CodeEdit/Features/CEWorkspace/Models/CEWorkspaceFile.swift

@@ -116,7 +116,7 @@ final class CEWorkspaceFile: Codable, Comparable, Hashable, Identifiable, Editor
 
     /// Returns a boolean that is true if the resource represented by this object is a directory.
     lazy var isFolder: Bool = {
-        resolvedURL.isFolder
+        isPhantom ? resolvedURL.hasDirectoryPath : resolvedURL.isFolder
     }()
 
     /// Returns a boolean that is true if the contents of the directory at this path are

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

@@ -65,28 +65,14 @@ extension CEWorkspaceFileManager {
         useExtension: String? = nil,
         contents: Data? = nil
     ) throws -> CEWorkspaceFile {
-        // check the folder for other files, and see what the most common file extension is
         do {
-            var fileExtension: String
-            if fileName.contains(".") {
-                // If we already have a file extension in the name, don't add another one
-                fileExtension = ""
-            } else {
-                fileExtension = useExtension ?? findCommonFileExtension(for: file)
-
-                // Don't add a . if the extension is empty, but add it if it's missing.
-                if !fileExtension.isEmpty && !fileExtension.starts(with: ".") {
-                    fileExtension = "." + fileExtension
-                }
-            }
-
-            var fileUrl = file.nearestFolder.appending(path: "\(fileName)\(fileExtension)")
+            var fileUrl = file.nearestFolder.appending(path: "\(fileName)")
             // If a file/folder with the same name exists, add a number to the end.
             var fileNumber = 0
             while fileManager.fileExists(atPath: fileUrl.path) {
                 fileNumber += 1
                 fileUrl = fileUrl.deletingLastPathComponent()
-                    .appending(path: "\(fileName)\(fileNumber)\(fileExtension)")
+                    .appending(path: "\(fileName)\(fileNumber)")
             }
 
             guard fileUrl.fileName.isValidFilename else {
@@ -117,31 +103,6 @@ extension CEWorkspaceFileManager {
         }
     }
 
-    /// Finds a common file extension in the same directory as a file. Defaults to `txt` if no better alternatives
-    /// are found.
-    /// - Parameter file: The file to use to determine a common extension.
-    /// - Returns: The suggested file extension.
-    private func findCommonFileExtension(for file: CEWorkspaceFile) -> String {
-        var fileExtensions: [String: Int] = ["": 0]
-
-        for child in (
-            file.isFolder ? file.flattenedSiblings(withHeight: 2, ignoringFolders: true, using: self)
-            : file.parent?.flattenedSiblings(withHeight: 2, ignoringFolders: true, using: self)
-        ) ?? []
-        where !child.isFolder {
-            // if the file extension was present before, add it now
-            let childFileName = child.fileName(typeHidden: false)
-            if let index = childFileName.lastIndex(of: ".") {
-                let childFileExtension = ".\(childFileName.suffix(from: index).dropFirst())"
-                fileExtensions[childFileExtension] = (fileExtensions[childFileExtension] ?? 0) + 1
-            } else {
-                fileExtensions[""] = (fileExtensions[""] ?? 0) + 1
-            }
-        }
-
-        return fileExtensions.max(by: { $0.value < $1.value })?.key ?? "txt"
-    }
-
     /// This function deletes the item or folder from the current project by moving to Trash
     /// - Parameters:
     ///   - file: The file or folder to delete

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

@@ -84,33 +84,7 @@ extension ProjectNavigatorMenu {
     /// Action that creates a new untitled file
     @objc
     func newFile() {
-        guard let item else { return }
-        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] = []
-            }
-            fileManager.childrenMap[item.id]?.append(phantomFile.id)
-        }
-
-        workspace?.listenerModel.highlightedFileItem = phantomFile
-        sender.outlineView.reloadData()
-
-        DispatchQueue.main.async {
-            self.renameFile()
-        }
+        createAndAddPhantomFile(isFolder: false)
     }
 
     /// Opens the rename file dialogue on the cell this was presented from.
@@ -154,20 +128,10 @@ extension ProjectNavigatorMenu {
         }
     }
 
-    // TODO: allow custom folder names
     /// Action that creates a new untitled folder
     @objc
     func newFolder() {
-        guard let item else { return }
-        do {
-            if let newFolder = try workspace?.workspaceFileManager?.addFolder(folderName: "untitled", toFile: item) {
-                workspace?.listenerModel.highlightedFileItem = newFolder
-            }
-        } catch {
-            let alert = NSAlert(error: error)
-            alert.addButton(withTitle: "Dismiss")
-            alert.runModal()
-        }
+        createAndAddPhantomFile(isFolder: true)
     }
 
     /// Creates a new folder with the items selected.
@@ -299,6 +263,40 @@ extension ProjectNavigatorMenu {
         NSPasteboard.general.setString(paths, forType: .string)
     }
 
+    private func createAndAddPhantomFile(isFolder: Bool) {
+        guard let item else { return }
+        let phantomFile = CEWorkspaceFile(
+            id: UUID().uuidString,
+            url: item.url
+                .appending(
+                    path: isFolder ? "New Folder" : "Untitled",
+                    directoryHint: isFolder ? .isDirectory : .notDirectory
+                ),
+            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] = []
+            }
+            fileManager.childrenMap[item.id]?.append(phantomFile.id)
+        }
+
+        workspace?.listenerModel.highlightedFileItem = phantomFile
+        sender.outlineView.reloadData()
+
+        DispatchQueue.main.async {
+            self.renameFile()
+        }
+    }
+
     private func reloadData() {
         sender.outlineView.reloadData()
         sender.filteredContentChildren.removeAll()

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

@@ -88,21 +88,27 @@ final class ProjectNavigatorTableViewCell: FileSystemTableViewCell {
                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)
-
+                    if fileItem.isFolder {
+                        let newFolder = try workspaceFileManager.addFolder(
+                            folderName: newName,
+                            toFile: parent
+                        )
+                        workspace.workspace?.listenerModel.highlightedFileItem = newFolder
+                    } else {
+                        let newFile = try workspaceFileManager.addFile(
+                            fileName: newName,
+                            toFile: parent
+                        )
+                        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)
                 }
+
+                removePhantomFile(fileItem: fileItem, fileManager: workspaceFileManager)
             }
         } else {
             if let workspace = delegate as? ProjectNavigatorViewController,