Merge branch 'master' into fixture_validation

# Conflicts:
#	Tests/MockoloTestCase.swift
#	Tests/TestActor/FixtureGlobalActor.swift
#	Tests/TestArgumentsHistory/FixtureArgumentsHistory.swift
#	Tests/TestEmojis/FixtureEmojis.swift
#	Tests/TestFuncs/TestBasicFuncs/FixtureNonSimpleFuncs.swift
#	Tests/TestFuncs/TestFuncAsync/FixtureFuncAsync.swift
#	Tests/TestOverloads/FixtureInheritance.swift
#	Tests/TestPATs/FixturePAT.swift

Sources/MockoloFramework/Parsers/SwiftSyntaxExtensions.swift

@@ -14,6 +14,7 @@
 //  limitations under the License.
 //
 
+import Algorithms
 import Foundation
 import SwiftSyntax
 import SwiftParser
@@ -259,7 +260,7 @@ extension IfConfigDeclSyntax {
             in: subModels,
             exclude: [:],
             fullnames: []
-        ).map({ $0 })
+        ).sorted(path: \.value.offset, fallback: \.key)
 
         let macroModel = IfMacroModel(name: name, offset: self.offset, entities: uniqueSubModels)
         return (macroModel, attrDesc, hasInit)
@@ -300,7 +301,12 @@ extension ProtocolDeclSyntax: EntityNode {
     }
 
     func annotationMetadata(with annotation: String) -> AnnotationMetadata? {
-        return leadingTrivia.annotationMetadata(with: annotation)
+        let trivias = [
+            leadingTrivia,
+            protocolKeyword.leadingTrivia,
+            modifiers.leadingTrivia,
+        ] + attributes.map(\.leadingTrivia)
+        return trivias.firstNonNil { $0.annotationMetadata(with: annotation) }
     }
 
     var hasBlankInit: Bool {
@@ -358,7 +364,12 @@ extension ClassDeclSyntax: EntityNode {
     }
 
     func annotationMetadata(with annotation: String) -> AnnotationMetadata? {
-        return leadingTrivia.annotationMetadata(with: annotation)
+        let trivias = [
+            leadingTrivia,
+            classKeyword.leadingTrivia,
+            modifiers.leadingTrivia,
+        ] + attributes.map(\.leadingTrivia)
+        return trivias.firstNonNil { $0.annotationMetadata(with: annotation) }
     }
 
     func subContainer(metadata: AnnotationMetadata?, declKind: NominalTypeDeclKind, path: String?, isProcessed: Bool) -> EntityNodeSubContainer {
@@ -863,9 +874,9 @@ extension Trivia {
     // See metadata(with:, in:) for more info on the annotation arguments.
     func annotationMetadata(with annotation: String) -> AnnotationMetadata? {
         guard !annotation.isEmpty else { return nil }
+
         var ret: AnnotationMetadata?
-        for i in 0..<count {
-            let trivia = self[i]
+        for trivia in self {
             switch trivia {
             case .docLineComment(let val):
                 ret = metadata(with: annotation, in: val)

Tests/TestActor/ActorTests.swift

@@ -13,4 +13,10 @@ final class ActorTests: MockoloTestCase {
         verify(srcContent: globalActorProtocol._source,
                dstContent: globalActorProtocol.expected._source)
     }
+
+    func testAttributeAboveAnnotationComment() {
+        verify(srcContent: attributeAboveAnnotationComment._source,
+               dstContent: attributeAboveAnnotationComment.expected._source,
+               declType: .all)
+    }
 }

Tests/TestActor/FixtureActor.swift

@@ -58,3 +58,37 @@
         }
     }
 }
+
+@Fixture enum attributeAboveAnnotationComment {
+    @MainActor
+    /// @mockable
+    protocol P0 {
+    }
+
+    @MainActor
+    /// @mockable
+    @available(iOS 18.0, *) protocol P1 {
+    }
+
+    @MainActor
+    /// @mockable
+    public class C0 {
+        init() {}
+    }
+
+    @Fixture enum expected {
+        class P0Mock: P0 {
+            init() { }
+        }
+
+        class P1Mock: P1 {
+            init() { }
+        }
+
+        public class C0Mock: C0 {
+            override init() {
+                super.init()
+            }
+        }
+    }
+}