Record supporting fork

- square#934 - square#925 - square#913 - square#840 - more support for records - slight fixes
deplant · Feb 1, 2023 · 3af056c · 3af056c
1 parent e59f44d
commit 3af056c
Show file tree

Hide file tree

Showing 11 changed files with 201 additions and 109 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.github/workflows/settings.xml b/.github/workflows/settings.xml
diff --git a/src/main/java/com/squareup/javapoet/AnnotationSpec.java b/src/main/java/com/squareup/javapoet/AnnotationSpec.java
@@ -229,9 +229,6 @@ Builder addMemberForValue(String memberName, Object value) {
       if (value instanceof String) {
         return addMember(memberName, "$S", value);
       }
-      if (value instanceof Float) {
-        return addMember(memberName, "$Lf", value);
-      }
       if (value instanceof Character) {
         return addMember(memberName, "'$L'", characterLiteralWithoutSingleQuotes((char) value));
       }

diff --git a/src/main/java/com/squareup/javapoet/CodeBlock.java b/src/main/java/com/squareup/javapoet/CodeBlock.java
@@ -42,7 +42,7 @@
  *   <li>{@code $L} emits a <em>literal</em> value with no escaping. Arguments for literals may be
  *       strings, primitives, {@linkplain TypeSpec type declarations}, {@linkplain AnnotationSpec
  *       annotations} and even other code blocks.
- *   <li>{@code $N} emits a <em>name</em>, using name collision avoidance where necessary. Arguments
+ *   <li>{@code $N} emits a <em>name</em>. Arguments
  *       for names may be strings (actually any {@linkplain CharSequence character sequence}),
  *       {@linkplain ParameterSpec parameters}, {@linkplain FieldSpec fields}, {@linkplain
  *       MethodSpec methods}, and {@linkplain TypeSpec types}.

diff --git a/src/main/java/com/squareup/javapoet/CodeWriter.java b/src/main/java/com/squareup/javapoet/CodeWriter.java
@@ -363,6 +363,10 @@ private void emitLiteral(Object o) throws IOException {
     } else if (o instanceof CodeBlock) {
       CodeBlock codeBlock = (CodeBlock) o;
       emit(codeBlock);
+    } else if (o instanceof Long) {
+      emitAndIndent(String.valueOf(o) + "L");
+    } else if (o instanceof Float) {
+      emitAndIndent(String.valueOf(o) + "f");
     } else {
       emitAndIndent(String.valueOf(o));
     }

diff --git a/src/main/java/com/squareup/javapoet/ParameterizedTypeName.java b/src/main/java/com/squareup/javapoet/ParameterizedTypeName.java
@@ -55,7 +55,7 @@ private ParameterizedTypeName(ParameterizedTypeName enclosingType, ClassName raw
 
   @Override public ParameterizedTypeName annotated(List<AnnotationSpec> annotations) {
     return new ParameterizedTypeName(
-        enclosingType, rawType, typeArguments, concatAnnotations(annotations));
+            enclosingType, rawType.withoutAnnotations(), typeArguments, concatAnnotations(annotations));
   }
 
   @Override