Avoid clashing with the getter field

apollographql · Aug 2, 2024 · 9fb3041 · 9fb3041
1 parent 1bb2514
commit 9fb3041
Show file tree

Hide file tree

Showing 41 changed files with 258 additions and 202 deletions.
diff --git a/.../main/kotlin/com/apollographql/apollo/compiler/codegen/kotlin/schema/EnumAsEnumBuilder.kt b/.../main/kotlin/com/apollographql/apollo/compiler/codegen/kotlin/schema/EnumAsEnumBuilder.kt
@@ -107,7 +107,7 @@ internal class EnumAsEnumBuilder(
                     .indent()
                     .add(
                         values.map {
-                          CodeBlock.of("%N", it.targetName.escapeKotlinReservedWordInEnum())
+                          CodeBlock.of("%T.%N", ClassName(packageName, simpleName), it.targetName.escapeKotlinReservedWordInEnum())
                         }.joinToCode(",\n")
                     )
                     .unindent()

diff --git a/...xample/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/type/Enum.kt.expected b/...xample/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/type/Enum.kt.expected
diff --git a/...graphql/com/example/deprecation/kotlin/responseBased/deprecation/type/Episode.kt.expected b/...graphql/com/example/deprecation/kotlin/responseBased/deprecation/type/Episode.kt.expected
diff --git a/.../graphql/com/example/enum_field/java/operationBased/enum_field/type/Gravity.java.expected b/.../graphql/com/example/enum_field/java/operationBased/enum_field/type/Gravity.java.expected
diff --git a/...ql/com/example/enum_field/java/operationBased/enum_field/type/GravityAsEnum.java.expected b/...ql/com/example/enum_field/java/operationBased/enum_field/type/GravityAsEnum.java.expected
diff --git a/...t/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/Gravity.kt.expected b/...t/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/Gravity.kt.expected
diff --git a/...hql/com/example/enum_field/kotlin/responseBased/enum_field/type/GravityAsEnum.kt.expected b/...hql/com/example/enum_field/kotlin/responseBased/enum_field/type/GravityAsEnum.kt.expected
diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/schema.graphqls b/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/schema.graphqls
@@ -18,6 +18,8 @@ enum Gravity {
 
   # an enum value that clashes with the rawValue type
   String
+
+  field
 }
 
 enum GravityAsEnum {
@@ -39,4 +41,6 @@ enum GravityAsEnum {
 
   "an enum value that clashes with the rawValue type"
   String
+
+  field
 }
diff --git a/...ine_fragment/kotlin/operationBased/fragment_with_inline_fragment/type/Episode.kt.expected b/...ine_fragment/kotlin/operationBased/fragment_with_inline_fragment/type/Episode.kt.expected
diff --git a/...line_fragment/kotlin/responseBased/fragment_with_inline_fragment/type/Episode.kt.expected b/...line_fragment/kotlin/responseBased/fragment_with_inline_fragment/type/Episode.kt.expected
diff --git a/...hql/com/example/hero_details/kotlin/responseBased/hero_details/type/hero_type.kt.expected b/...hql/com/example/hero_details/kotlin/responseBased/hero_details/type/hero_type.kt.expected
diff --git a/...e_query_long_name/kotlin/responseBased/hero_name_query_long_name/type/Episode.kt.expected b/...e_query_long_name/kotlin/responseBased/hero_name_query_long_name/type/Episode.kt.expected
diff --git a/...m/example/hero_with_review/kotlin/responseBased/hero_with_review/type/Episode.kt.expected b/...m/example/hero_with_review/kotlin/responseBased/hero_with_review/type/Episode.kt.expected
diff --git a/...ent_intersection/kotlin/operationBased/inline_fragment_intersection/type/Race.kt.expected b/...ent_intersection/kotlin/operationBased/inline_fragment_intersection/type/Race.kt.expected
diff --git a/...ment_intersection/kotlin/responseBased/inline_fragment_intersection/type/Race.kt.expected b/...ment_intersection/kotlin/responseBased/inline_fragment_intersection/type/Race.kt.expected
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,8 @@ enum Gravity { @@
       # an enum value that clashes with the rawValue type
       String
+      field
     }
     enum GravityAsEnum {
@@ Expand All / @@ -39,4 +41,6 @@ enum GravityAsEnum { @@
       "an enum value that clashes with the rawValue type"
       String
+      field
     }