PY-12008 Add a bunch of tests covering various cases of malformed if statements

python/testData/formatter/multilineElifCondition.py

@@ -0,0 +1,9 @@
+if foo and \
+   bar == 42:
+    pass
+elif foo and \
+     bar:
+    pass
+elif foo and \
+     bar == 24:
+    pass

python/testData/formatter/multilineElifConditionInParentheses.py

@@ -0,0 +1,9 @@
+if (foo and
+        bar == 42):
+    pass
+elif (foo and
+      bar):
+    pass
+elif (foo and
+      bar == 24):
+    pass

python/testData/formatter/multilineElifConditionInParentheses_after.py

@@ -0,0 +1,9 @@
+if (foo and
+        bar == 42):
+    pass
+elif (foo and
+      bar):
+    pass
+elif (foo and
+      bar == 24):
+    pass

python/testData/formatter/multilineElifCondition_after.py

@@ -0,0 +1,9 @@
+if foo and \
+   bar == 42:
+    pass
+elif foo and \
+     bar:
+    pass
+elif foo and \
+     bar == 24:
+    pass

python/testData/formatter/multilineIfConditionComplex.py

@@ -0,0 +1,9 @@
+a = b = c = 0
+if (a and b and c or
+        a and b or
+        a or
+        a and b or
+        a and b and c or
+        a and b or
+        a):
+    pass

python/testData/formatter/multilineIfConditionComplex_after.py

@@ -0,0 +1,9 @@
+a = b = c = 0
+if (a and b and c or
+        a and b or
+        a or
+        a and b or
+        a and b and c or
+        a and b or
+        a):
+    pass

python/testData/formatter/multilineIfConditionInParenthesesKeywordAtEnd.py

@@ -0,0 +1,3 @@
+if (foo is None and
+        bar == 42):
+    pass

python/testData/formatter/multilineIfConditionInParenthesesKeywordAtEndSecondOperandIsReference.py

@@ -0,0 +1,3 @@
+if (foo == 42 and
+        bar):
+    pass

python/testData/formatter/multilineIfConditionInParenthesesKeywordAtEndSecondOperandIsReference_after.py

@@ -0,0 +1,3 @@
+if (foo == 42 and
+        bar):
+    pass

python/testData/formatter/multilineIfConditionInParenthesesKeywordAtEnd_after.py

@@ -0,0 +1,3 @@
+if (foo is None and
+        bar == 42):
+    pass

python/testData/formatter/multilineIfConditionInParenthesesKeywordAtStart.py

@@ -0,0 +1,3 @@
+if (foo is None
+        and bar == 42):
+    pass

python/testData/formatter/multilineIfConditionInParenthesesKeywordAtStart_after.py

@@ -0,0 +1,3 @@
+if (foo is None
+        and bar == 42):
+    pass

python/testData/formatter/multilineIfConditionInParenthesesNegatedKeywordAtEnd.py

@@ -0,0 +1,3 @@
+if not (foo == 42 or
+        bar == 42):
+    pass

python/testData/formatter/multilineIfConditionInParenthesesNegatedKeywordAtEnd_after.py

@@ -0,0 +1,3 @@
+if not (foo == 42 or
+        bar == 42):
+    pass

python/testData/formatter/multilineIfConditionInParenthesesNestedExpressions.py

@@ -0,0 +1,4 @@
+if (foo == 42 or
+        bar == 42 and
+        baz == 42):
+    pass

python/testData/formatter/multilineIfConditionInParenthesesNestedExpressions_after.py

@@ -0,0 +1,4 @@
+if (foo == 42 or
+        bar == 42 and
+        baz == 42):
+    pass

python/testData/formatter/multilineIfConditionKeywordAtEnd.py

@@ -0,0 +1,3 @@
+if foo is None and \
+        bar == 42:
+    pass

python/testData/formatter/multilineIfConditionKeywordAtEnd_after.py

@@ -0,0 +1,3 @@
+if foo is None and \
+        bar == 42:
+    pass

python/testData/formatter/multilineIfConditionKeywordAtStart.py

@@ -0,0 +1,3 @@
+if foo is None \
+        and bar == 42:
+    pass

python/testData/formatter/multilineIfConditionKeywordAtStart_after.py

@@ -0,0 +1,3 @@
+if foo is None \
+        and bar == 42:
+    pass

python/testData/formatter/multilineIfConditionLessComparisonsKeywordAtEnd.py

@@ -0,0 +1,3 @@
+if 1 < 4 and \
+        5 < 7:  # WRONG again, too many spaces
+    pass

python/testData/formatter/multilineIfConditionLessComparisonsKeywordAtEnd_after.py

@@ -0,0 +1,3 @@
+if 1 < 4 and \
+        5 < 7:  # WRONG again, too many spaces
+    pass

python/testData/formatter/multilineIfConditionNestedExpressions.py

@@ -0,0 +1,4 @@
+if foo == 42 or \
+        bar == 42 and \
+        baz == 42:
+    pass

python/testData/formatter/multilineIfConditionNestedExpressions_after.py

@@ -0,0 +1,4 @@
+if foo == 42 or \
+        bar == 42 and \
+        baz == 42:
+    pass

python/testSrc/com/jetbrains/python/PyFormatterTest.java

@@ -857,6 +857,56 @@ public class PyFormatterTest extends PyTestCase {
     doTest();
   }
 
+  public void testMultilineIfConditionKeywordAtEnd() {
+    doTest();
+  }
+
+  // PY-21328
+  public void testMultilineIfConditionLessComparisonsKeywordAtEnd() {
+    doTest();
+  }
+
+  public void testMultilineIfConditionKeywordAtStart() {
+    doTest();
+  }
+
+  public void testMultilineIfConditionInParenthesesKeywordAtEnd() {
+    doTest();
+  }
+
+  public void testMultilineIfConditionInParenthesesNegatedKeywordAtEnd() {
+    doTest();
+  }
+
+  public void testMultilineIfConditionInParenthesesKeywordAtEndSecondOperandIsReference() {
+    doTest();
+  }
+
+  public void testMultilineIfConditionInParenthesesKeywordAtStart() {
+    doTest();
+  }
+
+  public void testMultilineIfConditionNestedExpressions() {
+    doTest();
+  }
+
+  public void testMultilineIfConditionInParenthesesNestedExpressions() {
+    doTest();
+  }
+
+  public void testMultilineElifCondition() {
+    doTest();
+  }
+
+  public void testMultilineElifConditionInParentheses() {
+    doTest();
+  }
+
+  // PY-22035
+  public void testMultilineIfConditionComplex() {
+    doTest();
+  }
+
   public void testVariableAnnotations() {
     runWithLanguageLevel(LanguageLevel.PYTHON36, this::doTest);
   }