Update SwiftSyntax (#5198)

realm · Sep 14, 2023 · 35a7881 · 35a7881
1 parent 2df6516
commit 35a7881
Show file tree

Hide file tree

Showing 35 changed files with 94 additions and 146 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -41,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-syntax.git",
       "state" : {
-        "revision" : "e42bece52df2496d60b1b2a762fee9ffde7fc205",
-        "version" : "509.0.0-swift-DEVELOPMENT-SNAPSHOT-2023-08-07-a"
+        "revision" : "057bdfb4632cc758973d46efaf98e43d07ee4bdb",
+        "version" : "509.0.0-swift-DEVELOPMENT-SNAPSHOT-2023-08-28-a"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -11,7 +11,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.2.1")),
-        .package(url: "https://github.com/apple/swift-syntax.git", exact: "509.0.0-swift-DEVELOPMENT-SNAPSHOT-2023-08-07-a"),
+        .package(url: "https://github.com/apple/swift-syntax.git", exact: "509.0.0-swift-DEVELOPMENT-SNAPSHOT-2023-08-28-a"),
         .package(url: "https://github.com/jpsim/SourceKitten.git", .upToNextMinor(from: "0.34.1")),
         .package(url: "https://github.com/jpsim/Yams.git", from: "5.0.6"),
         .package(url: "https://github.com/scottrhoyt/SwiftyTextTable.git", from: "0.9.0"),

diff --git a/Source/SwiftLintBuiltInRules/Rules/Idiomatic/ConvenienceTypeRule.swift b/Source/SwiftLintBuiltInRules/Rules/Idiomatic/ConvenienceTypeRule.swift
@@ -148,8 +148,8 @@ private extension ConvenienceTypeRule {
                                   attributes: AttributeListSyntax?,
                                   members: MemberBlockSyntax) -> Bool {
             guard inheritance.isNilOrEmpty,
-                  !attributes.containsObjcMembers,
-                  !attributes.containsObjc,
+                  attributes?.containsObjcMembers == false,
+                  attributes?.containsObjc == false,
                   !members.members.isEmpty else {
                 return false
             }
@@ -202,23 +202,17 @@ private extension InheritanceClauseSyntax? {
     }
 }
 
-private extension AttributeListSyntax? {
+private extension AttributeListSyntax {
     var containsObjcMembers: Bool {
         contains(attributeNamed: "objcMembers")
     }
 
     var containsObjc: Bool {
         contains(attributeNamed: "objc")
     }
-}
 
-private extension AttributeListSyntax? {
     var hasUnavailableAttribute: Bool {
-        guard let attrs = self else {
-            return false
-        }
-
-        return attrs.contains { elem in
+        contains { elem in
             guard let attr = elem.as(AttributeSyntax.self),
                   let arguments = attr.arguments?.as(AvailabilityArgumentListSyntax.self) else {
                 return false

diff --git a/Source/SwiftLintBuiltInRules/Rules/Idiomatic/NoExtensionAccessModifierRule.swift b/Source/SwiftLintBuiltInRules/Rules/Idiomatic/NoExtensionAccessModifierRule.swift
@@ -31,7 +31,8 @@ private extension NoExtensionAccessModifierRule {
         override var skippableDeclarations: [DeclSyntaxProtocol.Type] { .all }
 
         override func visitPost(_ node: ExtensionDeclSyntax) {
-            if let modifiers = node.modifiers, modifiers.isNotEmpty {
+            let modifiers = node.modifiers
+            if modifiers.isNotEmpty {
                 violations.append(modifiers.positionAfterSkippingLeadingTrivia)
             }
         }

diff --git a/Source/SwiftLintBuiltInRules/Rules/Idiomatic/PrivateOverFilePrivateRule.swift b/Source/SwiftLintBuiltInRules/Rules/Idiomatic/PrivateOverFilePrivateRule.swift
@@ -154,7 +154,7 @@ private extension PrivateOverFilePrivateRule {
             }
 
             correctionPositions.append(modifier.positionAfterSkippingLeadingTrivia)
-            let newNode = node.with(\.modifiers, node.modifiers?.replacing(fileprivateModifierIndex: modifierIndex))
+            let newNode = node.with(\.modifiers, node.modifiers.replacing(fileprivateModifierIndex: modifierIndex))
             return DeclSyntax(newNode)
         }
 
@@ -166,7 +166,7 @@ private extension PrivateOverFilePrivateRule {
             }
 
             correctionPositions.append(modifier.positionAfterSkippingLeadingTrivia)
-            let newNode = node.with(\.modifiers, node.modifiers?.replacing(fileprivateModifierIndex: modifierIndex))
+            let newNode = node.with(\.modifiers, node.modifiers.replacing(fileprivateModifierIndex: modifierIndex))
             return DeclSyntax(newNode)
         }
 
@@ -178,7 +178,7 @@ private extension PrivateOverFilePrivateRule {
             }
 
             correctionPositions.append(modifier.positionAfterSkippingLeadingTrivia)
-            let newNode = node.with(\.modifiers, node.modifiers?.replacing(fileprivateModifierIndex: modifierIndex))
+            let newNode = node.with(\.modifiers, node.modifiers.replacing(fileprivateModifierIndex: modifierIndex))
             return DeclSyntax(newNode)
         }
 
@@ -190,7 +190,7 @@ private extension PrivateOverFilePrivateRule {
             }
 
             correctionPositions.append(modifier.positionAfterSkippingLeadingTrivia)
-            let newNode = node.with(\.modifiers, node.modifiers?.replacing(fileprivateModifierIndex: modifierIndex))
+            let newNode = node.with(\.modifiers, node.modifiers.replacing(fileprivateModifierIndex: modifierIndex))
             return DeclSyntax(newNode)
         }
 
@@ -202,7 +202,7 @@ private extension PrivateOverFilePrivateRule {
             }
 
             correctionPositions.append(modifier.positionAfterSkippingLeadingTrivia)
-            let newNode = node.with(\.modifiers, node.modifiers?.replacing(fileprivateModifierIndex: modifierIndex))
+            let newNode = node.with(\.modifiers, node.modifiers.replacing(fileprivateModifierIndex: modifierIndex))
             return DeclSyntax(newNode)
         }
 
@@ -214,7 +214,7 @@ private extension PrivateOverFilePrivateRule {
             }
 
             correctionPositions.append(modifier.positionAfterSkippingLeadingTrivia)
-            let newNode = node.with(\.modifiers, node.modifiers?.replacing(fileprivateModifierIndex: modifierIndex))
+            let newNode = node.with(\.modifiers, node.modifiers.replacing(fileprivateModifierIndex: modifierIndex))
             return DeclSyntax(newNode)
         }
 
@@ -226,7 +226,7 @@ private extension PrivateOverFilePrivateRule {
             }
 
             correctionPositions.append(modifier.positionAfterSkippingLeadingTrivia)
-            let newNode = node.with(\.modifiers, node.modifiers?.replacing(fileprivateModifierIndex: modifierIndex))
+            let newNode = node.with(\.modifiers, node.modifiers.replacing(fileprivateModifierIndex: modifierIndex))
             return DeclSyntax(newNode)
         }
 
@@ -238,24 +238,22 @@ private extension PrivateOverFilePrivateRule {
             }
 
             correctionPositions.append(modifier.positionAfterSkippingLeadingTrivia)
-            let newNode = node.with(\.modifiers, node.modifiers?.replacing(fileprivateModifierIndex: modifierIndex))
+            let newNode = node.with(\.modifiers, node.modifiers.replacing(fileprivateModifierIndex: modifierIndex))
             return DeclSyntax(newNode)
         }
     }
 }
 
