Drop JetWhenConditionWithExpression, replaced with JetWhenConditionIsPattern with JetExpressionPattern inside

idea/testData/psi/NewlinesInParentheses.txt

@@ -310,14 +310,15 @@ JetFile: NewlinesInParentheses.jet
               PsiElement(IDENTIFIER)('a')
           PsiWhiteSpace('\n    ')
           WHEN_ENTRY
-            WHEN_CONDITION_EXPRESSION
-              CALL_EXPRESSION
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('f')
-                PsiWhiteSpace('\n    ')
-                VALUE_ARGUMENT_LIST
-                  PsiElement(LPAR)('(')
-                  PsiElement(RPAR)(')')
+            WHEN_CONDITION_IS_PATTERN
+              EXPRESSION_PATTERN
+                CALL_EXPRESSION
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('f')
+                  PsiWhiteSpace('\n    ')
+                  VALUE_ARGUMENT_LIST
+                    PsiElement(LPAR)('(')
+                    PsiElement(RPAR)(')')
             PsiWhiteSpace(' ')
             PsiElement(DOUBLE_ARROW)('=>')
             PsiWhiteSpace(' ')

idea/testData/psi/When.txt

@@ -1146,35 +1146,39 @@ JetFile: When.jet
               PsiElement(IDENTIFIER)('c')
           PsiWhiteSpace('\n    ')
           WHEN_ENTRY
-            WHEN_CONDITION_EXPRESSION
-              INTEGER_CONSTANT
-                PsiElement(INTEGER_LITERAL)('1')
+            WHEN_CONDITION_IS_PATTERN
+              EXPRESSION_PATTERN
+                INTEGER_CONSTANT
+                  PsiElement(INTEGER_LITERAL)('1')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
-            WHEN_CONDITION_EXPRESSION
-              CALL_EXPRESSION
+            WHEN_CONDITION_IS_PATTERN
+              EXPRESSION_PATTERN
+                CALL_EXPRESSION
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('foo')
+                  VALUE_ARGUMENT_LIST
+                    PsiElement(LPAR)('(')
+                    PsiElement(RPAR)(')')
+            PsiElement(COMMA)(',')
+            PsiWhiteSpace(' ')
+            WHEN_CONDITION_IS_PATTERN
+              EXPRESSION_PATTERN
                 REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('foo')
-                VALUE_ARGUMENT_LIST
-                  PsiElement(LPAR)('(')
-                  PsiElement(RPAR)(')')
+                  PsiElement(IDENTIFIER)('bar')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
-            WHEN_CONDITION_EXPRESSION
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('bar')
-            PsiElement(COMMA)(',')
-            PsiWhiteSpace(' ')
-            WHEN_CONDITION_EXPRESSION
-              BINARY_EXPRESSION
-                INTEGER_CONSTANT
-                  PsiElement(INTEGER_LITERAL)('2')
-                PsiWhiteSpace(' ')
-                OPERATION_REFERENCE
-                  PsiElement(PLUS)('+')
-                PsiWhiteSpace(' ')
-                INTEGER_CONSTANT
-                  PsiElement(INTEGER_LITERAL)('3')
+            WHEN_CONDITION_IS_PATTERN
+              EXPRESSION_PATTERN
+                BINARY_EXPRESSION
+                  INTEGER_CONSTANT
+                    PsiElement(INTEGER_LITERAL)('2')
+                  PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
+                    PsiElement(PLUS)('+')
+                  PsiWhiteSpace(' ')
+                  INTEGER_CONSTANT
+                    PsiElement(INTEGER_LITERAL)('3')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n    ')
             WHEN_CONDITION_IS_PATTERN

idea/testData/psi/When_ERR.txt

@@ -80,9 +80,10 @@ JetFile: When_ERR.jet
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace('\n    ')
           WHEN_ENTRY
-            WHEN_CONDITION_EXPRESSION
-              PsiErrorElement:Expecting an element, is-condition or in-condition
-                <empty list>
+            WHEN_CONDITION_IS_PATTERN
+              EXPRESSION_PATTERN
+                PsiErrorElement:Expecting an element, is-condition or in-condition
+                  <empty list>
             PsiElement(DOUBLE_ARROW)('=>')
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION
@@ -161,9 +162,10 @@ JetFile: When_ERR.jet
           PsiElement(SEMICOLON)(';')
           PsiWhiteSpace('\n    ')
           WHEN_ENTRY
-            WHEN_CONDITION_EXPRESSION
-              PsiErrorElement:Expecting an element, is-condition or in-condition
-                <empty list>
+            WHEN_CONDITION_IS_PATTERN
+              EXPRESSION_PATTERN
+                PsiErrorElement:Expecting an element, is-condition or in-condition
+                  <empty list>
             PsiElement(DOUBLE_ARROW)('=>')
             PsiErrorElement:Expecting an element
               <empty list>

idea/testData/psi/examples/BinaryTree.txt

@@ -431,9 +431,10 @@ JetFile: BinaryTree.jet
                   PsiElement(LBRACE)('{')
                   PsiWhiteSpace('\n        ')
                   WHEN_ENTRY
-                    WHEN_CONDITION_EXPRESSION
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('EQ')
+                    WHEN_CONDITION_IS_PATTERN
+                      EXPRESSION_PATTERN
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('EQ')
                     PsiWhiteSpace(' ')
                     PsiElement(DOUBLE_ARROW)('=>')
                     PsiWhiteSpace(' ')
@@ -441,9 +442,10 @@ JetFile: BinaryTree.jet
                       PsiElement(true)('true')
                   PsiWhiteSpace('\n        ')
                   WHEN_ENTRY
