Initializer fixit fixes

dfed · Nov 29, 2023 · 5b64589 · 5b64589
1 parent c592a4d
commit 5b64589
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 5 deletions.
diff --git a/Sources/SafeDICore/Models/Initializer.swift b/Sources/SafeDICore/Models/Initializer.swift
@@ -186,7 +186,7 @@ public struct Initializer: Codable, Equatable {
  leadingTrivia: .space,
  trailingTrivia: .space),
  rightOperand: DeclReferenceExprSyntax(baseName: TokenSyntax.identifier(dependency.property.label)),
- trailingTrivia: .newline
+ trailingTrivia: dependency == dependencies.last ? .newline : nil
  )))
  )
  }

diff --git a/Sources/SafeDIMacros/Macros/ConstructableMacro.swift b/Sources/SafeDIMacros/Macros/ConstructableMacro.swift
@@ -59,7 +59,7 @@ public struct ConstructableMacro: MemberMacro {
  .compactMap({ try? $0.result.get() })
  .first
  else {
- if initializerAndResultPairs.isEmpty {
+ if !visitor.dependencies.isEmpty || initializerAndResultPairs.isEmpty {
  var membersWithInitializer = declaration.memberBlock.members
  membersWithInitializer.insert(
  MemberBlockItemSyntax(

diff --git a/Tests/SafeDIMacrosTests/MacroTests.swift b/Tests/SafeDIMacrosTests/MacroTests.swift
@@ -488,7 +488,7 @@ final class MacroTests: XCTestCase {
 
  @provided
  }
- """ // fixes is quite wrong here. In Xcode this removes all but the first macro.
+ """ // fixes are super wrong here. We delete @provided not the rest.
  }
  }
 
@@ -679,14 +679,14 @@ final class MacroTests: XCTestCase {
  init() {}
 
  init() {}
- """ // fixes are wrong! It's duplicating the correction. not sure why.
+ """ // this is seriously incorrect – it works in Xcode.
  } expansion: {
  """
  public struct ExampleService {
  init() {}
 
  init() {}
- """ // expansion is wrong! It's duplicating the correction. not sure why.
+ """
  }
  }
 
@@ -738,5 +738,95 @@ final class MacroTests: XCTestCase {
  }
  }
 
+ func test_constructableMacro_addsFixitMissingRequiredInitializerWhenDependencyMissingFromInit() {
+ assertMacro {
+ """
+ @constructable
+ public struct ExampleService {
+ init(variantA: VariantA, variantB: VariantB) {
+ self.variantA = variantA
+ self.variantB = variantB
+ invariantA = InvariantA()
+ }
+
+ @propagated
+ let variantA: VariantA
+ @propagated
+ let variantB: VariantB
+ @provided
+ let invariantA: InvariantA
+ }
+ """
+ } diagnostics: {
+ """
+ @constructable
+ public struct ExampleService {
+ ╰─ 🛑 @constructable-decorated type must have initializer for all injected parameters
+ ✏️ Add required initializer
+ init(variantA: VariantA, variantB: VariantB) {
+ self.variantA = variantA
+ self.variantB = variantB
+ invariantA = InvariantA()
+ }
+
+ @propagated
+ let variantA: VariantA
+ @propagated
+ let variantB: VariantB
+ @provided
+ let invariantA: InvariantA
+ }
+ """
+ } fixes: {
+ """
+ @constructable
+ public struct ExampleService {
+ init(variantA: VariantA, variantB: VariantB, invariantA: InvariantA) {
+ self.variantA = variantA
+ self.variantB = variantB
+ self.invariantA = invariantA
+ }
+
+ init(variantA: VariantA, variantB: VariantB) {
+ self.variantA = variantA
+ self.variantB = variantB
+ invariantA = InvariantA()
+ }
+
+ @propagated
+ let variantA: VariantA
+ @propagated
+ let variantB: VariantB
+ @provided
+ let invariantA: InvariantA
+ }
+ """
+ } expansion: {
+ """
+ public struct ExampleService {
+ init(variantA: VariantA, variantB: VariantB, invariantA: InvariantA) {
+ self.variantA = variantA
+ self.variantB = variantB
+ self.invariantA = invariantA
+ }
+
+ init(variantA: VariantA, variantB: VariantB) {
+ self.variantA = variantA
+ self.variantB = variantB
+ invariantA = InvariantA()
+ }
+ let variantA: VariantA
+ let variantB: VariantB
+ let invariantA: InvariantA
+
+ public init(buildSafeDIDependencies: (VariantA, VariantB) -> (variantA: VariantA, variantB: VariantB, invariantA: InvariantA), variantA: VariantA, variantB: VariantB) {
+ let dependencies = buildSafeDIDependencies(variantA, variantB)
+ self.init(variantA: dependencies.variantA, variantB: dependencies.variantB, invariantA: dependencies.invariantA)
+ }
+ }
+ """
+ }
+ }
+
 }
 #endif