-private extension DeclModifierListSyntax? {
+private extension DeclModifierListSyntax {
     var fileprivateModifierIndex: DeclModifierListSyntax.Index? {
-        self?.firstIndex(where: { $0.name.tokenKind == .keyword(.fileprivate) })
+        firstIndex(where: { $0.name.tokenKind == .keyword(.fileprivate) })
     }
 
     var fileprivateModifier: DeclModifierSyntax? {
-        fileprivateModifierIndex.flatMap { self?[$0] }
+        fileprivateModifierIndex.flatMap { self[$0] }
     }
-}
 
-private extension DeclModifierListSyntax {
-    func replacing(fileprivateModifierIndex: DeclModifierListSyntax.Index) -> DeclModifierListSyntax? {
+    func replacing(fileprivateModifierIndex: DeclModifierListSyntax.Index) -> DeclModifierListSyntax {
         let fileprivateModifier = self[fileprivateModifierIndex]
         return with(
             \.[fileprivateModifierIndex],

diff --git a/Source/SwiftLintBuiltInRules/Rules/Idiomatic/RedundantObjcAttributeRule.swift b/Source/SwiftLintBuiltInRules/Rules/Idiomatic/RedundantObjcAttributeRule.swift
@@ -92,9 +92,9 @@ private extension AttributeListSyntax {
         } else if parent?.isFunctionOrStoredProperty == true,
                   let parentClassDecl = parent?.parent?.parent?.parent?.parent?.as(ClassDeclSyntax.self),
                   parentClassDecl.attributes.contains(attributeNamed: "objcMembers") {
-            return parent?.functionOrVariableModifiers.isPrivateOrFileprivate == true ? nil : objcAttribute
+            return parent?.functionOrVariableModifiers?.isPrivateOrFileprivate == true ? nil : objcAttribute
         } else if let parentExtensionDecl = parent?.parent?.parent?.parent?.parent?.as(ExtensionDeclSyntax.self),
-                  parentExtensionDecl.attributes?.objCAttribute != nil {
+                  parentExtensionDecl.attributes.objCAttribute != nil {
             return objcAttribute
         } else {
             return nil

diff --git a/Source/SwiftLintBuiltInRules/Rules/Idiomatic/RedundantSetAccessControlRule.swift b/Source/SwiftLintBuiltInRules/Rules/Idiomatic/RedundantSetAccessControlRule.swift
@@ -70,7 +70,8 @@ private extension RedundantSetAccessControlRule {
         }
 
         override func visitPost(_ node: VariableDeclSyntax) {
-            guard let modifiers = node.modifiers, let setAccessor = modifiers.setAccessor else {
+            let modifiers = node.modifiers
+            guard let setAccessor = modifiers.setAccessor else {
                 return
             }
 
@@ -122,21 +123,7 @@ private extension SyntaxProtocol {
 
 private extension DeclSyntax {
     var modifiers: DeclModifierListSyntax? {
-        if let decl = self.as(ClassDeclSyntax.self) {
-            return decl.modifiers ?? DeclModifierListSyntax([])
-        } else if let decl = self.as(ActorDeclSyntax.self) {
-            return decl.modifiers ?? DeclModifierListSyntax([])
-        } else if let decl = self.as(StructDeclSyntax.self) {
-            return decl.modifiers ?? DeclModifierListSyntax([])
-        } else if let decl = self.as(ProtocolDeclSyntax.self) {
-            return decl.modifiers ?? DeclModifierListSyntax([])
-        } else if let decl = self.as(ExtensionDeclSyntax.self) {
-            return decl.modifiers ?? DeclModifierListSyntax([])
-        } else if let decl = self.as(EnumDeclSyntax.self) {
-            return decl.modifiers ?? DeclModifierListSyntax([])
-        }
-
-        return nil
+        self.asProtocol(WithModifiersSyntax.self)?.modifiers
     }
 }
 

diff --git a/Source/SwiftLintBuiltInRules/Rules/Idiomatic/TypeNameRule.swift b/Source/SwiftLintBuiltInRules/Rules/Idiomatic/TypeNameRule.swift
@@ -81,7 +81,7 @@ private extension TypeNameRule {
         }
 
         private func violation(identifier: TokenSyntax,
-                               modifiers: DeclModifierListSyntax?,
+                               modifiers: DeclModifierListSyntax,
                                inheritedTypes: InheritedTypeListSyntax?) -> ReasonedRuleViolation? {
             let originalName = identifier.text
             let nameConfiguration = configuration.nameConfiguration
@@ -135,7 +135,7 @@ private extension String {
         return substring(from: 0, length: lastPreviewsIndex)
     }
 
-    func strippingLeadingUnderscoreIfPrivate(modifiers: DeclModifierListSyntax?) -> String {
+    func strippingLeadingUnderscoreIfPrivate(modifiers: DeclModifierListSyntax) -> String {
         if first == "_", modifiers.isPrivateOrFileprivate {
             return String(self[index(after: startIndex)...])
         }

diff --git a/Source/SwiftLintBuiltInRules/Rules/Idiomatic/UnavailableFunctionRule.swift b/Source/SwiftLintBuiltInRules/Rules/Idiomatic/UnavailableFunctionRule.swift
@@ -109,13 +109,9 @@ private extension FunctionDeclSyntax {
     }
 }
 
-private extension AttributeListSyntax? {
+private extension AttributeListSyntax {
     var hasUnavailableAttribute: Bool {
-        guard let attrs = self else {
-            return false
-        }
-
-        return attrs.contains { elem in
+        contains { elem in
             guard let attr = elem.as(AttributeSyntax.self),
                   let arguments = attr.arguments?.as(AvailabilityArgumentListSyntax.self) else {
                 return false

diff --git a/Source/SwiftLintBuiltInRules/Rules/Idiomatic/UnneededSynthesizedInitializerRule.swift b/Source/SwiftLintBuiltInRules/Rules/Idiomatic/UnneededSynthesizedInitializerRule.swift
@@ -108,8 +108,7 @@ private extension StructDeclSyntax {
             let member = memberItem.decl
             // Collect all stored variables into a list.
             if let varDecl = member.as(VariableDeclSyntax.self) {
-                let modifiers = varDecl.modifiers
-                if modifiers == nil || !modifiers.isStatic {
+                if !varDecl.modifiers.isStatic {
                     storedProperties.append(varDecl)
                 }
             } else if let initDecl = member.as(InitializerDeclSyntax.self),
@@ -301,9 +300,7 @@ private enum AccessLevel {
 private func synthesizedInitializerAccessLevel(using storedProperties: [VariableDeclSyntax]) -> AccessLevel {
     var hasFileprivate = false
     for property in storedProperties {
-        guard let modifiers = property.modifiers else {
-            continue
-        }
+        let modifiers = property.modifiers
 
         // Private takes precedence, so finding 1 private property defines the access level.
         if modifiers.contains(where: { $0.name.tokenKind == .keyword(.private) && $0.detail == nil }) {

diff --git a/Source/SwiftLintBuiltInRules/Rules/Idiomatic/UntypedErrorInCatchRule.swift b/Source/SwiftLintBuiltInRules/Rules/Idiomatic/UntypedErrorInCatchRule.swift
@@ -121,11 +121,9 @@ private extension CatchItemSyntax {
 
 private final class UntypedErrorInCatchRuleVisitor: ViolationsSyntaxVisitor {
     override func visitPost(_ node: CatchClauseSyntax) {
-        guard let item = node.catchItems?.onlyElement,
-              item.isIdentifierPattern else {
+        guard let item = node.catchItems.onlyElement, item.isIdentifierPattern else {
             return
         }
-
         violations.append(node.catchKeyword.positionAfterSkippingLeadingTrivia)
     }
 }
@@ -142,7 +140,7 @@ private final class UntypedErrorInCatchRuleRewriter: SyntaxRewriter, ViolationsS
 
     override func visit(_ node: CatchClauseSyntax) -> CatchClauseSyntax {
         guard
-            let item = node.catchItems?.onlyElement,
+            let item = node.catchItems.onlyElement,
             item.isIdentifierPattern,
             !node.isContainedIn(regions: disabledRegions, locationConverter: locationConverter)
         else {

diff --git a/Source/SwiftLintBuiltInRules/Rules/Idiomatic/UnusedEnumeratedRule.swift b/Source/SwiftLintBuiltInRules/Rules/Idiomatic/UnusedEnumeratedRule.swift
@@ -75,9 +75,9 @@ private extension FunctionCallExprSyntax {
     }
 
     var hasNoArguments: Bool {
-        trailingClosure == nil &&
-            (additionalTrailingClosures?.isEmpty ?? true) &&
-        arguments.isEmpty
+           trailingClosure == nil
+        && additionalTrailingClosures.isEmpty
+        && arguments.isEmpty
     }
 }
 

diff --git a/Source/SwiftLintBuiltInRules/Rules/Lint/DiscardedNotificationCenterObserverRule.swift b/Source/SwiftLintBuiltInRules/Rules/Lint/DiscardedNotificationCenterObserverRule.swift
@@ -99,7 +99,7 @@ private extension DiscardedNotificationCenterObserverRule {
     }
 }
 
-private extension AttributeListSyntax? {
+private extension AttributeListSyntax {
     var hasDiscardableResultAttribute: Bool {
         contains(attributeNamed: "discardableResult")
     }

diff --git a/Source/SwiftLintBuiltInRules/Rules/Lint/DynamicInlineRule.swift b/Source/SwiftLintBuiltInRules/Rules/Lint/DynamicInlineRule.swift
@@ -30,15 +30,10 @@ struct DynamicInlineRule: SwiftSyntaxRule, ConfigurationProviderRule {
 private extension DynamicInlineRule {
     private final class Visitor: ViolationsSyntaxVisitor {
         override func visitPost(_ node: FunctionDeclSyntax) {
-            guard let modifiers = node.modifiers,
-                  let attributes = node.attributes,
-                  modifiers.contains(where: { $0.name.text == "dynamic" }),
-                  attributes.contains(where: { $0.as(AttributeSyntax.self)?.isInlineAlways == true })
-            else {
-                return
+            if node.modifiers.contains(where: { $0.name.text == "dynamic" }),
+               node.attributes.contains(where: { $0.as(AttributeSyntax.self)?.isInlineAlways == true }) {
+                violations.append(node.funcKeyword.positionAfterSkippingLeadingTrivia)
             }
-
-            violations.append(node.funcKeyword.positionAfterSkippingLeadingTrivia)
         }
     }
 }

diff --git a/Source/SwiftLintBuiltInRules/Rules/Lint/LowerACLThanParentRule.swift b/Source/SwiftLintBuiltInRules/Rules/Lint/LowerACLThanParentRule.swift
@@ -148,19 +148,19 @@ private extension DeclModifierSyntax {
         switch name.tokenKind {
         case .keyword(.internal)
             where nearestNominalParent.modifiers.isPrivate ||
-                nearestNominalParent.modifiers.isFileprivate:
+                  nearestNominalParent.modifiers?.isFileprivate == true:
             return true
         case .keyword(.internal)
             where !nearestNominalParent.modifiers.containsACLModifier:
             guard let nominalExtension = nearestNominalParent.nearestNominalExtensionDeclParent() else {
                 return false
             }
             return nominalExtension.modifiers.isPrivate ||
-                nominalExtension.modifiers.isFileprivate
+                   nominalExtension.modifiers?.isFileprivate == true
         case .keyword(.public)
             where nearestNominalParent.modifiers.isPrivate ||
-                nearestNominalParent.modifiers.isFileprivate ||
-                nearestNominalParent.modifiers.isInternal:
+                  nearestNominalParent.modifiers?.isFileprivate == true ||
+                  nearestNominalParent.modifiers.isInternal:
             return true
         case .keyword(.public)
             where !nearestNominalParent.modifiers.containsACLModifier:

diff --git a/Source/SwiftLintBuiltInRules/Rules/Lint/NSObjectPreferIsEqualRule.swift b/Source/SwiftLintBuiltInRules/Rules/Lint/NSObjectPreferIsEqualRule.swift
@@ -81,7 +81,7 @@ private extension SyntaxProtocol {
     }
 }
 
-private extension AttributeListSyntax? {
+private extension AttributeListSyntax {
     var isObjc: Bool {
         contains(attributeNamed: "objc") || contains(attributeNamed: "objcMembers")
     }

diff --git a/Source/SwiftLintBuiltInRules/Rules/Lint/PrivateOutletRule.swift b/Source/SwiftLintBuiltInRules/Rules/Lint/PrivateOutletRule.swift
@@ -94,12 +94,12 @@ private extension PrivateOutletRule {
             guard
                 let decl = node.decl.as(VariableDeclSyntax.self),
                 decl.attributes.contains(attributeNamed: "IBOutlet"),
-                decl.modifiers?.isPrivateOrFilePrivate != true
+                !decl.modifiers.isPrivateOrFilePrivate
             else {
                 return
             }
 
-            if allowPrivateSet && decl.modifiers?.isPrivateOrFilePrivateSet == true {
+            if allowPrivateSet && decl.modifiers.isPrivateOrFilePrivateSet {
                 return
             }
 

diff --git a/Source/SwiftLintBuiltInRules/Rules/Lint/PrivateSwiftUIStatePropertyRule.swift b/Source/SwiftLintBuiltInRules/Rules/Lint/PrivateSwiftUIStatePropertyRule.swift
@@ -270,12 +270,10 @@ private extension InheritedTypeListSyntax {
     }
 }
 
-private extension AttributeListSyntax? {
+private extension AttributeListSyntax {
     /// Returns `true` if the attribute's identifier is equal to `State` or `StateObject`
     var hasStateAttribute: Bool {
-        guard let attributes = self else { return false }
-
-        return attributes.contains { attr in
+        contains { attr in
             guard let stateAttr = attr.as(AttributeSyntax.self),
                   let identifier = stateAttr.attributeName.as(IdentifierTypeSyntax.self) else {
                 return false