Record support

Fixes square#829 Signed-off-by: liach <[email protected]>
liachmodded · May 13, 2021 · 2d95cc7 · 2d95cc7
1 parent 8851788
commit 2d95cc7
Show file tree

Hide file tree

Showing 3 changed files with 377 additions and 84 deletions.
diff --git a/src/main/java/com/squareup/javapoet/MethodSpec.java b/src/main/java/com/squareup/javapoet/MethodSpec.java
@@ -80,7 +80,8 @@ private boolean lastParameterIsArray(List<ParameterSpec> parameters) {
         && TypeName.asArray((parameters.get(parameters.size() - 1).type)) != null;
   }
 
-  void emit(CodeWriter codeWriter, String enclosingName, Set<Modifier> implicitModifiers)
+  void emit(CodeWriter codeWriter, String enclosingName, Set<Modifier> implicitModifiers,
+      boolean compactConstructor)
       throws IOException {
     codeWriter.emitJavadoc(javadocWithParameters());
     codeWriter.emitAnnotations(annotations, false);
@@ -91,22 +92,18 @@ void emit(CodeWriter codeWriter, String enclosingName, Set<Modifier> implicitMod
       codeWriter.emit(" ");
     }
 
-    if (isConstructor()) {
-      codeWriter.emit("$L($Z", enclosingName);
+    if (compactConstructor) {
+      codeWriter.emit("$L", enclosingName);
     } else {
-      codeWriter.emit("$T $L($Z", returnType, name);
-    }
+      if (isConstructor()) {
+        codeWriter.emit("$L", enclosingName);
+      } else {
+        codeWriter.emit("$T $L", returnType, name);
+      }
 
-    boolean firstParameter = true;
-    for (Iterator<ParameterSpec> i = parameters.iterator(); i.hasNext(); ) {
-      ParameterSpec parameter = i.next();
-      if (!firstParameter) codeWriter.emit(",").emitWrappingSpace();
-      parameter.emit(codeWriter, !i.hasNext() && varargs);
-      firstParameter = false;
+      emitParameters(codeWriter, parameters, varargs);
     }
 
-    codeWriter.emit(")");
-
     if (defaultValue != null && !defaultValue.isEmpty()) {
       codeWriter.emit(" default ");
       codeWriter.emit(defaultValue);
@@ -141,6 +138,11 @@ void emit(CodeWriter codeWriter, String enclosingName, Set<Modifier> implicitMod
   }
 
   private CodeBlock javadocWithParameters() {
+    return makeJavadocWithParameters(javadoc, parameters);
+  }
+
+  static CodeBlock makeJavadocWithParameters(CodeBlock javadoc,
+      Iterable<ParameterSpec> parameters) {
     CodeBlock.Builder builder = javadoc.toBuilder();
     boolean emitTagNewline = true;
     for (ParameterSpec parameterSpec : parameters) {
@@ -154,6 +156,22 @@ private CodeBlock javadocWithParameters() {
     return builder.build();
   }
 
+  static void emitParameters(CodeWriter codeWriter, Iterable<ParameterSpec> parameters,
+      boolean varargs) throws IOException {
+    codeWriter.emit(CodeBlock.of("($Z"));
+
+    boolean firstParameter = true;
+    for (Iterator<ParameterSpec> i = parameters.iterator(); i.hasNext(); ) {
+      ParameterSpec parameter = i.next();
+      if (!firstParameter)
+        codeWriter.emit(",").emitWrappingSpace();
+      parameter.emit(codeWriter, !i.hasNext() && varargs);
+      firstParameter = false;
+    }
+
+    codeWriter.emit(")");
+  }
+
   public boolean hasModifier(Modifier modifier) {
     return modifiers.contains(modifier);
   }
@@ -177,7 +195,7 @@ public boolean isConstructor() {
     StringBuilder out = new StringBuilder();
     try {
       CodeWriter codeWriter = new CodeWriter(out);
-      emit(codeWriter, "Constructor", Collections.emptySet());
+      emit(codeWriter, "Constructor", Collections.emptySet(), false);
       return out.toString();
     } catch (IOException e) {
       throw new AssertionError();