Replace deprecated appendingPathComponent calls (#1998)

Author: FastestMolasses

CodeEdit/Features/CEWorkspace/Models/CEWorkspaceFile.swift

@@ -258,7 +258,7 @@ final class CEWorkspaceFile: Codable, Comparable, Hashable, Identifiable, Editor
                 !newName.isEmpty &&
                 newName.isValidFilename &&
                 !FileManager.default.fileExists(
-                    atPath: self.url.deletingLastPathComponent().appendingPathComponent(newName).path
+                    atPath: self.url.deletingLastPathComponent().appending(path: newName).path
                 ) else {
             return false
         }

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

@@ -18,15 +18,15 @@ extension CEWorkspaceFileManager {
     func addFolder(folderName: String, toFile file: CEWorkspaceFile) throws -> CEWorkspaceFile {
         // Check if folder, if it is create folder under self, else create on same level.
         var folderUrl = (
-            file.isFolder ? file.url.appendingPathComponent(folderName)
-            : file.url.deletingLastPathComponent().appendingPathComponent(folderName)
+            file.isFolder ? file.url.appending(path: folderName)
+            : file.url.deletingLastPathComponent().appending(path: folderName)
         )
 
         // If a file/folder with the same name exists, add a number to the end.
         var fileNumber = 0
         while fileManager.fileExists(atPath: folderUrl.path) {
             fileNumber += 1
-            folderUrl = folderUrl.deletingLastPathComponent().appendingPathComponent("\(folderName)\(fileNumber)")
+            folderUrl = folderUrl.deletingLastPathComponent().appending(path: "\(folderName)\(fileNumber)")
         }
 
         // Create the folder
@@ -79,13 +79,13 @@ extension CEWorkspaceFileManager {
                 }
             }
 
-            var fileUrl = file.nearestFolder.appendingPathComponent("\(fileName)\(fileExtension)")
+            var fileUrl = file.nearestFolder.appending(path: "\(fileName)\(fileExtension)")
             // 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()
-                    .appendingPathComponent("\(fileName)\(fileNumber)\(fileExtension)")
+                    .appending(path: "\(fileName)\(fileNumber)\(fileExtension)")
             }
 
             guard fileUrl.fileName.isValidFilename else {
@@ -227,7 +227,7 @@ extension CEWorkspaceFileManager {
             let fileExtension = fileUrl.pathExtension.isEmpty ? "" : ".\(fileUrl.pathExtension)"
             let fileName = fileExtension.isEmpty ? previousName :
             previousName.replacingOccurrences(of: fileExtension, with: "")
-            fileUrl = fileUrl.deletingLastPathComponent().appendingPathComponent("\(fileName) copy\(fileExtension)")
+            fileUrl = fileUrl.deletingLastPathComponent().appending(path: "\(fileName) copy\(fileExtension)")
         }
 
         if fileManager.fileExists(atPath: file.url.path) {

CodeEdit/Features/CEWorkspace/Models/CEWorkspaceFileManager.swift

@@ -198,7 +198,7 @@ final class CEWorkspaceFileManager {
     /// - Parameter file: The parent element.
     /// - Returns: A child element with an associated parent.
     func createChild(_ url: URL, forParent file: CEWorkspaceFile) -> CEWorkspaceFile {
-        let relativeURL = URL(filePath: file.id).appendingPathComponent(url.lastPathComponent)
+        let relativeURL = URL(filePath: file.id).appending(path: url.lastPathComponent)
         let childId = relativeURL.relativePath
         let newFileItem = CEWorkspaceFile(id: childId, url: relativeURL)
         newFileItem.parent = file

CodeEdit/Features/CEWorkspaceSettings/Models/CEWorkspaceSettings.swift

@@ -18,11 +18,11 @@ final class CEWorkspaceSettings: ObservableObject {
     private(set) var folderURL: URL
 
     private var settingsURL: URL {
-        folderURL.appendingPathComponent("settings").appendingPathExtension("json")
+        folderURL.appending(path: "settings").appending(path: "json")
     }
 
     init(workspaceURL: URL) {
-        folderURL = workspaceURL.appendingPathComponent(".codeedit", isDirectory: true)
+        folderURL = workspaceURL.appending(path: ".codeedit", directoryHint: .isDirectory)
         loadSettings()
 
         storeTask = $settings

CodeEdit/Features/InspectorArea/FileInspector/FileInspectorView.swift

@@ -91,7 +91,7 @@ struct FileInspectorView: View {
                     if file.validateFileName(for: fileName) {
                         let destinationURL = file.url
                             .deletingLastPathComponent()
-                            .appendingPathComponent(fileName)
+                            .appending(path: fileName)
                         DispatchQueue.main.async { [weak workspace] in
                             do {
                                 if let newItem = try workspace?.workspaceFileManager?.move(

CodeEdit/Features/NavigatorArea/OutlineView/FileSystemTableViewCell.swift

@@ -164,7 +164,7 @@ extension FileSystemTableViewCell: NSTextFieldDelegate {
             if fileItem.validateFileName(for: textField?.stringValue ?? "") {
                 let newURL = fileItem.url
                     .deletingLastPathComponent()
-                    .appendingPathComponent(textField?.stringValue ?? "")
+                    .appending(path: textField?.stringValue ?? "")
                 try workspace?.workspaceFileManager?.move(file: fileItem, to: newURL)
             } else {
                 textField?.stringValue = fileItem.labelFileName()

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

@@ -127,7 +127,7 @@ extension ProjectNavigatorMenu {
         var folderNumber = 0
         while workspaceFileManager.fileManager.fileExists(atPath: newFolderURL.path) {
             folderNumber += 1
-            newFolderURL = parent.url.appendingPathComponent("New Folder With Items \(folderNumber)")
+            newFolderURL = parent.url.appending(path: "New Folder With Items \(folderNumber)")
         }
 
         do {

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

@@ -59,7 +59,7 @@ final class ProjectNavigatorTableViewCell: FileSystemTableViewCell {
         if fileItem.validateFileName(for: textField?.stringValue ?? "") {
             let destinationURL = fileItem.url
                 .deletingLastPathComponent()
-                .appendingPathComponent(textField?.stringValue ?? "")
+                .appending(path: textField?.stringValue ?? "")
             delegate?.moveFile(file: fileItem, to: destinationURL)
         } else {
             textField?.stringValue = fileItem.labelFileName()

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

@@ -86,7 +86,7 @@ extension ProjectNavigatorViewController: NSOutlineViewDataSource {
         let destParentURL = fileItemDestination.url
 
         for fileItemURL in fileItemURLS {
-            let destURL = destParentURL.appendingPathComponent(fileItemURL.lastPathComponent)
+            let destURL = destParentURL.appending(path: fileItemURL.lastPathComponent)
             // cancel dropping file item on self or in parent directory
             if fileItemURL == destURL || fileItemURL == destParentURL {
                 return false

CodeEdit/Features/Settings/Models/Settings.swift

@@ -80,15 +80,15 @@ final class Settings: ObservableObject {
     internal var baseURL: URL {
         filemanager
             .homeDirectoryForCurrentUser
-            .appendingPathComponent("Library/Application Support/CodeEdit", isDirectory: true)
+            .appending(path: "Library/Application Support/CodeEdit", directoryHint: .isDirectory)
     }
 
     /// The URL of the `settings.json` settings file.
     ///
     /// Points to `~/Library/Application Support/CodeEdit/settings.json`
     private var settingsURL: URL {
         baseURL
-            .appendingPathComponent("settings")
+            .appending(path: "settings")
             .appendingPathExtension("json")
     }
 }