Generate functions instead of anonymous closures to work around Swift…

… Concurrency bug (#99)
dfed · Jul 7, 2024 · 90c8b98 · 90c8b98
1 parent c6da5d6
commit 90c8b98
Show file tree

Hide file tree

Showing 2 changed files with 154 additions and 99 deletions.
diff --git a/Sources/SafeDICore/Generators/ScopeGenerator.swift b/Sources/SafeDICore/Generators/ScopeGenerator.swift
@@ -245,6 +245,20 @@ actor ScopeGenerator: CustomStringConvertible, Sendable {
  "let \(property.asSource)"
  }
 
+ // Ideally we would be able to use an anonymous closure rather than a named function here.
+ // Unfortunately, there's a bug in Swift Concurrency that prevents us from doing this: https://github.com/swiftlang/swift/issues/75003
+ let functionName = self.functionName(toBuild: property)
+ let functionDeclaration = if generatedProperties.isEmpty {
+ ""
+ } else {
+ """
+ func \(functionName)() -> \(concreteTypeName) {
+ \(generatedProperties.joined(separator: "\n"))
+ \(Self.standardIndent)\(generatedProperties.isEmpty ? "" : "return ")\(returnLineSansReturn)
+ }
+
+ """
+ }
  let returnLineSansReturn = if erasedToConcreteExistential {
  "\(property.typeDescription.asSource)(\(returnLineSansReturn))"
  } else {
@@ -253,14 +267,9 @@ actor ScopeGenerator: CustomStringConvertible, Sendable {
  let initializer = if generatedProperties.isEmpty {
  returnLineSansReturn
  } else {
- """
- {
- \(generatedProperties.joined(separator: "\n"))
- \(Self.standardIndent)\(generatedProperties.isEmpty ? "" : "return ")\(returnLineSansReturn)
- }()
- """
+ "\(functionName)()"
  }
- return "\(propertyDeclaration) = \(initializer)\n"
+ return "\(functionDeclaration)\(propertyDeclaration) = \(initializer)\n"
  }
  case let .alias(property, fulfillingProperty, erasedToConcreteExistential):
  if erasedToConcreteExistential {