Add non-breaking spaces after 'return'

apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/adapter/PolymorphicFieldResponseAdapterBuilder.kt

@@ -1,7 +1,6 @@
 package com.apollographql.apollo3.compiler.codegen.kotlin.adapter
 
 import com.apollographql.apollo3.compiler.applyIf
-import com.apollographql.apollo3.compiler.codegen.Identifier
 import com.apollographql.apollo3.compiler.codegen.Identifier.__typename
 import com.apollographql.apollo3.compiler.codegen.Identifier.customScalarAdapters
 import com.apollographql.apollo3.compiler.codegen.Identifier.fromJson
@@ -17,7 +16,6 @@ import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
-import com.squareup.kotlinpoet.PropertySpec
 import com.squareup.kotlinpoet.TypeSpec
 
 class PolymorphicFieldResponseAdapterBuilder(
@@ -93,7 +91,7 @@ class PolymorphicFieldResponseAdapterBuilder(
 
     builder.add(typenameFromReaderCodeBlock())
 
-    builder.beginControlFlow("return when($__typename) {")
+    builder.beginControlFlow("return·when($__typename) {")
     implementations.sortedByDescending { it.typeSet.size }.forEach { model ->
       if (!model.isFallback) {
         model.possibleTypes.forEach { possibleType ->
@@ -137,4 +135,4 @@ class PolymorphicFieldResponseAdapterBuilder(
 
     return builder.build()
   }
-}
+}

apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/EnumAsEnumBuilder.kt

@@ -97,7 +97,7 @@ class EnumAsEnumBuilder(
         .addParameter("rawValue", String::
         class)
         .returns(ClassName("", simpleName))
-        .addStatement("return values().find·{·it.rawValue·==·rawValue·} ?: $UNKNOWN__")
+        .addStatement("return·values().find·{·it.rawValue·==·rawValue·} ?: $UNKNOWN__")
         .build()
   }
 

apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/ExecutableCommon.kt

@@ -11,7 +11,6 @@ import com.apollographql.apollo3.compiler.codegen.Identifier.writer
 import com.apollographql.apollo3.compiler.codegen.kotlin.KotlinContext
 import com.apollographql.apollo3.compiler.codegen.kotlin.KotlinResolver
 import com.apollographql.apollo3.compiler.codegen.kotlin.KotlinSymbols
-import com.apollographql.apollo3.compiler.codegen.kotlin.adapter.obj
 import com.apollographql.apollo3.compiler.codegen.kotlin.helpers.patchKotlinNativeOptionalArrayProperties
 import com.apollographql.apollo3.compiler.ir.IrProperty
 import com.squareup.kotlinpoet.ClassName
@@ -69,7 +68,7 @@ fun rootFieldFunSpec(context: KotlinContext, typeInScope: String, selectionsClas
       .returns(KotlinSymbols.CompiledField)
       .addCode(
           CodeBlock.builder()
-              .add("return %T(\n", KotlinSymbols.CompiledFieldBuilder)
+              .add("return·%T(\n", KotlinSymbols.CompiledFieldBuilder)
               .indent()
               .add("name·=·%S,\n", Identifier.data)
               .add("type·=·%L\n", context.resolver.resolveCompiledType(typeInScope))
@@ -87,4 +86,4 @@ fun TypeSpec.maybeAddFilterNotNull(generateFilterNotNull: Boolean): TypeSpec {
     return this
   }
   return patchKotlinNativeOptionalArrayProperties()
-}
+}

apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/OperationBuilder.kt

@@ -21,7 +21,6 @@ import com.apollographql.apollo3.compiler.codegen.maybeFlatten
 import com.apollographql.apollo3.compiler.ir.IrOperation
 import com.apollographql.apollo3.compiler.ir.IrOperationType
 import com.squareup.kotlinpoet.ClassName
-import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
@@ -117,15 +116,15 @@ class OperationBuilder(
   private fun operationIdFunSpec() = FunSpec.builder(id)
       .addModifiers(KModifier.OVERRIDE)
       .returns(KotlinSymbols.String)
-      .addStatement("return $OPERATION_ID")
+      .addStatement("return·$OPERATION_ID")
       .build()
 
   private fun queryDocumentFunSpec(generateQueryDocument: Boolean) = FunSpec.builder(document)
       .addModifiers(KModifier.OVERRIDE)
       .returns(KotlinSymbols.String)
       .apply {
         if (generateQueryDocument) {
-          addStatement("return $OPERATION_DOCUMENT")
+          addStatement("return·$OPERATION_DOCUMENT")
         } else {
           addStatement("error(\"The·query·document·was·removed·from·this·operation.·Use·generateQueryDocument.set(true)·if·you·need·it\")")
         }
@@ -135,7 +134,7 @@ class OperationBuilder(
   private fun nameFunSpec() = FunSpec.builder(name)
       .addModifiers(KModifier.OVERRIDE)
       .returns(KotlinSymbols.String)
-      .addStatement("return OPERATION_NAME")
+      .addStatement("return·OPERATION_NAME")
       .build()
 
   private fun companionTypeSpec(): TypeSpec {

apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/SchemaBuilder.kt

@@ -67,7 +67,7 @@ class SchemaBuilder(
 
     builder.addParameter("type", KotlinSymbols.CompiledNamedType)
     builder.returns(KotlinSymbols.List.parameterizedBy(KotlinSymbols.ObjectType))
-    builder.addCode("return %M(all, type)\n", MemberName("com.apollographql.apollo3.api", "possibleTypes"))
+    builder.addCode("return·%M(all, type)\n", MemberName("com.apollographql.apollo3.api", "possibleTypes"))
     return builder.build()
   }
 }

apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/TestBuildersBuilder.kt

@@ -122,7 +122,7 @@ class TestBuildersBuilder(
 
     val builder = CodeBlock.builder()
 
-    builder.beginControlFlow("return %M(${testResolver})", KotlinMemberNames.withTestResolver)
+    builder.beginControlFlow("return·%M(${testResolver})", KotlinMemberNames.withTestResolver)
 
     builder.add(
         "%L.$fromJson(\n",

apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/helpers/DataClass.kt

@@ -68,11 +68,11 @@ private fun equalsFunSpec() = FunSpec.builder(Identifier.equals)
     .addModifiers(KModifier.OVERRIDE)
     .addParameter("other", KotlinSymbols.Any.copy(nullable = true))
     .returns(KotlinSymbols.Boolean)
-    .addStatement("return other != null && other::class == this::class")
+    .addStatement("return·other != null·&&·other::class·==·this::class")
     .build()
 
 private fun hashCodeFunSpec() = FunSpec.builder(Identifier.hashCode)
     .addModifiers(KModifier.OVERRIDE)
     .returns(KotlinSymbols.Int)
-    .addStatement("return this::class.hashCode()")
+    .addStatement("return·this::class.hashCode()")
     .build()

apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/helpers/PatchKotlinNative.kt

@@ -32,12 +32,12 @@ 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·%L%L.filterNotNull()", propertySpec.name, if (propertySpec.type.isNullable) "?" else "")
             .build()
       }
   return toBuilder()
       .addFunctions(nonOptionalListPropertyAccessors)
       .apply { typeSpecs.clear() }
       .addTypes(patchedNestedTypes)
       .build()
-}
+}

apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/model/ModelBuilder.kt

@@ -95,7 +95,7 @@ class ModelBuilder(
     val funSpecs = model.accessors.map { accessor ->
       FunSpec.builder(accessor.funName())
           .receiver(context.resolver.resolveModel(model.id))
-          .addCode("return this as? %T\n", context.resolver.resolveModel(accessor.returnedModelId))
+          .addCode("return·this as? %T\n", context.resolver.resolveModel(accessor.returnedModelId))
           .build()
     }
     return TypeSpec.companionObjectBuilder()

apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/test/TBuilderBuilder.kt

@@ -81,7 +81,7 @@ internal class TBuilderBuilder(
     builder.addModifiers(KModifier.OVERRIDE)
     builder.addCode(
         CodeBlock.builder()
-            .add("return mapOf(\n")
+            .add("return·mapOf(\n")
             .indent()
             .apply {
               tbuilder.properties.forEach { tprop ->
@@ -133,7 +133,7 @@ internal class TBuilderBuilder(
         .addCode(
             CodeBlock.builder()
                 .add("__shouldBeAssignedFields.add(%S)\n", responseName)
-                .add("return %T().apply($block).build()", context.resolver.resolveTestBuilder(id))
+                .add("return·%T().apply($block).build()", context.resolver.resolveTestBuilder(id))
                 .build()
         )
         .returns(anyMapClassName)

tests/models-fixtures/graphql/operations.graphql

@@ -133,4 +133,8 @@ query Starship($id: ID!) {
         name
         starshipType
     }
+
+    aFieldWithAVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongName: starship(id: $id) {
+        id
+    }
 }

tests/models-response-based/src/commonTest/kotlin/test/TestBuildersTest.kt

@@ -259,7 +259,7 @@ class TestBuildersTest {
 
 
   @Test
-  fun erroorIfForgotToAssignField() {
+  fun errorIfForgotToAssignField() {
     val e1 = assertFailsWith<IllegalStateException>() {
       AllPlanetsQuery.Data {
         /* allPlanets = */ allPlanets {