Merge branch 'main' into escape-prop-in-builder

apollographql · Aug 13, 2024 · 243d2ef · 243d2ef
2 parents a6be63d + 47a7770
commit 243d2ef
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...src/main/kotlin/com/apollographql/apollo/compiler/codegen/kotlin/helpers/AdapterCommon.kt b/...src/main/kotlin/com/apollographql/apollo/compiler/codegen/kotlin/helpers/AdapterCommon.kt
@@ -143,7 +143,7 @@ internal fun readFromResponseCodeBlock(
         }
         .add(
             CodeBlock.of(
-                "%L·=·%L.$fromJson($reader, $customScalarAdapters)\n",
+                "%N·=·%L.$fromJson($reader, $customScalarAdapters)\n",
                 property.info.responseName.variableName(),
                 context.resolver.resolveModelAdapter(property.info.type.modelPath()),
             )

diff --git a/...ler/src/main/kotlin/com/apollographql/apollo/compiler/codegen/kotlin/helpers/DataClass.kt b/...ler/src/main/kotlin/com/apollographql/apollo/compiler/codegen/kotlin/helpers/DataClass.kt
@@ -121,7 +121,7 @@ internal fun TypeSpec.Builder.withCopyImplementation(className: ClassName): Type
           .add("return %T(", className)
           .apply {
             constructorProperties.forEach {
-              add("%L,", it.name)
+              add("%N,", it.name)
             }
           }
           .add(")")

diff --git a/...main/kotlin/com/apollographql/apollo/compiler/codegen/kotlin/helpers/PatchKotlinNative.kt b/...main/kotlin/com/apollographql/apollo/compiler/codegen/kotlin/helpers/PatchKotlinNative.kt
@@ -32,7 +32,7 @@ internal fun TypeSpec.patchKotlinNativeOptionalArrayProperties(): TypeSpec {
         FunSpec
             .builder("${propertySpec.name}FilterNotNull")
             .returns(nonOptionalListType)
-            .addStatement("return·%L%L.filterNotNull()", propertySpec.name, if (propertySpec.type.isNullable) "?" else "")
+            .addStatement("return·%N%L.filterNotNull()", propertySpec.name, if (propertySpec.type.isNullable) "?" else "")
             .build()
       }
   return toBuilder()

diff --git a/.../com/apollographql/apollo/compiler/codegen/kotlin/operations/CompiledSelectionsBuilder.kt b/.../com/apollographql/apollo/compiler/codegen/kotlin/operations/CompiledSelectionsBuilder.kt
@@ -125,7 +125,7 @@ internal class CompiledSelectionsBuilder(
   private fun IrArgument.codeBlock(): CodeBlock {
     val argumentBuilder = CodeBlock.builder()
     argumentBuilder.add(
-        "%T(%T.%L)",
+        "%T(%T.%N)",
         KotlinSymbols.CompiledArgument,
         context.resolver.resolveArgumentDefinition(definitionId),
         definitionPropertyName,