.bcr/metadata.template.json

@@ -5,6 +5,11 @@
             "email": "jp@jpsim.com",
             "github": "jpsim",
             "name": "JP Simard"
+        },
+        {
+            "email": "danny.moesch@icloud.com",
+            "github": "SimplyDanny",
+            "name": "Danny Mösch"
         }
     ],
     "repository": [

.bcr/presubmit.yml

@@ -9,7 +9,7 @@ tasks:
     platform: ubuntu2004
     environment:
       CC: "clang"
-      SWIFT_VERSION: "5.8.1"
+      SWIFT_VERSION: "5.10"
       SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
       PATH: "$PATH:$SWIFT_HOME/usr/bin"
     shell_commands: *shell_commands

.buildkite/pipeline.yml

@@ -7,8 +7,6 @@ steps:
       - bazel test --test_output=errors //Tests/...
   - label: "Build With Strict Concurrency"
     commands:
-      - echo "+++ Add @preconcurrency imports"
-      - ./tools/add-preconcurrency-imports.sh
       - echo "+++ Build"
       - bazel build --define strict_concurrency_builtin_rules=true :swiftlint
       - echo "--- Clean up"

CHANGELOG.md

@@ -1,3 +1,48 @@
+## 0.56.2: Heat Pump Dryer
+
+#### Breaking
+
+* None.
+
+#### Experimental
+
+* None.
+
+#### Enhancements
+
+* None.
+
+#### Bug Fixes
+
+* Ignore initializers with attributes in `unneeded_synthesized_initializer` rule.  
+  [SimplyDanny](https://github.com/SimplyDanny)
+  [#5153](https://github.com/realm/SwiftLint/issues/5153)
+
+* Silence `prefer_key_path` rule on macro expansion expressions.  
+  [SimplyDanny](https://github.com/SimplyDanny)
+  [#5744](https://github.com/realm/SwiftLint/issues/5744)
+
+* Check `if` expressions nested arbitrarily deep in `contrasted_opening_brace` rule.  
+  [SimplyDanny](https://github.com/SimplyDanny)
+  [#5752](https://github.com/realm/SwiftLint/issues/5752)
+
+* Align left closure brace with associated parent function call in `contrasted_opening_brace` rule.  
+  [SimplyDanny](https://github.com/SimplyDanny)
+  [#5752](https://github.com/realm/SwiftLint/issues/5752)
+
+* Align left brace of additional trailing closures with right brace of previous trailing closure
+  in `contrasted_opening_brace` rule.  
+  [SimplyDanny](https://github.com/SimplyDanny)
+  [#5752](https://github.com/realm/SwiftLint/issues/5752)
+
+* Trigger on empty closure blocks in `no_empty_block` rule.  
+  [SimplyDanny](https://github.com/SimplyDanny)
+  [#5762](https://github.com/realm/SwiftLint/issues/5762)
+
+* Silence `unneeded_override` rule on methods and initializers with attributes.  
+  [SimplyDanny](https://github.com/SimplyDanny)
+  [#5753](https://github.com/realm/SwiftLint/issues/5753)
+
 ## 0.56.1: Heat Pump Dryer
 
 #### Breaking

Gemfile.lock

@@ -122,8 +122,8 @@ GEM
     public_suffix (4.0.7)
     rchardet (1.8.0)
     redcarpet (3.6.0)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.3)
+      strscan
     rouge (4.3.0)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
@@ -144,13 +144,13 @@ GEM
     unicode-display_width (2.4.2)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.22.0)
+    xcodeproj (1.25.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
+      rexml (>= 3.3.2, < 4.0)
 
 PLATFORMS
   arm64-darwin-21

MODULE.bazel

@@ -1,18 +1,18 @@
 module(
     name = "swiftlint",
-    version = "0.56.1",
+    version = "0.56.2",
     compatibility_level = 1,
     repo_name = "SwiftLint",
 )
 
 bazel_dep(name = "apple_support", version = "1.16.0", repo_name = "build_bazel_apple_support")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "platforms", version = "0.0.10")
-bazel_dep(name = "rules_apple", version = "3.6.0", repo_name = "build_bazel_rules_apple")
-bazel_dep(name = "rules_swift", version = "1.18.0", repo_name = "build_bazel_rules_swift")
-bazel_dep(name = "sourcekitten", version = "0.35.0", repo_name = "com_github_jpsim_sourcekitten")
-bazel_dep(name = "swift-syntax", version = "600.0.0-prerelease-2024-07-24", repo_name = "SwiftSyntax")
-bazel_dep(name = "swift_argument_parser", version = "1.3.1", repo_name = "sourcekitten_com_github_apple_swift_argument_parser")
+bazel_dep(name = "rules_apple", version = "3.8.0", repo_name = "build_bazel_rules_apple")
+bazel_dep(name = "rules_swift", version = "2.1.1", repo_name = "build_bazel_rules_swift")
+bazel_dep(name = "sourcekitten", version = "0.36.0", repo_name = "com_github_jpsim_sourcekitten")
+bazel_dep(name = "swift-syntax", version = "600.0.0-prerelease-2024-08-14", repo_name = "SwiftSyntax")
+bazel_dep(name = "swift_argument_parser", version = "1.3.1.1", repo_name = "sourcekitten_com_github_apple_swift_argument_parser")
 bazel_dep(name = "yams", version = "5.1.3", repo_name = "sourcekitten_com_github_jpsim_yams")
 
 swiftlint_repos = use_extension("//bazel:repos.bzl", "swiftlint_repos_bzlmod")
@@ -31,4 +31,4 @@ use_repo(apple_cc_configure, "local_config_apple_cc")
 
 # Dev Dependencies
 
-bazel_dep(name = "rules_xcodeproj", version = "1.13.0", dev_dependency = True)
+bazel_dep(name = "rules_xcodeproj", version = "2.6.1", dev_dependency = True)

Package.resolved

@@ -41,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/swiftlang/swift-syntax.git",
       "state" : {
-        "revision" : "82a453c2dfa335c7e778695762438dfe72b328d2",
-        "version" : "600.0.0-prerelease-2024-07-24"
+        "revision" : "515f79b522918f83483068d99c68daeb5116342d",
+        "version" : "600.0.0-prerelease-2024-08-14"
       }
     },
     {

Package.swift

@@ -29,7 +29,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.1"),
-        .package(url: "https://github.com/swiftlang/swift-syntax.git", exact: "600.0.0-prerelease-2024-07-24"),
+        .package(url: "https://github.com/swiftlang/swift-syntax.git", exact: "600.0.0-prerelease-2024-08-14"),
         .package(url: "https://github.com/jpsim/SourceKitten.git", .upToNextMinor(from: "0.35.0")),
         .package(url: "https://github.com/jpsim/Yams.git", from: "5.0.6"),
         .package(url: "https://github.com/scottrhoyt/SwiftyTextTable.git", from: "0.9.0"),
@@ -172,8 +172,8 @@ let package = Package(
 package.targets.append(
     .binaryTarget(
         name: "SwiftLintBinary",
-        url: "https://github.com/realm/SwiftLint/releases/download/0.56.1/SwiftLintBinary-macos.artifactbundle.zip",
-        checksum: "146ef723e83d301b9f1ef647dc924a55dae293887e633618e76f8cb526292f0c"
+        url: "https://github.com/realm/SwiftLint/releases/download/0.56.2/SwiftLintBinary-macos.artifactbundle.zip",
+        checksum: "197df93d7f5041d8cd46d6902a34ad57914efe1b5b50635995f3b9065f2c3ffd"
     )
 )
 #endif

Source/SwiftLintBuiltInRules/Rules/Idiomatic/NoEmptyBlockRule.swift

@@ -92,6 +92,18 @@ struct NoEmptyBlockRule: OptInRule {
 
             while i < 10 {}
             """, configuration: ["disabled_block_types": ["statement_blocks"]]),
+            Example("""
+            f { _ in /* comment */ }
+            f { _ in // comment
+            }
+            f { _ in
+                // comment
+            }
+            """),
+            Example("""
+            f {}
+            {}()
+            """, configuration: ["disabled_block_types": ["closure_blocks"]]),
         ],
         triggeringExamples: [
             Example("""
@@ -130,6 +142,12 @@ struct NoEmptyBlockRule: OptInRule {
 
             while i < 10 ↓{}
             """),
+            Example("""
+            f ↓{}
+            """),
+            Example("""
+            Button ↓{} label: ↓{}
+            """),
         ]
     )
 }
@@ -142,7 +160,14 @@ private extension NoEmptyBlockRule {
             }
         }
 
-        func validate(node: CodeBlockSyntax) {
+        override func visitPost(_ node: ClosureExprSyntax) {
+            if configuration.enabledBlockTypes.contains(.closureBlocks),
+               node.signature?.inKeyword.trailingTrivia.containsComments != true {
+                validate(node: node)
+            }
+        }
+
+        func validate(node: some BracedSyntax & WithStatementsSyntax) {
             guard node.statements.isEmpty,
                   !node.leftBrace.trailingTrivia.containsComments,
                   !node.rightBrace.leadingTrivia.containsComments else {
@@ -162,6 +187,8 @@ private extension CodeBlockSyntax {
             .initializerBodies
         case .forStmt, .doStmt, .whileStmt, .repeatStmt, .ifExpr, .catchClause, .deferStmt:
             .statementBlocks
+        case .closureExpr:
+            .closureBlocks
         case .guardStmt:
             // No need to handle this case since Empty Block of `guard` is compile error.
             nil

Source/SwiftLintBuiltInRules/Rules/Idiomatic/PreferKeyPathRule.swift

@@ -29,6 +29,7 @@ struct PreferKeyPathRule: OptInRule {
             Example("[1, 2, 3].reduce(1) { $0 + $1 }", configuration: extendedMode),
             Example("f.map(1) { $0.a }"),
             Example("f.filter({ $0.a }, x)"),
+            Example("#Predicate { $0.a }"),
         ],
         triggeringExamples: [
             Example("f.map ↓{ $0.a }"),
@@ -174,10 +175,9 @@ private extension ClosureExprSyntax {
     }
 
     func isInvalid(restrictToStandardFunctions: Bool) -> Bool {
-        if keyPathInParent == \FunctionCallExprSyntax.calledExpression {
-            return true
-        }
-        if parent?.is(MultipleTrailingClosureElementSyntax.self) == true {
+        guard keyPathInParent != \FunctionCallExprSyntax.calledExpression,
+              let parentKind = parent?.kind,
+              ![.macroExpansionExpr, .multipleTrailingClosureElement].contains(parentKind) else {
             return true
         }
         if let call = parent?.as(LabeledExprSyntax.self)?.parent?.parent?.as(FunctionCallExprSyntax.self) {

Source/SwiftLintBuiltInRules/Rules/Idiomatic/UnneededSynthesizedInitializerRule.swift

@@ -112,7 +112,7 @@ private extension StructDeclSyntax {
             self.initializerParameters($0.parameterList, match: varDecls) &&
             (($0.parameterList.isEmpty && hasNoSideEffects($0.body)) ||
              initializerBody($0.body, matches: varDecls)) &&
-            initializerModifiers($0.modifiers, match: varDecls) && !$0.isInlinable
+            initializerModifiers($0.modifiers, match: varDecls) && $0.attributes.isEmpty
         }
     }
 
@@ -236,9 +236,7 @@ private extension InitializerDeclSyntax {
     var hasThrowsOrRethrowsKeyword: Bool {
         signature.effectSpecifiers?.throwsClause?.throwsSpecifier != nil
     }
-    var isInlinable: Bool {
-        attributes.contains(attributeNamed: "inlinable")
-    }
+
     var parameterList: FunctionParameterListSyntax {
         signature.parameterClause.parameters
     }

Source/SwiftLintBuiltInRules/Rules/Idiomatic/UnneededSynthesizedInitializerRuleExamples.swift

@@ -244,6 +244,12 @@ enum UnneededSynthesizedInitializerRuleExamples {
             init() {}
         }
         """, excludeFromDocumentation: true),
+        Example("""
+        struct Foo {
+            @available(*, unavailable)
+            init() {}
+        }
+        """),
     ]
 
     static let triggering = [

Source/SwiftLintBuiltInRules/Rules/Lint/ArrayInitRule.swift

@@ -1,7 +1,7 @@
 import SwiftSyntax
 
 @SwiftSyntaxRule
-struct ArrayInitRule: OptInRule {
+struct ArrayInitRule: OptInRule, @unchecked Sendable {
     var configuration = SeverityConfiguration<Self>(.warning)
 
     static let description = RuleDescription(

Source/SwiftLintBuiltInRules/Rules/Lint/UnneededOverrideRule.swift

@@ -89,8 +89,8 @@ private extension OverridableDecl {
             return false
         }
 
-        // Assume having @available changes behavior.
-        if attributes.contains(attributeNamed: "available") {
+        // Assume attributes change behavior.
+        guard attributes.isEmpty else {
             return false
         }
 

Source/SwiftLintBuiltInRules/Rules/Lint/UnneededOverrideRuleExamples.swift

@@ -17,6 +17,13 @@ struct UnneededOverrideRuleExamples {
         }
         """),
         Example("""
+        class Foo {
+            @objc override func bar() {
+                super.bar()
+            }
+        }
+        """),
+        Example("""
         class Foo {
             override func bar() {
                 super.bar()

Source/SwiftLintBuiltInRules/Rules/Lint/UnusedDeclarationRule.swift

@@ -121,6 +121,20 @@ private extension SwiftLintFile {
                      editorOpen: SourceKittenDictionary,
                      compilerArguments: [String],
                      configuration: UnusedDeclarationConfiguration) -> UnusedDeclarationRule.DeclaredUSR? {
+        // Skip initializers, deinit, enum cases and subscripts since we can't reliably detect if they're used.
+        let declarationKindsToSkip: Set<SwiftDeclarationKind> = [
+            .enumelement,
+            .extensionProtocol,
+            .extension,
+            .extensionEnum,
+            .extensionClass,
+            .extensionStruct,
+            .functionConstructor,
+            .functionDestructor,
+            .functionSubscript,
+            .genericTypeParam,
+        ]
+
         guard let stringKind = indexEntity.kind,
               stringKind.starts(with: "source.lang.swift.decl."),
               !stringKind.contains(".accessor."),
@@ -196,6 +210,14 @@ private extension SwiftLintFile {
     }
 
     private func shouldIgnoreEntity(_ indexEntity: SourceKittenDictionary, relatedUSRsToSkip: Set<String>) -> Bool {
+        let declarationAttributesToSkip: Set<SwiftDeclarationAttributeKind> = [
+            .ibaction,
+            .main,
+            .nsApplicationMain,
+            .override,
+            .uiApplicationMain,
+        ]
+
         if indexEntity.shouldSkipIndexEntityToWorkAroundSR11985() ||
             indexEntity.shouldSkipRelated(relatedUSRsToSkip: relatedUSRsToSkip) ||
             indexEntity.enclosedSwiftAttributes.contains(where: declarationAttributesToSkip.contains) ||
@@ -321,25 +343,3 @@ private extension SourceKittenDictionary {
         return nil
     }
 }
-
-// Skip initializers, deinit, enum cases and subscripts since we can't reliably detect if they're used.
-private let declarationKindsToSkip: Set<SwiftDeclarationKind> = [
-    .enumelement,
-    .extensionProtocol,
-    .extension,
-    .extensionEnum,
-    .extensionClass,
-    .extensionStruct,
-    .functionConstructor,
-    .functionDestructor,
-    .functionSubscript,
-    .genericTypeParam,
-]
-
-private let declarationAttributesToSkip: Set<SwiftDeclarationAttributeKind> = [
-    .ibaction,
-    .main,
-    .nsApplicationMain,
-    .override,
-    .uiApplicationMain,
-]

Source/SwiftLintBuiltInRules/Rules/RuleConfigurations/NoEmptyBlockConfiguration.swift

@@ -9,6 +9,7 @@ struct NoEmptyBlockConfiguration: SeverityBasedRuleConfiguration {
         case functionBodies = "function_bodies"
         case initializerBodies = "initializer_bodies"
         case statementBlocks = "statement_blocks"
+        case closureBlocks = "closure_blocks"
 
         static let all = Set(allCases)
     }