Fixed tests

Author: ikhvorost

Sources/SwiftDocCoverage/DeclProtocol.swift

@@ -49,7 +49,7 @@ public enum AccessLevel: Int {
 
 protocol DeclProtocol: SyntaxProtocol {
   var id: String { get }
-  var modifiers: DeclModifierListSyntax? { get }
+  var modifiers: DeclModifierListSyntax { get }
 }
 
 extension DeclProtocol {
@@ -72,10 +72,6 @@ extension DeclProtocol {
   }
 
   var accessLevel: AccessLevel {
-    guard let modifiers = modifiers else {
-      return .internal
-    }
-    
     for modifier in modifiers {
       let name = modifier.trimmed.description
       switch name {
@@ -98,128 +94,86 @@ extension DeclProtocol {
 // MARK: -
 
 extension TypeAliasDeclSyntax: DeclProtocol {
-  var modifiers: SwiftSyntax.DeclModifierListSyntax? {
-    nil
-  }
-  
   var id: String {
     name.trimmed.description
   }
 }
 
 extension AssociatedTypeDeclSyntax: DeclProtocol {
-  var modifiers: SwiftSyntax.DeclModifierListSyntax? {
-    nil
-  }
-  
   var id: String {
     name.trimmed.description
   }
 }
 
 extension ClassDeclSyntax: DeclProtocol {
-  var modifiers: SwiftSyntax.DeclModifierListSyntax? {
-    nil
+  var id: String {
+    let genericParameter = genericParameterClause?.trimmed.description ?? ""
+    return "\(name.trimmed)\(genericParameter)"
   }
-  
+}
+
+extension ActorDeclSyntax: DeclProtocol {
   var id: String {
     let genericParameter = genericParameterClause?.trimmed.description ?? ""
     return "\(name.trimmed)\(genericParameter)"
   }
 }
 
 extension StructDeclSyntax: DeclProtocol {
-  var modifiers: SwiftSyntax.DeclModifierListSyntax? {
-    nil
-  }
-  
   var id: String {
     let genericParameter = genericParameterClause?.trimmed.description ?? ""
     return "\(name.trimmed)\(genericParameter)"
   }
 }
 
 extension ProtocolDeclSyntax: DeclProtocol {
-  var modifiers: SwiftSyntax.DeclModifierListSyntax? {
-    nil
-  }
-  
   var id: String {
     name.trimmed.description
   }
 }
 
 extension ExtensionDeclSyntax: DeclProtocol {
-  var modifiers: SwiftSyntax.DeclModifierListSyntax? {
-    nil
-  }
-  
   var id: String {
     extendedType.trimmed.description
   }
 }
 
 extension FunctionDeclSyntax: DeclProtocol {
-  var modifiers: SwiftSyntax.DeclModifierListSyntax? {
-    nil
-  }
-  
   var id: String {
     let generic = genericParameterClause?.trimmed.description ?? ""
     return "\(name.trimmed)\(generic)\(signature.trimmed)"
   }
 }
 
 extension InitializerDeclSyntax: DeclProtocol {
-  var modifiers: SwiftSyntax.DeclModifierListSyntax? {
-    nil
-  }
-  
   var id: String {
     let optionalMark = optionalMark?.trimmed.description ?? ""
     let generic = genericParameterClause?.trimmed.description ?? ""
-    let parameters = genericParameterClause?.trimmed ?? .none
-    return "\(initKeyword.trimmed)\(optionalMark)\(generic)\(parameters)"
+    return "\(initKeyword.trimmed)\(optionalMark)\(generic)\(signature.trimmed)"
   }
 }
 
 extension SubscriptDeclSyntax: DeclProtocol {
-  var modifiers: SwiftSyntax.DeclModifierListSyntax? {
-    nil
-  }
-  
   var id: String {
     let generic = genericParameterClause?.trimmed.description ?? ""
     return "\(subscriptKeyword.trimmed)\(generic)\(parameterClause.trimmed) \(returnClause.trimmed)"
   }
 }
 
 extension VariableDeclSyntax: DeclProtocol {
-  var modifiers: SwiftSyntax.DeclModifierListSyntax? {
-    nil
-  }
-  
   var id: String {
     bindings.map { $0.pattern.trimmed.description }.joined(separator: ",")
   }
 }
 
 extension EnumDeclSyntax: DeclProtocol {
-  var modifiers: SwiftSyntax.DeclModifierListSyntax? {
-    nil
-  }
-  
   var id: String {
     let generic = genericParameterClause?.trimmed.description ?? ""
     return "\(name.trimmed.description)\(generic)"
   }
 }
 
 extension EnumCaseDeclSyntax: DeclProtocol {
-  var modifiers: SwiftSyntax.DeclModifierListSyntax? {
-    nil
-  }
-  
   var id: String {
     elements.map {
       let name = $0.name.trimmed.description
@@ -229,21 +183,7 @@ extension EnumCaseDeclSyntax: DeclProtocol {
   }
 }
 
-extension OperatorDeclSyntax: DeclProtocol {
-  var modifiers: SwiftSyntax.DeclModifierListSyntax? {
-    nil
-  }
-  
-  var id: String {
-    "\(operatorKeyword.trimmed) \(name.trimmed)"
-  }
-}
-
 extension PrecedenceGroupDeclSyntax: DeclProtocol {
-  var modifiers: SwiftSyntax.DeclModifierListSyntax? {
-    nil
-  }
-  
   var id: String {
     "\(precedencegroupKeyword.trimmed) \(name.trimmed)"
   }

Sources/SwiftDocCoverage/Declaration.swift

@@ -49,10 +49,7 @@ class Declaration {
   lazy var name: String = {
     let name = decl.id.refine()
     let parent = context.map { $0.id }.joined(separator: ".")
-    
-    return parent.isEmpty
-    ? name
-    : "\(parent).\(name)"
+    return parent.isEmpty ? name : "\(parent).\(name)"
   }()
 
   init(decl: DeclProtocol, context: [DeclProtocol], line: Int, column: Int) {

Sources/SwiftDocCoverage/Source.swift

@@ -78,6 +78,12 @@ fileprivate class Visitor: SyntaxVisitor {
     return .visitChildren
   }
 
+  override func visit(_ node: ActorDeclSyntax) -> SyntaxVisitorContinueKind {
+    append(decl: node)
+    context.append(node)
+    return .visitChildren
+  }
+  
   override func visit(_ node: StructDeclSyntax) -> SyntaxVisitorContinueKind {
     append(decl: node)
     context.append(node)
@@ -132,11 +138,6 @@ fileprivate class Visitor: SyntaxVisitor {
     return .skipChildren
   }
 
-  override func visit(_ node: OperatorDeclSyntax) -> SyntaxVisitorContinueKind {
-    append(decl: node)
-    return .skipChildren
-  }
-  
   override func visit(_ node: PrecedenceGroupDeclSyntax) -> SyntaxVisitorContinueKind {
     append(decl: node)
     return .skipChildren
@@ -149,6 +150,11 @@ fileprivate class Visitor: SyntaxVisitor {
     assert(decl is ClassDeclSyntax)
   }
 
+  override func visitPost(_ node: ActorDeclSyntax) {
+    let decl = context.popLast()
+    assert(decl is ActorDeclSyntax)
+  }
+  
   override func visitPost(_ node: EnumDeclSyntax) {
     let decl = context.popLast()
     assert(decl is EnumDeclSyntax)

Sources/swift-doc-coverage/main.swift

@@ -71,9 +71,7 @@ struct SwiftDocCoverage: ParsableCommand {
       out = try FileOutput(path: path)
     }
 
-    let coverage = try Coverage(paths: inputs,
-                                minAccessLevel: minimumAccessLevel.accessLevel,
-                                output: out)
+    let coverage = try Coverage(paths: inputs, minAccessLevel: minimumAccessLevel.accessLevel, output: out)
 
     switch report {
       case .statistics: