From 4e4cfdb874874443a05d5b83a7354a0f07511a7a Mon Sep 17 00:00:00 2001
From: Andrey Breslav <abreslav@Andrey-Breslavs-MacBook-Pro.local>
Date: Mon, 19 Sep 2011 04:32:36 -0500
Subject: [PATCH] Reverted "Elvis split", because it's broken, see KT-307
 Unresolved reference

---
 .../lang/parsing/JetExpressionParsing.java    |  2 -
 .../quick/regressions/kt307.jet               | 11 +++++
 idea/testData/psi/ElvisSplit.jet              |  2 -
 idea/testData/psi/ElvisSplit.txt              | 48 -------------------
 4 files changed, 11 insertions(+), 52 deletions(-)
 create mode 100644 idea/testData/checkerWithErrorTypes/quick/regressions/kt307.jet
 delete mode 100644 idea/testData/psi/ElvisSplit.jet
 delete mode 100644 idea/testData/psi/ElvisSplit.txt

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
index 3a99064cff3..2da63a0e2d6 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+++ b/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;
             }
 
diff --git a/idea/testData/checkerWithErrorTypes/quick/regressions/kt307.jet b/idea/testData/checkerWithErrorTypes/quick/regressions/kt307.jet
new file mode 100644
index 00000000000..bdd29c2979e
--- /dev/null
+++ b/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
+}
+}
diff --git a/idea/testData/psi/ElvisSplit.jet b/idea/testData/psi/ElvisSplit.jet
deleted file mode 100644
index 1651641d1d5..00000000000
--- a/idea/testData/psi/ElvisSplit.jet
+++ /dev/null
@@ -1,2 +0,0 @@
-val x = 1 : Int?:Any?
-val y = null ?: 1
\ No newline at end of file
diff --git a/idea/testData/psi/ElvisSplit.txt b/idea/testData/psi/ElvisSplit.txt
deleted file mode 100644
index 1048f76cd2e..00000000000
--- a/idea/testData/psi/ElvisSplit.txt
+++ /dev/null
@@ -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')
\ No newline at end of file