Skip to content

Commit 50ba7d1

Browse files
Replace deprecated appendingPathComponent calls (#1998)
1 parent b69f297 commit 50ba7d1

23 files changed

+67
-67
lines changed

CodeEdit/Features/CEWorkspace/Models/CEWorkspaceFile.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ final class CEWorkspaceFile: Codable, Comparable, Hashable, Identifiable, Editor
258258
!newName.isEmpty &&
259259
newName.isValidFilename &&
260260
!FileManager.default.fileExists(
261-
atPath: self.url.deletingLastPathComponent().appendingPathComponent(newName).path
261+
atPath: self.url.deletingLastPathComponent().appending(path: newName).path
262262
) else {
263263
return false
264264
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ extension CEWorkspaceFileManager {
1818
func addFolder(folderName: String, toFile file: CEWorkspaceFile) throws -> CEWorkspaceFile {
1919
// Check if folder, if it is create folder under self, else create on same level.
2020
var folderUrl = (
21-
file.isFolder ? file.url.appendingPathComponent(folderName)
22-
: file.url.deletingLastPathComponent().appendingPathComponent(folderName)
21+
file.isFolder ? file.url.appending(path: folderName)
22+
: file.url.deletingLastPathComponent().appending(path: folderName)
2323
)
2424

2525
// If a file/folder with the same name exists, add a number to the end.
2626
var fileNumber = 0
2727
while fileManager.fileExists(atPath: folderUrl.path) {
2828
fileNumber += 1
29-
folderUrl = folderUrl.deletingLastPathComponent().appendingPathComponent("\(folderName)\(fileNumber)")
29+
folderUrl = folderUrl.deletingLastPathComponent().appending(path: "\(folderName)\(fileNumber)")
3030
}
3131

3232
// Create the folder
@@ -79,13 +79,13 @@ extension CEWorkspaceFileManager {
7979
}
8080
}
8181

82-
var fileUrl = file.nearestFolder.appendingPathComponent("\(fileName)\(fileExtension)")
82+
var fileUrl = file.nearestFolder.appending(path: "\(fileName)\(fileExtension)")
8383
// If a file/folder with the same name exists, add a number to the end.
8484
var fileNumber = 0
8585
while fileManager.fileExists(atPath: fileUrl.path) {
8686
fileNumber += 1
8787
fileUrl = fileUrl.deletingLastPathComponent()
88-
.appendingPathComponent("\(fileName)\(fileNumber)\(fileExtension)")
88+
.appending(path: "\(fileName)\(fileNumber)\(fileExtension)")
8989
}
9090

9191
guard fileUrl.fileName.isValidFilename else {
@@ -227,7 +227,7 @@ extension CEWorkspaceFileManager {
227227
let fileExtension = fileUrl.pathExtension.isEmpty ? "" : ".\(fileUrl.pathExtension)"
228228
let fileName = fileExtension.isEmpty ? previousName :
229229
previousName.replacingOccurrences(of: fileExtension, with: "")
230-
fileUrl = fileUrl.deletingLastPathComponent().appendingPathComponent("\(fileName) copy\(fileExtension)")
230+
fileUrl = fileUrl.deletingLastPathComponent().appending(path: "\(fileName) copy\(fileExtension)")
231231
}
232232

233233
if fileManager.fileExists(atPath: file.url.path) {

CodeEdit/Features/CEWorkspace/Models/CEWorkspaceFileManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ final class CEWorkspaceFileManager {
198198
/// - Parameter file: The parent element.
199199
/// - Returns: A child element with an associated parent.
200200
func createChild(_ url: URL, forParent file: CEWorkspaceFile) -> CEWorkspaceFile {
201-
let relativeURL = URL(filePath: file.id).appendingPathComponent(url.lastPathComponent)
201+
let relativeURL = URL(filePath: file.id).appending(path: url.lastPathComponent)
202202
let childId = relativeURL.relativePath
203203
let newFileItem = CEWorkspaceFile(id: childId, url: relativeURL)
204204
newFileItem.parent = file

CodeEdit/Features/CEWorkspaceSettings/Models/CEWorkspaceSettings.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ final class CEWorkspaceSettings: ObservableObject {
1818
private(set) var folderURL: URL
1919

2020
private var settingsURL: URL {
21-
folderURL.appendingPathComponent("settings").appendingPathExtension("json")
21+
folderURL.appending(path: "settings").appending(path: "json")
2222
}
2323

2424
init(workspaceURL: URL) {
25-
folderURL = workspaceURL.appendingPathComponent(".codeedit", isDirectory: true)
25+
folderURL = workspaceURL.appending(path: ".codeedit", directoryHint: .isDirectory)
2626
loadSettings()
2727

2828
storeTask = $settings

CodeEdit/Features/InspectorArea/FileInspector/FileInspectorView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ struct FileInspectorView: View {
9191
if file.validateFileName(for: fileName) {
9292
let destinationURL = file.url
9393
.deletingLastPathComponent()
94-
.appendingPathComponent(fileName)
94+
.appending(path: fileName)
9595
DispatchQueue.main.async { [weak workspace] in
9696
do {
9797
if let newItem = try workspace?.workspaceFileManager?.move(

CodeEdit/Features/NavigatorArea/OutlineView/FileSystemTableViewCell.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ extension FileSystemTableViewCell: NSTextFieldDelegate {
164164
if fileItem.validateFileName(for: textField?.stringValue ?? "") {
165165
let newURL = fileItem.url
166166
.deletingLastPathComponent()
167-
.appendingPathComponent(textField?.stringValue ?? "")
167+
.appending(path: textField?.stringValue ?? "")
168168
try workspace?.workspaceFileManager?.move(file: fileItem, to: newURL)
169169
} else {
170170
textField?.stringValue = fileItem.labelFileName()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ extension ProjectNavigatorMenu {
127127
var folderNumber = 0
128128
while workspaceFileManager.fileManager.fileExists(atPath: newFolderURL.path) {
129129
folderNumber += 1
130-
newFolderURL = parent.url.appendingPathComponent("New Folder With Items \(folderNumber)")
130+
newFolderURL = parent.url.appending(path: "New Folder With Items \(folderNumber)")
131131
}
132132

133133
do {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ final class ProjectNavigatorTableViewCell: FileSystemTableViewCell {
5959
if fileItem.validateFileName(for: textField?.stringValue ?? "") {
6060
let destinationURL = fileItem.url
6161
.deletingLastPathComponent()
62-
.appendingPathComponent(textField?.stringValue ?? "")
62+
.appending(path: textField?.stringValue ?? "")
6363
delegate?.moveFile(file: fileItem, to: destinationURL)
6464
} else {
6565
textField?.stringValue = fileItem.labelFileName()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ extension ProjectNavigatorViewController: NSOutlineViewDataSource {
8686
let destParentURL = fileItemDestination.url
8787

8888
for fileItemURL in fileItemURLS {
89-
let destURL = destParentURL.appendingPathComponent(fileItemURL.lastPathComponent)
89+
let destURL = destParentURL.appending(path: fileItemURL.lastPathComponent)
9090
// cancel dropping file item on self or in parent directory
9191
if fileItemURL == destURL || fileItemURL == destParentURL {
9292
return false

CodeEdit/Features/Settings/Models/Settings.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ final class Settings: ObservableObject {
8080
internal var baseURL: URL {
8181
filemanager
8282
.homeDirectoryForCurrentUser
83-
.appendingPathComponent("Library/Application Support/CodeEdit", isDirectory: true)
83+
.appending(path: "Library/Application Support/CodeEdit", directoryHint: .isDirectory)
8484
}
8585

8686
/// The URL of the `settings.json` settings file.
8787
///
8888
/// Points to `~/Library/Application Support/CodeEdit/settings.json`
8989
private var settingsURL: URL {
9090
baseURL
91-
.appendingPathComponent("settings")
91+
.appending(path: "settings")
9292
.appendingPathExtension("json")
9393
}
9494
}

0 commit comments

Comments
 (0)