Merge pull request #602 from jtkiesel/fix/assignment-indentation

fix: correct indentation of assignment operations
jhipster · Aug 29, 2023 · f74555d · f74555d
2 parents fce16b9 + 8c997e9
commit f74555d
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 1 deletion.
diff --git a/packages/prettier-plugin-java/src/printers/printer-utils.ts b/packages/prettier-plugin-java/src/printers/printer-utils.ts
@@ -659,7 +659,8 @@ export function binary(nodes: Doc[], tokens: IToken[], isRoot = false): Doc {
     }
   }
   level.push(nodes.shift()!);
-  return group(join(line, level));
+  const content = group(join(line, level));
+  return levelOperator === "=" ? indent(content) : content;
 }
 
 function getOperator(tokens: IToken[]) {

diff --git a/packages/prettier-plugin-java/test/unit-test/variables/_input.java b/packages/prettier-plugin-java/test/unit-test/variables/_input.java
@@ -185,4 +185,21 @@ public methodWithVariableInitializationWithComments() {
         someRandomMethodThatReturnsTheInitialMapThatWeWantToMutate()
       );
   }
+
+  void assignment() {
+    fileSystemDetails =
+      FileHandlerDetails
+        .builder()
+        .fileSystemType(
+          EntityUtils.update(
+            entity.getFileSystemDetails().getFileSystemType(),
+            update.getFileSystemDetails().getFileSystemType()
+          )
+        );
+
+    aaaaaaaaaaaaaaaaa =
+      bbbbbbbbbbbbbbbbb ? ccccccccccccccccc : ddddddddddddddddd;
+
+    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb = ccccccccccccccccccccccccccccccccccccccc + ddddddddddddddddddddddddddddddddd;
+  }
 }
diff --git a/packages/prettier-plugin-java/test/unit-test/variables/_output.java b/packages/prettier-plugin-java/test/unit-test/variables/_output.java
@@ -325,4 +325,24 @@ public methodWithVariableInitializationWithComments() {
         someRandomMethodThatReturnsTheInitialMapThatWeWantToMutate()
       );
   }
+
+  void assignment() {
+    fileSystemDetails =
+      FileHandlerDetails
+        .builder()
+        .fileSystemType(
+          EntityUtils.update(
+            entity.getFileSystemDetails().getFileSystemType(),
+            update.getFileSystemDetails().getFileSystemType()
+          )
+        );
+
+    aaaaaaaaaaaaaaaaa =
+      bbbbbbbbbbbbbbbbb ? ccccccccccccccccc : ddddddddddddddddd;
+
+    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa =
+      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb =
+        ccccccccccccccccccccccccccccccccccccccc +
+        ddddddddddddddddddddddddddddddddd;
+  }
 }