Use VariableDeclSyntax in lexicalContext

Author: calda

Sources/SwiftSyntaxMacroExpansion/MacroExpansion.swift

@@ -415,11 +415,11 @@ public func expandAttachedMacroWithoutCollapsing<Context: MacroExpansionContext>
           )
         )
 
-        // Insert the accessor's parent `PatternBindingSyntax` into the lexical context
+        // Insert the enclosing `VariableDeclSyntax` into the lexical context
         var context: MacroExpansionContext = context
-        if let bindingLexicalContext = binding.asMacroLexicalContext() {
+        if let varDeclLexicalContext = varDecl.asMacroLexicalContext() {
           context = PrependLexicalContextWrapperContext(
-            prependLexicalContext: [bindingLexicalContext],
+            prependLexicalContext: [varDeclLexicalContext],
             wrapping: context
           )
         }

Sources/SwiftSyntaxMacros/Syntax+LexicalContext.swift

@@ -62,6 +62,19 @@ extension SyntaxProtocol {
       patternBinding.initializer = nil
       return Syntax(patternBinding)
 
+    // Variable declarations have their accessor blocks removed from bindings.
+    case var varDecl as VariableDeclSyntax:
+      varDecl = varDecl.detached
+      varDecl.bindings = PatternBindingListSyntax(
+        varDecl.bindings.map {
+          var binding = $0
+          binding.accessorBlock = nil
+          binding.initializer = nil
+          return binding
+        }
+      )
+      return Syntax(varDecl)
+
     // Freestanding macros are fine as-is because if any arguments change
     // the whole macro would have to be re-evaluated.
     case let freestandingMacro as FreestandingMacroExpansionSyntax:

Tests/SwiftSyntaxMacroExpansionTest/BodyMacroTests.swift

@@ -78,9 +78,9 @@ struct StartTaskMacro: BodyMacro {
       taskName = funcDecl.name.text
     } else if declaration.is(AccessorDeclSyntax.self) {
       taskName = context.lexicalContext
-        .compactMap { $0.as(PatternBindingSyntax.self) }
+        .compactMap { $0.as(VariableDeclSyntax.self) }
         .first
-        .flatMap { $0.pattern.as(IdentifierPatternSyntax.self)?.identifier.text }
+        .flatMap { $0.bindings.first?.pattern.as(IdentifierPatternSyntax.self)?.identifier.text }
     } else {
       taskName = nil
     }