Reverted "Elvis split", because it's broken, see

KT-307 Unresolved reference

compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java

@@ -106,9 +106,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
         COLON_AS(COLON, AS_KEYWORD, AS_SAFE) {
             @Override
             public JetNodeType parseRightHandSide(IElementType operation, JetExpressionParsing parser) {
-                parser.myBuilder.disableJoiningComplexTokens();
                 parser.myJetParsing.parseTypeRef();
-                parser.myBuilder.enableJoiningComplexTokens();
                 return BINARY_WITH_TYPE;
             }
 

idea/testData/checkerWithErrorTypes/quick/regressions/kt307.jet

@@ -0,0 +1,11 @@
+// KT-307 Unresolved reference
+
+open class AL {
+    fun get(i : Int) : Any? = i
+}
+
+trait ALE<T> : AL {
+fun getOrNull(index: Int, value: T) : T {
+return get(index) as? T ?: value
+}
+}

idea/testData/psi/ElvisSplit.jet

@@ -1,2 +0,0 @@
-val x = 1 : Int?:Any?
-val y = null ?: 1

idea/testData/psi/ElvisSplit.txt

@@ -1,48 +0,0 @@
-JetFile: ElvisSplit.jet
-  NAMESPACE
-    PROPERTY
-      PsiElement(val)('val')
-      PsiWhiteSpace(' ')
-      PsiElement(IDENTIFIER)('x')
-      PsiWhiteSpace(' ')
-      PsiElement(EQ)('=')
-      PsiWhiteSpace(' ')
-      BINARY_WITH_TYPE
-        BINARY_WITH_TYPE
-          INTEGER_CONSTANT
-            PsiElement(INTEGER_LITERAL)('1')
-          PsiWhiteSpace(' ')
-          OPERATION_REFERENCE
-            PsiElement(COLON)(':')
-          PsiWhiteSpace(' ')
-          TYPE_REFERENCE
-            NULLABLE_TYPE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('Int')
-              PsiElement(QUEST)('?')
-        OPERATION_REFERENCE
-          PsiElement(COLON)(':')
-        TYPE_REFERENCE
-          NULLABLE_TYPE
-            USER_TYPE
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('Any')
-            PsiElement(QUEST)('?')
-    PsiWhiteSpace('\n')
-    PROPERTY
-      PsiElement(val)('val')
-      PsiWhiteSpace(' ')
-      PsiElement(IDENTIFIER)('y')
-      PsiWhiteSpace(' ')
-      PsiElement(EQ)('=')
-      PsiWhiteSpace(' ')
-      BINARY_EXPRESSION
-        NULL
-          PsiElement(null)('null')
-        PsiWhiteSpace(' ')
-        OPERATION_REFERENCE
-          PsiElement(ELVIS)('?:')
-        PsiWhiteSpace(' ')
-        INTEGER_CONSTANT
-          PsiElement(INTEGER_LITERAL)('1')