fix: Supply explicit type on forEach block to try preventing compil…

…er crash (#801)
smithy-lang · Aug 15, 2024 · 57e154b · 57e154b
1 parent 5cfec7b
commit 57e154b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/...in/kotlin/software/amazon/smithy/swift/codegen/middleware/MiddlewareExecutionGenerator.kt b/...in/kotlin/software/amazon/smithy/swift/codegen/middleware/MiddlewareExecutionGenerator.kt
@@ -58,18 +58,19 @@ class MiddlewareExecutionGenerator(
             }
             """.trimIndent()
         )
-        // Swift can't infer the generic arguments to `create` for some reason
-        writer.write(
-            """
-            config.httpInterceptorProviders.forEach { provider in
-                let i: any ${'$'}N<${'$'}N, ${'$'}N> = provider.create()
-                builder.interceptors.add(i)
-            }
-            """.trimIndent(),
-            ClientRuntimeTypes.Core.HttpInterceptor,
-            inputShape,
-            outputShape,
-        )
+        writer.openBlock(
+            "config.httpInterceptorProviders.forEach { (provider: any \$N) -> Void in",
+            "}",
+            ClientRuntimeTypes.Core.HttpInterceptorProvider,
+        ) {
+            writer.write(
+                "let i: any \$N<\$N, \$N> = provider.create()",
+                ClientRuntimeTypes.Core.HttpInterceptor,
+                inputShape,
+                outputShape,
+            )
+            writer.write("builder.interceptors.add(i)")
+        }
 
         renderMiddlewares(ctx, op, operationStackName)
 

diff --git a/smithy-swift-codegen/src/test/kotlin/EventStreamTests.kt b/smithy-swift-codegen/src/test/kotlin/EventStreamTests.kt
@@ -218,7 +218,7 @@ extension EventStreamTestClientTypes.TestStream {
         config.interceptorProviders.forEach { provider in
             builder.interceptors.add(provider.create())
         }
-        config.httpInterceptorProviders.forEach { provider in
+        config.httpInterceptorProviders.forEach { (provider: any ClientRuntime.HttpInterceptorProvider) -> Void in
             let i: any ClientRuntime.HttpInterceptor<TestStreamOpInput, TestStreamOpOutput> = provider.create()
             builder.interceptors.add(i)
         }

diff --git a/smithy-swift-codegen/src/test/kotlin/HttpProtocolClientGeneratorTests.kt b/smithy-swift-codegen/src/test/kotlin/HttpProtocolClientGeneratorTests.kt
@@ -158,7 +158,7 @@ extension RestJsonProtocolClient {
         config.interceptorProviders.forEach { provider in
             builder.interceptors.add(provider.create())
         }
-        config.httpInterceptorProviders.forEach { provider in
+        config.httpInterceptorProviders.forEach { (provider: any ClientRuntime.HttpInterceptorProvider) -> Void in
             let i: any ClientRuntime.HttpInterceptor<AllocateWidgetInput, AllocateWidgetOutput> = provider.create()
             builder.interceptors.add(i)
         }