From 0295b13cc7211ac1ee360481e93ccbdd49ef90eb Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 14 Jul 2015 17:14:33 +0200
Subject: [PATCH] couple more tuple leftovers

---
 .../kotlin/parsing/JetExpressionParsing.java   |  3 ---
 .../testData/psi/script/ShebangIncorrect.txt   | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetExpressionParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetExpressionParsing.java
index 41aef763d22..b91fb01d414 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetExpressionParsing.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetExpressionParsing.java
@@ -77,7 +77,6 @@ public class JetExpressionParsing extends AbstractJetParsing {
             COLONCOLON, // callable reference
 
             LPAR, // parenthesized
-            HASH, // Tuple
 
             // literal constant
             TRUE_KEYWORD, FALSE_KEYWORD,
@@ -88,8 +87,6 @@ public class JetExpressionParsing extends AbstractJetParsing {
             LBRACE, // functionLiteral
             FUN_KEYWORD, // expression function
 
-            LPAR, // tuple
-
             THIS_KEYWORD, // this
             SUPER_KEYWORD, // super
 
diff --git a/compiler/testData/psi/script/ShebangIncorrect.txt b/compiler/testData/psi/script/ShebangIncorrect.txt
index e1f21b76705..2a6d234577d 100644
--- a/compiler/testData/psi/script/ShebangIncorrect.txt
+++ b/compiler/testData/psi/script/ShebangIncorrect.txt
@@ -18,13 +18,17 @@ JetFile: ShebangIncorrect.kts
       PsiWhiteSpace(' ')
       PsiErrorElement:Expecting an element
         PsiElement(HASH)('#')
-      PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-        PsiElement(EXCL)('!')
-        PsiElement(DIV)('/')
-        PsiElement(IDENTIFIER)('usr')
-      PsiWhiteSpace('\n\n')
-      PsiErrorElement:Expecting an element
-        PsiElement(HASH)('#')
+      BINARY_EXPRESSION
+        PREFIX_EXPRESSION
+          OPERATION_REFERENCE
+            PsiElement(EXCL)('!')
+          PsiErrorElement:Expecting an element
+            PsiElement(DIV)('/')
+        OPERATION_REFERENCE
+          PsiElement(IDENTIFIER)('usr')
+        PsiWhiteSpace('\n\n')
+        PsiErrorElement:Expecting an element
+          PsiElement(HASH)('#')
       PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
         PsiElement(EXCL)('!')
         PsiElement(DIV)('/')