fix(swiftformat): Enforced omission of trailing commas.

i2h3 · i2h3 · commit 8af7dde7b8ba · 2025-10-20T09:53:10.000+02:00
Signed-off-by: Iva Horn &lt;iva.horn@nextcloud.com&gt;
diff --git a/.swiftformat b/.swiftformat
@@ -1 +1,2 @@
 --indent-case true
+--trailing-commas never
diff --git a/Package.swift b/Package.swift
@@ -8,21 +8,21 @@ let package = Package(
     platforms: [
         .iOS(.v16),
         .macOS(.v11),
-        .visionOS(.v1),
+        .visionOS(.v1)
     ],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
         .library(
             name: "NextcloudFileProviderKit",
             targets: ["NextcloudFileProviderKit"]
-        ),
+        )
     ],
     dependencies: [
         .package(url: "https://github.com/nextcloud/NextcloudCapabilitiesKit.git", from: "2.3.0"),
         .package(url: "https://github.com/nextcloud/NextcloudKit", from: "7.0.0"),
         .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.55.0"),
         .package(url: "https://github.com/realm/realm-swift.git", from: "20.0.1"),
-        .package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0"),
+        .package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.
@@ -32,13 +32,13 @@ let package = Package(
             dependencies: [
                 .product(name: "NextcloudCapabilitiesKit", package: "NextcloudCapabilitiesKit"),
                 .product(name: "NextcloudKit", package: "NextcloudKit"),
-                .product(name: "RealmSwift", package: "realm-swift"),
+                .product(name: "RealmSwift", package: "realm-swift")
             ]
         ),
         .target(
             name: "NextcloudFileProviderKitMocks",
             dependencies: [
-                "NextcloudFileProviderKit",
+                "NextcloudFileProviderKit"
             ]
         ),
         .target(
@@ -49,7 +49,7 @@ let package = Package(
                 .product(name: "NIOCore", package: "swift-nio"),
                 .product(name: "NIOPosix", package: "swift-nio"),
                 .product(name: "NIOHTTP1", package: "swift-nio"),
-                .product(name: "NIOWebSocket", package: "swift-nio"),
+                .product(name: "NIOWebSocket", package: "swift-nio")
             ],
             path: "Tests/Interface"
         ),
@@ -61,6 +61,6 @@ let package = Package(
         .testTarget(
             name: "NextcloudFileProviderKitTests",
             dependencies: ["NextcloudFileProviderKit", "TestInterface"]
-        ),
+        )
     ]
 )
diff --git a/Sources/NextcloudFileProviderKit/Database/FilesDatabaseManager.swift b/Sources/NextcloudFileProviderKit/Database/FilesDatabaseManager.swift
@@ -300,14 +300,14 @@ public final class FilesDatabaseManager: Sendable {
                         .item: updatedMetadata.ocId,
                         .eTag: updatedMetadata.etag,
                         .name: updatedMetadata.fileName,
-                        .syncTime: updatedMetadata.syncTime.description,
+                        .syncTime: updatedMetadata.syncTime.description
                     ])
                 } else {
                     logger.debug("Skipping item metadata update; same as existing, or still in transit.", [
                         .item: updatedMetadata.ocId,
                         .eTag: updatedMetadata.etag,
                         .name: updatedMetadata.fileName,
-                        .syncTime: updatedMetadata.syncTime.description,
+                        .syncTime: updatedMetadata.syncTime.description
                     ])
                 }
 
@@ -459,7 +459,7 @@ public final class FilesDatabaseManager: Sendable {
                     .item: metadata.ocId,
                     .eTag: metadata.etag,
                     .name: metadata.fileName,
-                    .syncTime: metadata.syncTime,
+                    .syncTime: metadata.syncTime
                 ])
             }
             return SendableItemMetadata(value: result)
@@ -468,7 +468,7 @@ public final class FilesDatabaseManager: Sendable {
                 .item: metadata.ocId,
                 .eTag: metadata.etag,
                 .error: error,
-                .name: metadata.fileName,
+                .name: metadata.fileName
             ])
         }
 
