modified addFile function

Author: Syrux64

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

@@ -62,7 +62,8 @@ extension CEWorkspaceFileManager {
     func addFile(
         fileName: String,
         toFile file: CEWorkspaceFile,
-        useExtension: String? = nil
+        useExtension: String? = nil,
+        contents: Data? = nil
     ) throws -> CEWorkspaceFile {
         // check the folder for other files, and see what the most common file extension is
         do {
@@ -95,7 +96,7 @@ extension CEWorkspaceFileManager {
             // Create the file
             guard fileManager.createFile(
                 atPath: fileUrl.path,
-                contents: nil,
+                contents: contents,
                 attributes: [FileAttributeKey.creationDate: Date()]
             ) else {
                 throw CocoaError.error(.fileWriteUnknown, url: fileUrl)
@@ -116,57 +117,6 @@ extension CEWorkspaceFileManager {
         }
     }
 
-    /// This function is used to create a file with contents
-    func addFileWithContents(
-        fileName: String,
-        toFile file: CEWorkspaceFile,
-        useExtension: String? = nil,
-        contents: Data?
-    ) throws -> CEWorkspaceFile {
-        do {
-            var fileExtension: String
-            if fileName.contains(".") {
-                fileExtension = ""
-            } else {
-                fileExtension = useExtension ?? findCommonFileExtension(for: file)
-                if !fileExtension.isEmpty && !fileExtension.starts(with: ".") {
-                    fileExtension = "." + fileExtension
-                }
-            }
-
-            var fileUrl = file.nearestFolder.appendingPathComponent("\(fileName)\(fileExtension)")
-            var fileNumber = 0
-            while fileManager.fileExists(atPath: fileUrl.path) {
-                fileNumber += 1
-                fileUrl = fileUrl.deletingLastPathComponent()
-                    .appendingPathComponent("\(fileName)\(fileNumber)\(fileExtension)")
-            }
-
-            guard fileUrl.fileName.isValidFilename else {
-                throw FileManagerError.invalidFileName
-            }
-
-            guard fileManager.createFile(
-                atPath: fileUrl.path,
-                contents: contents,
-                attributes: [FileAttributeKey.creationDate: Date()]
-            ) else {
-                throw CocoaError.error(.fileWriteUnknown, url: fileUrl)
-            }
-
-            try rebuildFiles(fromItem: file.isFolder ? file : file.parent ?? file)
-            notifyObservers(updatedItems: [file.isFolder ? file : file.parent ?? file])
-
-            guard let newFile = getFile(fileUrl.path, createIfNotFound: true) else {
-                throw FileManagerError.fileNotIndexed
-            }
-            return newFile
-        } catch {
-            logger.error("Failed to add file with contents: \(error, privacy: .auto)")
-            throw error
-        }
-    }
-
     /// 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.

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

@@ -123,7 +123,7 @@ extension ProjectNavigatorMenu {
             let clipBoardContent = NSPasteboard.general.string(forType: .string)?.data(using: .utf8)
             if let newFile = try workspace?
                 .workspaceFileManager?
-                .addFileWithContents(
+                .addFile(
                     fileName: "untitled",
                     toFile: item,
                     useExtension: "",