Strip trailing comments from endpoints. (#347)

Author: mbrandonw

Sources/DependenciesMacrosPlugin/DependencyEndpointMacro.swift

@@ -225,11 +225,10 @@ extension PatternBindingListSyntax {
             identifier: identifier.identifier.privatePrefixed(prefix),
             trailingTrivia: identifier.trailingTrivia
           ),
-          typeAnnotation: binding.typeAnnotation,
+          typeAnnotation: binding.typeAnnotation?.with(\.trailingTrivia, ""),
           initializer: InitializerClauseSyntax(value: unimplementedDefault),
           accessorBlock: binding.accessorBlock,
-          trailingComma: binding.trailingComma,
-          trailingTrivia: binding.trailingTrivia
+          trailingComma: binding.trailingComma
         )
       }
     }
@@ -284,8 +283,7 @@ extension VariableDeclSyntax {
         trailingTrivia: .space,
         presence: .present
       ),
-      bindings: bindings.privatePrefixed(prefix, unimplementedDefault: unimplementedDefault),
-      trailingTrivia: trailingTrivia
+      bindings: bindings.privatePrefixed(prefix, unimplementedDefault: unimplementedDefault)
     )
   }
 }

Tests/DependenciesMacrosPluginTests/DependencyClientMacroTests.swift

@@ -5,15 +5,14 @@ import XCTest
 final class DependencyClientMacroTests: BaseTestCase {
   override func invokeTest() {
     withMacroTesting(
-      // isRecording: true,
+      record: .failed,
       macros: [DependencyClientMacro.self]
     ) {
       super.invokeTest()
     }
   }
 
   func testBasics() {
-    
     assertMacro {
       """
       @DependencyClient
@@ -1072,4 +1071,38 @@ final class DependencyClientMacroTests: BaseTestCase {
       """
     }
   }
+
+  func testComments() {
+    assertMacro {
+      """
+      @DependencyClient
+      struct Client {
+        var config: Bool = false  // This is a comment
+        var endpoint: () -> Void  // And this is a comment
+      }
+      """
+    } expansion: {
+      """
+      struct Client {
+        var config: Bool = false  // This is a comment
+        @DependencyEndpoint
+        var endpoint: () -> Void  // And this is a comment
+
+        init(
+          config: Bool = false,
+          endpoint: @escaping () -> Void
+        ) {
+          self.config = config
+          self.endpoint = endpoint
+        }
+
+        init(
+          config: Bool = false
+        ) {
+          self.config = config
+        }
+      }
+      """
+    }
+  }
 }

Tests/DependenciesMacrosPluginTests/DependencyEndpointMacroTests.swift

@@ -5,7 +5,7 @@ import XCTest
 final class DependencyEndpointMacroTests: BaseTestCase {
   override func invokeTest() {
     withMacroTesting(
-      // isRecording: true,
+      record: .failed,
       macros: [DependencyEndpointMacro.self]
     ) {
       super.invokeTest()
@@ -1010,4 +1010,36 @@ final class DependencyEndpointMacroTests: BaseTestCase {
       """#
     }
   }
+
+  func testComments() {
+    assertMacro {
+      """
+      struct Client {
+        @DependencyEndpoint
+        var endpoint: () -> Void // This is a comment
+      }
+      """
+    } expansion: {
+      #"""
+      struct Client {
+        var endpoint: () -> Void // This is a comment {
+          @storageRestrictions(initializes: _endpoint)
+          init(initialValue) {
+            _endpoint = initialValue
+          }
+          get {
+            _endpoint
+          }
+          set {
+            _endpoint = newValue
+          }
+        }
+
+        private var _endpoint: () -> Void = {
+          IssueReporting.reportIssue("Unimplemented: '\(Self.self).endpoint'")
+        }
+      }
+      """#
+    }
+  }
 }