fix: correct indentation of non-root instanceof expressions

Author: jtkiesel

packages/prettier-plugin-java/src/printers/expressions.ts

@@ -684,7 +684,10 @@ function binary(
     }
   }
   level.push(operands.shift()!);
-  if (!levelOperator || !isAssignmentOperator(levelOperator)) {
+  if (
+    !levelOperator ||
+    (!isAssignmentOperator(levelOperator) && levelOperator !== "instanceof")
+  ) {
     return group(level);
   }
   if (!isRoot || hasNonAssignmentOperators) {

packages/prettier-plugin-java/test/unit-test/binary_expressions/operator-position-end/_input.java

@@ -132,4 +132,17 @@ void parentheses() {
 
     if (aaaaaaaaaa + bbbbbbbbbb == cccccccccc + dddddddddd && eeeeeeeeee + ffffffffff == gggggggggg + hhhhhhhhhh || iiiiiiiiii + jjjjjjjjjj == kkkkkkkkkk + llllllllll && mmmmmmmmmm + nnnnnnnnnn == oooooooooo + pppppppppp || qqqqqqqqqq + rrrrrrrrrr == ssssssssss + tttttttttt && uuuuuuuuuu + vvvvvvvvvv == wwwwwwwwww + xxxxxxxxxxx) {}
   }
+
+  void instanceOf() {
+    var a =
+      a &&
+      Foo.get(longlinelonglinelonglinelonglinelongline) instanceof
+      NumberNumberNumberNumber n &&
+      n.foo();
+
+    var a =
+      Foo.get(longlinelonglinelonglinelonglinelongline) instanceof
+      NumberNumberNumberNumber n &&
+      n.foo();
+  }
 }

packages/prettier-plugin-java/test/unit-test/binary_expressions/operator-position-end/_output.java

@@ -252,4 +252,17 @@ void parentheses() {
         uuuuuuuuuu + vvvvvvvvvv == wwwwwwwwww + xxxxxxxxxxx)
     ) {}
   }
+
+  void instanceOf() {
+    var a =
+      a &&
+      Foo.get(longlinelonglinelonglinelonglinelongline) instanceof
+        NumberNumberNumberNumber n &&
+      n.foo();
+
+    var a =
+      Foo.get(longlinelonglinelonglinelonglinelongline) instanceof
+        NumberNumberNumberNumber n &&
+      n.foo();
+  }
 }

packages/prettier-plugin-java/test/unit-test/binary_expressions/operator-position-start/_input.java

@@ -132,4 +132,17 @@ void parentheses() {
 
     if (aaaaaaaaaa + bbbbbbbbbb == cccccccccc + dddddddddd && eeeeeeeeee + ffffffffff == gggggggggg + hhhhhhhhhh || iiiiiiiiii + jjjjjjjjjj == kkkkkkkkkk + llllllllll && mmmmmmmmmm + nnnnnnnnnn == oooooooooo + pppppppppp || qqqqqqqqqq + rrrrrrrrrr == ssssssssss + tttttttttt && uuuuuuuuuu + vvvvvvvvvv == wwwwwwwwww + xxxxxxxxxxx) {}
   }
+
+  void instanceOf() {
+    var a =
+      a &&
+      Foo.get(longlinelonglinelonglinelonglinelongline) instanceof
+      NumberNumberNumberNumber n &&
+      n.foo();
+
+    var a =
+      Foo.get(longlinelonglinelonglinelonglinelongline) instanceof
+      NumberNumberNumberNumber n &&
+      n.foo();
+  }
 }

packages/prettier-plugin-java/test/unit-test/binary_expressions/operator-position-start/_output.java

@@ -245,4 +245,17 @@ void parentheses() {
         && uuuuuuuuuu + vvvvvvvvvv == wwwwwwwwww + xxxxxxxxxxx)
     ) {}
   }
+
+  void instanceOf() {
+    var a =
+      a
+      && Foo.get(longlinelonglinelonglinelonglinelongline)
+        instanceof NumberNumberNumberNumber n
+      && n.foo();
+
+    var a =
+      Foo.get(longlinelonglinelonglinelonglinelongline)
+        instanceof NumberNumberNumberNumber n
+      && n.foo();
+  }
 }