Refactor FileNode

coteditor · Aug 22, 2024 · 005a773 · 005a773
1 parent 851d41c
commit 005a773
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/CotEditor/Sources/FileNode.swift b/CotEditor/Sources/FileNode.swift
@@ -50,26 +50,9 @@ struct FileNode: Equatable {
     var isDirectory: Bool  { self.kind == .folder }
     var isHidden: Bool  { self.name.starts(with: ".") }
     var isWritable: Bool  { self.permissions.user.contains(.write) }
-    var directoryURL: URL  { self.isDirectory ? self.fileURL : self.fileURL.deletingLastPathComponent() }
-}
-
-
-extension FileNode: Hashable {
 
-    func hash(into hasher: inout Hasher) {
-
-        hasher.combine(self.id)
-    }
-}
-
-
-extension FileNode: Identifiable {
+    var directoryURL: URL  { self.isDirectory ? self.fileURL : self.fileURL.deletingLastPathComponent() }
 
-    var id: [String]  { self.paths + [self.name] }
-}
-
-
-extension FileNode {
 
     init?(fileWrapper: FileWrapper, paths: [String] = [], fileURL: URL) {
 
@@ -88,7 +71,25 @@ extension FileNode {
                 .sorted(using: SortDescriptor(\.isDirectory))
         }
     }
+}
+
+
+extension FileNode: Hashable {
+
+    func hash(into hasher: inout Hasher) {
+
+        hasher.combine(self.id)
+    }
+}
+
+
+extension FileNode: Identifiable {
 
+    var id: [String]  { self.paths + [self.name] }
+}
+
+
+extension FileNode {
 
     /// Returns the parent of the given node in the node tree.
     ///