Additional MR feedback. Now the rule also can be applied to actors an…

…d the function to check for the view protocol has been extracted to a function
realm · Jul 24, 2023 · e07e398 · e07e398
1 parent e685a95
commit e07e398
Showing 1 changed file with 25 additions and 5 deletions.
diff --git a/Source/SwiftLintBuiltInRules/Rules/Lint/PrivateSwiftUIStatePropertyRule.swift b/Source/SwiftLintBuiltInRules/Rules/Lint/PrivateSwiftUIStatePropertyRule.swift
@@ -48,6 +48,11 @@ struct PrivateSwiftUIStatePropertyRule: SwiftSyntaxRule, OptInRule, Configuratio
                     @State private var isPlaying: Bool = false
                 }
             }
+            """),
+            Example("""
+            actor ContentView: View {
+                @State private var isPlaying: Bool = false
+            }
             """)
         ],
         triggeringExamples: [
@@ -67,6 +72,11 @@ struct PrivateSwiftUIStatePropertyRule: SwiftSyntaxRule, OptInRule, Configuratio
                     @State ↓var isPlaying: Bool = false
                 }
             }
+            """),
+            Example("""
+            actor ContentView: View {
+                @State ↓var isPlaying: Bool = false
+            }
             """)
         ]
     )
@@ -79,25 +89,31 @@ struct PrivateSwiftUIStatePropertyRule: SwiftSyntaxRule, OptInRule, Configuratio
 private extension PrivateSwiftUIStatePropertyRule {
     final class Visitor: ViolationsSyntaxVisitor {
         override var skippableDeclarations: [DeclSyntaxProtocol.Type] {
-            [EnumDeclSyntax.self, FunctionDeclSyntax.self, ProtocolDeclSyntax.self, VariableDeclSyntax.self]
+            [ProtocolDeclSyntax.self]
         }
 
         override func visit(_ node: ClassDeclSyntax) -> SyntaxVisitorContinueKind {
             guard let inheritedTypeCollection = node.inheritanceClause?.inheritedTypeCollection else {
                 return .skipChildren
             }
 
-            let inheritedTypes = inheritedTypeCollection.typeNames
-            return inheritedTypes.contains("View") ? .visitChildren : .skipChildren
+            return inheritedTypeCollection.conformsToViewProtocol ? .visitChildren : .skipChildren
         }
 
         override func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind {
             guard let inheritedTypeCollection = node.inheritanceClause?.inheritedTypeCollection else {
                 return .skipChildren
             }
 
-            let inheritedTypes = inheritedTypeCollection.typeNames
-            return inheritedTypes.contains("View") ? .visitChildren : .skipChildren
+            return inheritedTypeCollection.conformsToViewProtocol ? .visitChildren : .skipChildren
+        }
+
+        override func visit(_ node: ActorDeclSyntax) -> SyntaxVisitorContinueKind {
+            guard let inheritedTypeCollection = node.inheritanceClause?.inheritedTypeCollection else {
+                return .skipChildren
+            }
+
+            return inheritedTypeCollection.conformsToViewProtocol ? .visitChildren : .skipChildren
         }
 
         override func visitPost(_ node: MemberDeclListItemSyntax) {
@@ -118,6 +134,10 @@ private extension InheritedTypeListSyntax {
     var typeNames: [String] {
         compactMap { $0.typeName.as(SimpleTypeIdentifierSyntax.self) }.map(\.name.text)
     }
+
+    var conformsToViewProtocol: Bool {
+        typeNames.contains("View")
+    }
 }
 
 private extension AttributeListSyntax? {