-                    WHEN_CONDITION_EXPRESSION
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('LS')
+                    WHEN_CONDITION_IS_PATTERN
+                      EXPRESSION_PATTERN
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('LS')
                     PsiWhiteSpace(' ')
                     PsiElement(DOUBLE_ARROW)('=>')
                     PsiWhiteSpace(' ')
@@ -467,9 +469,10 @@ JetFile: BinaryTree.jet
                         PsiElement(RPAR)(')')
                   PsiWhiteSpace('\n        ')
                   WHEN_ENTRY
-                    WHEN_CONDITION_EXPRESSION
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('GT')
+                    WHEN_CONDITION_IS_PATTERN
+                      EXPRESSION_PATTERN
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('GT')
                     PsiWhiteSpace(' ')
                     PsiElement(DOUBLE_ARROW)('=>')
                     PsiWhiteSpace(' ')
@@ -707,9 +710,10 @@ JetFile: BinaryTree.jet
                   PsiElement(LBRACE)('{')
                   PsiWhiteSpace('\n        ')
                   WHEN_ENTRY
-                    WHEN_CONDITION_EXPRESSION
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('EQ')
+                    WHEN_CONDITION_IS_PATTERN
+                      EXPRESSION_PATTERN
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('EQ')
                     PsiWhiteSpace(' ')
                     PsiElement(DOUBLE_ARROW)('=>')
                     PsiWhiteSpace(' ')
@@ -717,9 +721,10 @@ JetFile: BinaryTree.jet
                       PsiElement(false)('false')
                   PsiWhiteSpace('\n        ')
                   WHEN_ENTRY
-                    WHEN_CONDITION_EXPRESSION
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('LS')
+                    WHEN_CONDITION_IS_PATTERN
+                      EXPRESSION_PATTERN
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('LS')
                     PsiWhiteSpace(' ')
                     PsiElement(DOUBLE_ARROW)('=>')
                     PsiWhiteSpace(' ')
@@ -745,9 +750,10 @@ JetFile: BinaryTree.jet
                         PsiElement(RPAR)(')')
                   PsiWhiteSpace('\n        ')
                   WHEN_ENTRY
-                    WHEN_CONDITION_EXPRESSION
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('GT')
+                    WHEN_CONDITION_IS_PATTERN
+                      EXPRESSION_PATTERN
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('GT')
                     PsiWhiteSpace(' ')
                     PsiElement(DOUBLE_ARROW)('=>')
                     PsiWhiteSpace(' ')
@@ -884,9 +890,10 @@ JetFile: BinaryTree.jet
                   PsiElement(LBRACE)('{')
                   PsiWhiteSpace('\n        ')
                   WHEN_ENTRY
-                    WHEN_CONDITION_EXPRESSION
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('EQ')
+                    WHEN_CONDITION_IS_PATTERN
+                      EXPRESSION_PATTERN
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('EQ')
                     PsiWhiteSpace(' ')
                     PsiElement(DOUBLE_ARROW)('=>')
                     PsiWhiteSpace(' ')
@@ -897,9 +904,10 @@ JetFile: BinaryTree.jet
                         PsiElement(false)('false')
                   PsiWhiteSpace('\n        ')
                   WHEN_ENTRY
-                    WHEN_CONDITION_EXPRESSION
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('LS')
+                    WHEN_CONDITION_IS_PATTERN
+                      EXPRESSION_PATTERN
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('LS')
                     PsiWhiteSpace(' ')
                     PsiElement(DOUBLE_ARROW)('=>')
                     PsiWhiteSpace('\n          ')
@@ -984,9 +992,10 @@ JetFile: BinaryTree.jet
                               PsiElement(RPAR)(')')
                   PsiWhiteSpace('\n        ')
                   WHEN_ENTRY
-                    WHEN_CONDITION_EXPRESSION
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('GT')
+                    WHEN_CONDITION_IS_PATTERN
+                      EXPRESSION_PATTERN
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('GT')
                     PsiWhiteSpace(' ')
                     PsiElement(DOUBLE_ARROW)('=>')
                     PsiWhiteSpace('\n          ')
@@ -1256,9 +1265,10 @@ JetFile: BinaryTree.jet
                   PsiElement(LBRACE)('{')
                   PsiWhiteSpace('\n        ')
                   WHEN_ENTRY
-                    WHEN_CONDITION_EXPRESSION
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('EQ')
+                    WHEN_CONDITION_IS_PATTERN
+                      EXPRESSION_PATTERN
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('EQ')
                     PsiWhiteSpace(' ')
                     PsiElement(DOUBLE_ARROW)('=>')
                     PsiWhiteSpace(' ')
@@ -1266,9 +1276,10 @@ JetFile: BinaryTree.jet
                       PsiElement(IDENTIFIER)('node')
                   PsiWhiteSpace('\n        ')
                   WHEN_ENTRY
-                    WHEN_CONDITION_EXPRESSION
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('LS')
+                    WHEN_CONDITION_IS_PATTERN
+                      EXPRESSION_PATTERN
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('LS')
                     PsiWhiteSpace(' ')
                     PsiElement(DOUBLE_ARROW)('=>')
                     PsiWhiteSpace(' ')
@@ -1287,9 +1298,10 @@ JetFile: BinaryTree.jet
                         PsiElement(RPAR)(')')
                   PsiWhiteSpace('\n        ')
                   WHEN_ENTRY
-                    WHEN_CONDITION_EXPRESSION
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('GT')
+                    WHEN_CONDITION_IS_PATTERN
+                      EXPRESSION_PATTERN
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('GT')
                     PsiWhiteSpace(' ')
                     PsiElement(DOUBLE_ARROW)('=>')
                     PsiWhiteSpace(' ')