@@ -571,7 +571,7 @@ public final class FilesDatabaseManager: Sendable {
             logger.error("Could not retrieve parent item identifier remotely.", [
                 .error: error,
                 .item: metadata.ocId,
-                .name: metadata.fileName,
+                .name: metadata.fileName
             ])
 
             return nil
diff --git a/Sources/NextcloudFileProviderKit/Item/Item+Create.swift b/Sources/NextcloudFileProviderKit/Item/Item+Create.swift
@@ -251,7 +251,7 @@ public extension Item {
             """
         )
         let attributesToFetch: Set<URLResourceKey> = [
-            .isDirectoryKey, .fileSizeKey, .creationDateKey, .contentModificationDateKey,
+            .isDirectoryKey, .fileSizeKey, .creationDateKey, .contentModificationDateKey
         ]
         let fm = FileManager.default
         guard let enumerator = fm.enumerator(
diff --git a/Sources/NextcloudFileProviderKit/Item/Item+Modify.swift b/Sources/NextcloudFileProviderKit/Item/Item+Modify.swift
@@ -318,7 +318,7 @@ public extension Item {
         }
 
         let attributesToFetch: Set<URLResourceKey> = [
-            .isDirectoryKey, .fileSizeKey, .creationDateKey, .contentModificationDateKey,
+            .isDirectoryKey, .fileSizeKey, .creationDateKey, .contentModificationDateKey
         ]
         let fm = FileManager.default
         guard let enumerator = fm.enumerator(
diff --git a/Sources/NextcloudFileProviderKit/Item/Item.swift b/Sources/NextcloudFileProviderKit/Item/Item.swift
@@ -177,19 +177,19 @@ public class Item: NSObject, NSFileProviderItem {
             return [
                 .hidden,
                 .userReadable,
-                .userWritable,
+                .userWritable
             ]
         }
 
         if metadata.lock, metadata.lockOwnerType != NKLockType.user.rawValue || metadata.lockOwner != account.username, metadata.lockTimeOut ?? Date() > Date() {
             return [
-                .userReadable,
+                .userReadable
             ]
         }
 
         return [
             .userReadable,
-            .userWritable,
+            .userWritable
         ]
     }
 
diff --git a/Sources/NextcloudFileProviderKit/Log/FileProviderLogDetail.swift b/Sources/NextcloudFileProviderKit/Log/FileProviderLogDetail.swift
@@ -102,7 +102,7 @@ public enum FileProviderLogDetail: Encodable {
                 self = .dictionary([
                     "code": .int(error.code),
                     "domain": .string(error.domain),
-                    "localizedDescription": .string(error.localizedDescription),
+                    "localizedDescription": .string(error.localizedDescription)
                 ])
             } else if let error = someValue as? Error {
                 self = .string(error.localizedDescription)
@@ -134,13 +134,13 @@ public enum FileProviderLogDetail: Encodable {
                     "syncTime": .date(metadata.syncTime),
                     "trashbinFileName": .string(metadata.trashbinFileName),
                     "uploaded": .bool(metadata.uploaded),
-                    "visitedDirectory": .bool(metadata.visitedDirectory),
+                    "visitedDirectory": .bool(metadata.visitedDirectory)
                 ])
             } else if let request = someValue as? NSFileProviderRequest {
                 self = .dictionary([
                     "requestingExecutable": .string(request.requestingExecutable?.path ?? "nil"),
                     "isFileViewerRequest": .bool(request.isFileViewerRequest),
-                    "isSystemRequest": .bool(request.isSystemRequest),
+                    "isSystemRequest": .bool(request.isSystemRequest)
                 ])
             } else if let lock = someValue as? NKLock {
                 self = .dictionary([
@@ -150,7 +150,7 @@ public enum FileProviderLogDetail: Encodable {
                     "ownerType": .int(lock.ownerType.rawValue),
                     "time": lock.time == nil ? .null : .date(lock.time!),
                     "timeOut": lock.timeOut == nil ? .null : .date(lock.timeOut!),
-                    "token": lock.token == nil ? .null : .string(lock.token!),
+                    "token": lock.token == nil ? .null : .string(lock.token!)
                 ])
             } else {
                 self = .string("Unsupported log detail type: \(String(describing: someValue.self))")
diff --git a/Sources/NextcloudFileProviderKit/Metadata/ItemMetadata.swift b/Sources/NextcloudFileProviderKit/Metadata/ItemMetadata.swift
@@ -168,7 +168,7 @@ public extension ItemMetadata {
                 .init(name: "fileId", value: fileId),
                 .init(name: "x", value: "\(size.width)"),
                 .init(name: "y", value: "\(size.height)"),
-                .init(name: "a", value: "true"),
+                .init(name: "a", value: "true")
             ])
     }
 
diff --git a/Sources/NextcloudFileProviderKit/Utilities/Account.swift b/Sources/NextcloudFileProviderKit/Utilities/Account.swift
@@ -87,7 +87,7 @@ public struct Account: CustomStringConvertible, Equatable, Sendable {
             AccountDictDavFilesUrlKey: davFilesUrl,
             AccountDictTrashUrlKey: trashUrl,
             AccountDictTrashRestoreUrlKey: trashRestoreUrl,
-            AccountDictFileNameKey: fileName,
+            AccountDictFileNameKey: fileName
         ]
     }
 }
diff --git a/Tests/InterfaceTests/MockRemoteInterfaceTests.swift b/Tests/InterfaceTests/MockRemoteInterfaceTests.swift
@@ -283,7 +283,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
                     fileName: String(3),
                     size: Int64(data.count - (chunkSize * 2)),
                     remoteChunkStoreFolderName: uploadUuid
-                ),
+                )
             ],
             creationDate: .init(),
             modificationDate: .init(),
@@ -522,7 +522,7 @@ final class MockRemoteInterfaceTests: XCTestCase {
                 remoteInterface.rootItem?.identifier,
                 itemA.identifier,
                 itemB.identifier,
-                itemC.identifier,
+                itemC.identifier
             ]
         )
 
diff --git a/Tests/NextcloudFileProviderKitTests/AccountTests.swift b/Tests/NextcloudFileProviderKitTests/AccountTests.swift
@@ -36,7 +36,7 @@ final class AccountTests: NextcloudFileProviderKitTestCase {
             AccountDictDavFilesUrlKey: "https://example.com/remote.php/dav/files/user",
             AccountDictTrashUrlKey: "https://example.com/remote.php/dav/trashbin/user/trash",
             AccountDictTrashRestoreUrlKey: "https://example.com/remote.php/dav/trashbin/user/restore",
-            AccountDictFileNameKey: "userId_example_com",
+            AccountDictFileNameKey: "userId_example_com"
         ]
 
         let account = Account(dictionary: dictionary)
@@ -57,7 +57,7 @@ final class AccountTests: NextcloudFileProviderKitTestCase {
 
     func testInitializationFromIncompleteDictionary() {
         let incompleteDictionary: [String: String] = [
-            AccountDictUsernameKey: "user",
+            AccountDictUsernameKey: "user"
             // missing other keys
         ]
 
diff --git a/Tests/NextcloudFileProviderKitTests/EnumeratorPageResponseTests.swift b/Tests/NextcloudFileProviderKitTests/EnumeratorPageResponseTests.swift
@@ -41,7 +41,7 @@ import Testing
         let headers = [
             "X-NC-PAGINATE": "true",
             "X-NC-PAGINATE-TOKEN": "nextToken123",
-            "X-NC-PAGINATE-TOTAL": "100",
+            "X-NC-PAGINATE-TOTAL": "100"
         ]
         let mockResponse = createMockAFDataResponse(headers: headers)
         let index = 0
@@ -73,7 +73,7 @@ import Testing
         let headers = [
             "x-nc-paginate": "TRUE", // Lowercase key, uppercase value for boolean
             "x-nc-paginate-token": "mixedCaseToken789",
-            "X-NC-PAGINATE-TOTAL": "50",
+            "X-NC-PAGINATE-TOTAL": "50"
         ]
         let mockResponse = createMockAFDataResponse(headers: headers)
         let index = 2
@@ -91,7 +91,7 @@ import Testing
         let headers = [
             "X-NC-PAGINATE": "true",
             "X-NC-PAGINATE-TOKEN": "tokenWithInvalidTotal",
-            "X-NC-PAGINATE-TOTAL": "not-an-integer",
+            "X-NC-PAGINATE-TOTAL": "not-an-integer"
         ]
         let mockResponse = createMockAFDataResponse(headers: headers)
         let index = 3
@@ -152,7 +152,7 @@ import Testing
     func initWithPaginateHeaderFalse() {
         let headers = [
             "X-NC-PAGINATE": "false",
-            "X-NC-PAGINATE-TOKEN": "someToken",
+            "X-NC-PAGINATE-TOKEN": "someToken"
         ]
         let mockResponse = createMockAFDataResponse(headers: headers)
         let index = 0
diff --git a/Tests/NextcloudFileProviderKitTests/IgnoredFilesMatcherTests.swift b/Tests/NextcloudFileProviderKitTests/IgnoredFilesMatcherTests.swift
@@ -11,7 +11,7 @@ struct IgnoredFilesMatcherTests {
             "build/",
             "folder/*",
             "secret.txt",
-            "deep/**",
+            "deep/**"
         ]
 
         let matcher = IgnoredFilesMatcher(ignoreList: patterns)
diff --git a/Tests/NextcloudFileProviderKitTests/ItemCreateTests.swift b/Tests/NextcloudFileProviderKitTests/ItemCreateTests.swift
@@ -448,7 +448,7 @@ final class ItemCreateTests: NextcloudFileProviderKitTestCase {
                     fileName: String(previousUploadedChunkNum + 2),
                     size: Int64(chunkSize),
                     remoteChunkStoreFolderName: expectedChunkUploadId
-                ),
+                )
             ])
         }
 
diff --git a/Tests/NextcloudFileProviderKitTests/ItemFetchTests.swift b/Tests/NextcloudFileProviderKitTests/ItemFetchTests.swift
@@ -132,7 +132,7 @@ final class ItemFetchTests: NextcloudFileProviderKitTestCase {
         rootItem.children = [remoteDirectory]
         remoteDirectory.parent = rootItem
         remoteDirectory.children = [
-            remoteDirectoryChildFile, remoteDirectoryChildDirA, remoteDirectoryChildDirB,
+            remoteDirectoryChildFile, remoteDirectoryChildDirA, remoteDirectoryChildDirB
         ]
         remoteDirectoryChildFile.parent = remoteDirectory
         remoteDirectoryChildDirA.parent = remoteDirectory
diff --git a/Tests/NextcloudFileProviderKitTests/ItemModifyTests.swift b/Tests/NextcloudFileProviderKitTests/ItemModifyTests.swift
@@ -406,7 +406,7 @@ final class ItemModifyTests: NextcloudFileProviderKitTestCase {
             remoteKeynoteIndexZip,
             remoteKeynoteRandomFile,
             remoteKeynoteDataFolder,
-            remoteKeynoteMetadataFolder,
+            remoteKeynoteMetadataFolder
         ]
         remoteKeynoteIndexZip.parent = remoteKeynoteBundle
         remoteKeynoteRandomFile.parent = remoteKeynoteBundle
@@ -417,7 +417,7 @@ final class ItemModifyTests: NextcloudFileProviderKitTestCase {
         remoteKeynoteMetadataFolder.children = [
             remoteKeynoteDocIdentifier,
             remoteKeynoteVersionPlist,
-            remoteKeynotePropertiesPlist,
+            remoteKeynotePropertiesPlist
         ]
         remoteKeynoteDocIdentifier.parent = remoteKeynoteMetadataFolder
         remoteKeynoteVersionPlist.parent = remoteKeynoteMetadataFolder
@@ -1264,7 +1264,7 @@ final class ItemModifyTests: NextcloudFileProviderKitTestCase {
                     fileName: String(previousUploadedChunkNum + 2),
                     size: Int64(chunkSize),
                     remoteChunkStoreFolderName: chunkUploadId
-                ),
+                )
             ])
         }
 
@@ -1447,7 +1447,7 @@ final class ItemModifyTests: NextcloudFileProviderKitTestCase {
         let (modifiedItem, error) = await lockItem.modify(
             itemTarget: modifyTemplateItem,
             changedFields: [
-                .filename, .contents, .parentItemIdentifier, .creationDate, .contentModificationDate,
+                .filename, .contents, .parentItemIdentifier, .creationDate, .contentModificationDate
             ],
             contents: tempUrl,
             dbManager: Self.dbManager
@@ -1505,7 +1505,7 @@ final class ItemModifyTests: NextcloudFileProviderKitTestCase {
         let (modifiedItem, error) = await lockItem.modify(
             itemTarget: modifyTemplateItem,
             changedFields: [
-                .filename, .contents, .parentItemIdentifier, .creationDate, .contentModificationDate,
+                .filename, .contents, .parentItemIdentifier, .creationDate, .contentModificationDate
             ],
             contents: tempUrl,
             dbManager: Self.dbManager
diff --git a/Tests/NextcloudFileProviderKitTests/ItemPropertyTests.swift b/Tests/NextcloudFileProviderKitTests/ItemPropertyTests.swift
@@ -771,7 +771,7 @@ final class ItemPropertyTests: NextcloudFileProviderKitTestCase {
             .allowsTrashing,
             .allowsWriting,
             .allowsRenaming,
-            .allowsReparenting,
+            .allowsReparenting
         ]
 
         // Excluding from sync is macOS-specific and always added if available
@@ -807,7 +807,7 @@ final class ItemPropertyTests: NextcloudFileProviderKitTestCase {
             .allowsTrashing,
             .allowsRenaming,
             .allowsReparenting,
-            .allowsAddingSubItems,
+            .allowsAddingSubItems
         ]
 
         var platformExpected = expected
diff --git a/Tests/NextcloudFileProviderKitTests/UploadTests.swift b/Tests/NextcloudFileProviderKitTests/UploadTests.swift
@@ -117,7 +117,7 @@ final class UploadTests: NextcloudFileProviderKitTestCase {
                     fileName: String(previousUploadedChunkNum + 2),
                     size: Int64(data.count - (chunkSize * (previousUploadedChunkNum + 1))),
                     remoteChunkStoreFolderName: uploadUuid
-                ),
+                )
             ])
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`--indent-case true`
	`2`	`+--trailing-commas never`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ public extension Item {`
`251`	`251`	`"""`
`252`	`252`	`)`
`253`	`253`	`let attributesToFetch: Set<URLResourceKey> = [`
`254`		`- .isDirectoryKey, .fileSizeKey, .creationDateKey, .contentModificationDateKey,`
	`254`	`+ .isDirectoryKey, .fileSizeKey, .creationDateKey, .contentModificationDateKey`
`255`	`255`	`]`
`256`	`256`	`let fm = FileManager.default`
`257`	`257`	`guard let enumerator = fm.enumerator(`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ public extension Item {`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`let attributesToFetch: Set<URLResourceKey> = [`
`321`		`- .isDirectoryKey, .fileSizeKey, .creationDateKey, .contentModificationDateKey,`
	`321`	`+ .isDirectoryKey, .fileSizeKey, .creationDateKey, .contentModificationDateKey`
`322`	`322`	`]`
`323`	`323`	`let fm = FileManager.default`
`324`	`324`	`guard let enumerator = fm.enumerator(`
Original file line number	Diff line number	Diff line change
`@@ -177,19 +177,19 @@ public class Item: NSObject, NSFileProviderItem {`
`177`	`177`	`return [`
`178`	`178`	`.hidden,`
`179`	`179`	`.userReadable,`
`180`		`- .userWritable,`
	`180`	`+ .userWritable`
`181`	`181`	`]`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`if metadata.lock, metadata.lockOwnerType != NKLockType.user.rawValue \|\| metadata.lockOwner != account.username, metadata.lockTimeOut ?? Date() > Date() {`
`185`	`185`	`return [`
`186`		`- .userReadable,`
	`186`	`+ .userReadable`
`187`	`187`	`]`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`return [`
`191`	`191`	`.userReadable,`
`192`		`- .userWritable,`
	`192`	`+ .userWritable`
`193`	`193`	`]`
`194`	`194`	`}`
`195`	`195`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ public extension ItemMetadata {`
`168`	`168`	`.init(name: "fileId", value: fileId),`
`169`	`169`	`.init(name: "x", value: "\(size.width)"),`
`170`	`170`	`.init(name: "y", value: "\(size.height)"),`
`171`		`- .init(name: "a", value: "true"),`
	`171`	`+ .init(name: "a", value: "true")`
`172`	`172`	`])`
`173`	`173`	`}`
`174`	`174`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public struct Account: CustomStringConvertible, Equatable, Sendable {`
`87`	`87`	`AccountDictDavFilesUrlKey: davFilesUrl,`
`88`	`88`	`AccountDictTrashUrlKey: trashUrl,`
`89`	`89`	`AccountDictTrashRestoreUrlKey: trashRestoreUrl,`
`90`		`- AccountDictFileNameKey: fileName,`
	`90`	`+ AccountDictFileNameKey: fileName`
`91`	`91`	`]`
`92`	`92`	`}`
`93`	`93`	`}`