Refactored GlobalActorIsolation type (#15)

Author: NSFatalError

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

@@ -20,19 +20,26 @@ extension DeclBuilder {
 
     public var inheritedAccessControlLevel: TokenSyntax? {
         let settings = settings.accessControlLevel
-        return basicDeclaration.accessControlLevel(
+        return basicDeclaration.inlinableAccessControlLevel(
             inheritedBy: settings.inheritingDeclaration,
             maxAllowed: settings.maxAllowed
         )
     }
+}
+
+extension DeclBuilder {
 
     public var inheritedGlobalActorIsolation: GlobalActorIsolation? {
-        if let preferred = settings.preferredGlobalActorIsolation {
-            return preferred
+        if let explicit = settings.explicitGlobalActorIsolation {
+            return explicit
         }
-        if let inferredType = basicDeclaration.globalActor?.attributeName.trimmed {
-            return .isolated(trimmedType: inferredType)
+        if let inherited = basicDeclaration.globalActor?.attributeName {
+            return .isolated(trimmedType: inherited.trimmed)
         }
         return .nonisolated
     }
+
+    public var inheritedGlobalActorAttribute: AttributeSyntax? {
+        inheritedGlobalActorIsolation?.inlinableAttribute
+    }
 }

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 explicitGlobalActorIsolation: GlobalActorIsolation?
 
     public init(
         accessControlLevel: AccessControlLevel,
-        preferredGlobalActorIsolation: GlobalActorIsolation? = nil
+        explicitGlobalActorIsolation: GlobalActorIsolation? = nil
     ) {
         self.accessControlLevel = accessControlLevel
-        self.preferredGlobalActorIsolation = preferredGlobalActorIsolation
+        self.explicitGlobalActorIsolation = explicitGlobalActorIsolation
     }
 }
 

Sources/PrincipleMacros/Builders/Declarations/Types/TypeDeclBuilder.swift

@@ -22,18 +22,18 @@ extension TypeDeclBuilder {
 
 extension TypeDeclBuilder {
 
-    public var trimmedTypeName: TypeSyntax {
+    public var trimmedType: TypeSyntax {
         switch TypeDeclBuilderContext.current {
-        case let .extension(extendedType):
-            extendedType.trimmed
+        case let .extension(trimmedType):
+            trimmedType
         case .declaration:
             "\(typeDeclaration.name.trimmed)"
         }
     }
 
     public func buildExtension(of extendedType: some TypeSyntaxProtocol) throws -> MemberBlockSyntax {
         try TypeDeclBuilderContext.$current.withValue(
-            .extension(TypeSyntax(extendedType)),
+            .extension(trimmedType: TypeSyntax(extendedType.trimmed)),
             operation: {
                 try MemberBlockSyntax(
                     members: MemberBlockItemListSyntax(

Sources/PrincipleMacros/Builders/Declarations/Types/TypeDeclBuilderContext.swift

@@ -11,7 +11,7 @@ import SwiftSyntax
 internal enum TypeDeclBuilderContext {
 
     case declaration
-    case `extension`(TypeSyntax)
+    case `extension`(trimmedType: TypeSyntax)
 }
 
 extension TypeDeclBuilderContext {

Sources/PrincipleMacros/Syntax/Extensions/WithModifiersSyntax.swift

@@ -43,7 +43,7 @@ extension WithModifiersSyntax {
 
 extension WithModifiersSyntax {
 
-    public func accessControlLevel(
+    public func inlinableAccessControlLevel(
         inheritedBy inheritingDeclaration: InheritingDeclaration,
         maxAllowed: Keyword
     ) -> TokenSyntax? {

Sources/PrincipleMacros/Syntax/Helpers/GlobalActorIsolation.swift

@@ -15,19 +15,18 @@ public enum GlobalActorIsolation: Hashable {
 
     public var trimmedType: TypeSyntax? {
         switch self {
-        case let .isolated(type):
-            type
+        case let .isolated(trimmedType):
+            trimmedType
         case .nonisolated:
             nil
         }
     }
 
-    public var trimmedAttribute: AttributeSyntax? {
+    public var inlinableAttribute: AttributeSyntax? {
         guard let trimmedType else {
             return nil
         }
-        return AttributeSyntax(
-            attributeName: trimmedType
-        )
+        let attribute = AttributeSyntax(attributeName: trimmedType)
+        return attribute.withTrailingSpace
     }
 }

Tests/PrincipleMacrosTests/Parameters/ParameterExtractorTests.swift

@@ -100,7 +100,7 @@ extension ParameterExtractorTests {
     func testIsolatedPreferredGlobalActorExtraction(isolation: String) throws {
         let extractor = try makeExtractor(from: "#MyMacro(isolation: \(raw: isolation).self)")
         let extracted = try extractor.preferredGlobalActorIsolation(withLabel: "isolation")
-        #expect(extracted?.trimmedAttribute?.description == "@\(isolation)")
+        #expect(extracted?.trimmedType?.description == isolation)
     }
 
     @Test