[NFC] [ASTGen] Refactor attribute attachment

Create a method that is used to attach attributes to a decl instead of assigning them directly. This is a convenient place to add logic which processes attributes after the decl they’re attached to has been converted to AST.

Author: beccadax

lib/ASTGen/Sources/ASTGen/DeclAttrs.swift

@@ -22,6 +22,10 @@ extension ASTGenVisitor {
     var attributes: BridgedDeclAttributes
     var staticSpelling: BridgedStaticSpelling
     var staticLoc: BridgedSourceLoc
+
+    func attach(to decl: BridgedDecl) {
+      decl.attrs = attributes
+    }
   }
 
   func generateDeclAttributes(_ node: some WithAttributesSyntax & WithModifiersSyntax, allowStatic: Bool) -> DeclAttributesResult {

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -96,7 +96,7 @@ extension ASTGenVisitor {
       underlyingType: self.generate(type: node.initializer.value),
       genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
     return decl
   }
 
@@ -118,7 +118,7 @@ extension ASTGenVisitor {
         end: node.memberBlock.rightBrace
       )
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     self.withDeclContext(decl.asDeclContext) {
       decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members))
@@ -145,7 +145,7 @@ extension ASTGenVisitor {
         end: node.memberBlock.rightBrace
       )
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     self.withDeclContext(decl.asDeclContext) {
       decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members))
@@ -173,7 +173,7 @@ extension ASTGenVisitor {
       ),
       isActor: false
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     self.withDeclContext(decl.asDeclContext) {
       decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members))
@@ -201,7 +201,7 @@ extension ASTGenVisitor {
       ),
       isActor: true
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     self.withDeclContext(decl.asDeclContext) {
       decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members))
@@ -231,7 +231,7 @@ extension ASTGenVisitor {
         end: node.memberBlock.rightBrace
       )
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     self.withDeclContext(decl.asDeclContext) {
       decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members))
@@ -254,7 +254,7 @@ extension ASTGenVisitor {
       defaultType: self.generate(type: node.initializer?.value),
       genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
     return decl
   }
 }
@@ -276,7 +276,7 @@ extension ASTGenVisitor {
         end: node.memberBlock.rightBrace
       )
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     self.withDeclContext(decl.asDeclContext) {
       decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members))
@@ -309,7 +309,7 @@ extension ASTGenVisitor {
     // All attributes goes to each element.
     let elements = node.elements.lazy.map({ elem -> BridgedEnumElementDecl in
       let elemDecl = self.generate(enumCaseElement: elem)
-      elemDecl.asDecl.attrs = attrs.attributes
+      attrs.attach(to: elemDecl.asDecl)
       return elemDecl
     })
     return .createParsed(
@@ -536,7 +536,7 @@ extension ASTGenVisitor {
       arrowLoc: self.generateSourceLoc(node.returnClause.arrow),
       returnType: self.generate(type: node.returnClause.type)
     )
-    subscriptDecl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: subscriptDecl.asDecl)
 
     if let accessors = node.accessorBlock {
       let storage = subscriptDecl.asAbstractStorageDecl
@@ -570,7 +570,7 @@ extension ASTGenVisitor {
       returnType: self.generate(type: node.signature.returnClause?.type),
       genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     if let body = node.body {
       self.withDeclContext(decl.asDeclContext) {
@@ -597,7 +597,7 @@ extension ASTGenVisitor {
       thrownType: self.generate(type: node.signature.effectSpecifiers?.thrownError),
       genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     if let body = node.body {
       self.withDeclContext(decl.asDeclContext) {
@@ -616,7 +616,7 @@ extension ASTGenVisitor {
       declContext: self.declContext,
       deinitKeywordLoc: self.generateSourceLoc(node.deinitKeyword)
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     if let body = node.body {
       self.withDeclContext(decl.asDeclContext) {
@@ -783,7 +783,7 @@ extension ASTGenVisitor {
       lowerThanNames: self.generate(precedenceGroupNameList: body.lowerThanRelation?.precedenceGroups),
       rightBraceLoc: self.generateSourceLoc(node.rightBrace)
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
     return decl
   }
 }
@@ -830,7 +830,7 @@ extension ASTGenVisitor {
         self.generateLocatedIdentifier($0.name)
       }.bridgedArray(in: self)
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
     return decl
   }
 }