Revert "Refactored GlobalActorIsolation type (#14)"

This reverts commit 9c7315d.

Author: NSFatalError

Sources/PrincipleMacros/Builders/Declarations/Common/DeclBuilder.swift

@@ -26,13 +26,15 @@ extension DeclBuilder {
         )
     }
 
-    public var inheritedGlobalActorIsolation: GlobalActorIsolation? {
-        if let preferred = settings.preferredGlobalActorIsolation {
-            return preferred
+    public var inheritedGlobalActorIsolation: AttributeSyntax? {
+        let globalActor: AttributeSyntax? = switch settings.globalActorIsolationPreference {
+        case .nonisolated:
+            nil
+        case let .isolated(globalActor):
+            "@\(globalActor)"
+        case .none:
+            basicDeclaration.globalActor?.trimmed
         }
-        if let inferredType = basicDeclaration.globalActor?.attributeName.trimmed {
-            return .isolated(trimmedType: inferredType)
-        }
-        return .nonisolated
+        return globalActor?.withTrailingSpace
     }
 }

Sources/PrincipleMacros/Builders/Declarations/Common/DeclBuilderSettings.swift

@@ -11,14 +11,14 @@ import SwiftSyntax
 public struct DeclBuilderSettings {
 
     public var accessControlLevel: AccessControlLevel
-    public var preferredGlobalActorIsolation: GlobalActorIsolation?
+    public var globalActorIsolationPreference: GlobalActorIsolationPreference?
 
     public init(
         accessControlLevel: AccessControlLevel,
-        preferredGlobalActorIsolation: GlobalActorIsolation? = nil
+        globalActorIsolationPreference: GlobalActorIsolationPreference? = nil
     ) {
         self.accessControlLevel = accessControlLevel
-        self.preferredGlobalActorIsolation = preferredGlobalActorIsolation
+        self.globalActorIsolationPreference = globalActorIsolationPreference
     }
 }
 

Sources/PrincipleMacros/Parameters/ParameterExtractor.swift

@@ -64,9 +64,9 @@ public struct ParameterExtractor {
         return rawString
     }
 
-    public func preferredGlobalActorIsolation(
+    public func globalActorIsolationPreference(
         withLabel label: TokenSyntax?
-    ) throws -> GlobalActorIsolation? {
+    ) throws -> GlobalActorIsolationPreference? {
         guard let expression = expression(withLabel: label) else {
             return nil
         }
@@ -77,8 +77,8 @@ public struct ParameterExtractor {
 
         if let memberAccessExpression = MemberAccessExprSyntax(expression),
            memberAccessExpression.declName.baseName.tokenKind == .keyword(.self),
-           let explicitType = memberAccessExpression.base?.trimmed {
-            return .isolated(trimmedType: "\(explicitType)")
+           let baseType = memberAccessExpression.base {
+            return .isolated("\(baseType)")
         }
 
         throw ParameterExtractionError.unexpectedSyntaxType

Sources/PrincipleMacros/Syntax/Helpers/GlobalActorIsolation.swift

@@ -0,0 +1,15 @@
+//
+//  GlobalActorIsolationPreference.swift
+//  PrincipleMacros
+//
+//  Created by Kamil Strzelecki on 18/08/2025.
+//  Copyright © 2025 Kamil Strzelecki. All rights reserved.
+//
+
+import SwiftSyntax
+
+public enum GlobalActorIsolationPreference: Hashable {
+
+    case nonisolated
+    case isolated(TypeSyntax)
+}

Sources/PrincipleMacros/Syntax/Helpers/GlobalActorIsolationPreference.swift

@@ -46,14 +46,16 @@ extension ParameterExtractorTests {
     func testTrailingClosureExtraction() throws {
         let extractor = try makeExtractor(from: "#MyMacro { _ in }")
         let extracted = try extractor.trailingClosure(withLabel: "operation")
-        #expect(extracted?.description == "{ _ in }")
+        let expected: ExprSyntax = "{ _ in }"
+        #expect(extracted?.description == expected.description)
     }
 
     @Test
     func testTrailingClosureReferenceExtraction() throws {
         let extractor = try makeExtractor(from: "#MyMacro(operation: perform)")
         let extracted = try extractor.trailingClosure(withLabel: "operation")
-        #expect(extracted?.description == "perform")
+        let expected: ExprSyntax = "perform"
+        #expect(extracted?.description == expected.description)
     }
 }
 
@@ -78,16 +80,16 @@ extension ParameterExtractorTests {
 extension ParameterExtractorTests {
 
     @Test
-    func testMissingPreferredGlobalActorExtraction() throws {
+    func testMissingGlobalActorPreferenceExtraction() throws {
         let extractor = try makeExtractor(from: "#MyMacro()")
-        let extracted = try extractor.preferredGlobalActorIsolation(withLabel: "isolation")
+        let extracted = try extractor.globalActorIsolationPreference(withLabel: "isolation")
         #expect(extracted == nil)
     }
 
     @Test
-    func testNonisolatedPreferredGlobalActorExtraction() throws {
+    func testNonisolatedGlobalActorPreferenceExtraction() throws {
         let extractor = try makeExtractor(from: "#MyMacro(isolation: nil)")
-        let extracted = try extractor.preferredGlobalActorIsolation(withLabel: "isolation")
+        let extracted = try extractor.globalActorIsolationPreference(withLabel: "isolation")
         #expect(extracted == .nonisolated)
     }
 
@@ -97,17 +99,23 @@ extension ParameterExtractorTests {
             "SomeType.SomeActor"
         ]
     )
-    func testIsolatedPreferredGlobalActorExtraction(isolation: String) throws {
+    func testIsolatedGlobalActorPreferenceExtraction(isolation: String) throws {
         let extractor = try makeExtractor(from: "#MyMacro(isolation: \(raw: isolation).self)")
-        let extracted = try extractor.preferredGlobalActorIsolation(withLabel: "isolation")
-        #expect(extracted?.attribute?.description == "@\(isolation)")
+        let extracted = try extractor.globalActorIsolationPreference(withLabel: "isolation")
+
+        switch extracted {
+        case let .isolated(globalActor):
+            #expect(globalActor.description == isolation)
+        default:
+            Issue.record()
+        }
     }
 
     @Test
-    func testUnexpectedSyntaxWhenPerformingPreferredGlobalActorExtraction() throws {
+    func testUnexpectedSyntaxWhenPerformingGlobalActorPreferenceExtraction() throws {
         let extractor = try makeExtractor(from: #"#MyMacro(isolation: MainActor.Type)"#)
         #expect(throws: ParameterExtractionError.unexpectedSyntaxType) {
-            try extractor.preferredGlobalActorIsolation(withLabel: "isolation")
+            try extractor.globalActorIsolationPreference(withLabel: "isolation")
         }
     }
 }