fix comments formatting with variable declaration

packages/prettier-plugin-java/src/printers/classes.js

@@ -2,6 +2,7 @@
 const _ = require("lodash");
 const { line, softline, hardline } = require("prettier").doc.builders;
 const {
+  hasLeadingLineComments,
   reject,
   rejectAndConcat,
   rejectAndJoin,
@@ -188,9 +189,23 @@ class ClassesPrettierVisitor {
     if (ctx.Equals) {
       const variableInitializer = this.visit(ctx.variableInitializer);
 
+      if (hasLeadingLineComments(ctx.variableInitializer[0])) {
+        return group(
+          indent(
+            rejectAndJoin(hardline, [
+              rejectAndJoin(" ", [variableDeclaratorId, ctx.Equals[0]]),
+              variableInitializer
+            ])
+          )
+        );
+      }
+
       if (
         // Array Initialisation
         ctx.variableInitializer[0].children.arrayInitializer !== undefined ||
+        // Lambda expression
+        ctx.variableInitializer[0].children.expression[0].children
+          .lambdaExpression !== undefined ||
         // Ternary Expression
         (ctx.variableInitializer[0].children.expression[0].children
           .ternaryExpression !== undefined &&

packages/prettier-plugin-java/test/unit-test/snippets/classes/variableDeclarator/test.spec.js

@@ -70,4 +70,21 @@ describe("VariableDeclarator", () => {
       "value = thisIsAnotherVeryLongIntegerThatIsEvenLongerThanFirstOne\n  ? thisIsAnotherVeryLongIntegerThatIsEvenLongerThanFirstOne\n  : thisIsAShortInteger";
     expect(formattedText).to.equal(expectedContents);
   });
+  it("should format comment on its own line between equal and variable initializer", () => {
+    const snippet = "value = \n// comment2\n 1";
+    const entryPoint = "variableDeclarator";
+
+    const formattedText = formatJavaSnippet(snippet, entryPoint);
+    const expectedContents = "value =\n  // comment2\n  1";
+    expect(formattedText).to.equal(expectedContents);
+  });
+
+  it("should format comments on several lines between equal and variable initializer", () => {
+    const snippet = "value = // comment1\n// comment2\n 1";
+    const entryPoint = "variableDeclarator";
+
+    const formattedText = formatJavaSnippet(snippet, entryPoint);
+    const expectedContents = "value = // comment1\n  // comment2\n  1";
+    expect(formattedText).to.equal(expectedContents);
+  });
 });

packages/prettier-plugin-java/test/unit-test/variables/_input.java

@@ -99,4 +99,13 @@ public void breakMultipleMethods() {
     boolean willDrop = predictDropResponsegetSendResultisIgnorableFailure || predictDropResponsegetSendResultisFatalError;
     boolean willDrop = predictDropResponse.getSendResult().isIgnorableFailure() || predictDropResponsegetSendResultisFatalError;
   }
+
+  public methodWithVariableInitializationWithComments() {
+    Map<String, String> map =
+      // there is a random comment on this line up here
+      // and then there is a separate comment on this line down here
+      new HashMap<>(
+        someRandomMethodThatReturnsTheInitialMapThatWeWantToMutate()
+      );
+  }
 }

packages/prettier-plugin-java/test/unit-test/variables/_output.java

@@ -161,4 +161,13 @@ public void breakMultipleMethods() {
       predictDropResponse.getSendResult().isIgnorableFailure() ||
       predictDropResponsegetSendResultisFatalError;
   }
+
+  public methodWithVariableInitializationWithComments() {
+    Map<String, String> map =
+      // there is a random comment on this line up here
+      // and then there is a separate comment on this line down here
+      new HashMap<>(
+        someRandomMethodThatReturnsTheInitialMapThatWeWantToMutate()
+      );
+  }
 }