From 6f410eace1d8dde9b3db7452daf28b64ae54784a Mon Sep 17 00:00:00 2001
From: Andrey Breslav <abreslav@abreslav-mac.labs.intellij.net>
Date: Fri, 26 Aug 2011 21:39:31 +0400
Subject: [PATCH] Tests fixed

---
 idea/testData/psi/BabySteps.txt                | 4 +++-
 idea/testData/psi/BabySteps_ERR.txt            | 4 +++-
 idea/testData/psi/FunctionLiterals_ERR.txt     | 2 +-
 idea/testData/psi/Properties_ERR.txt           | 2 +-
 idea/testData/psi/examples/UpdateOperation.txt | 8 ++++++--
 idea/testData/psi/examples/With.txt            | 4 ++--
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/idea/testData/psi/BabySteps.txt b/idea/testData/psi/BabySteps.txt
index 7acbef60384..959b9d0b58b 100644
--- a/idea/testData/psi/BabySteps.txt
+++ b/idea/testData/psi/BabySteps.txt
@@ -47,7 +47,9 @@ JetFile: BabySteps.jet
           VALUE_ARGUMENT_LIST
             PsiElement(LPAR)('(')
             VALUE_ARGUMENT
-              PsiElement(IDENTIFIER)('d')
+              VALUE_ARGUMENT_NAME
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('d')
               PsiElement(EQ)('=')
               INTEGER_CONSTANT
                 PsiElement(INTEGER_LITERAL)('0')
diff --git a/idea/testData/psi/BabySteps_ERR.txt b/idea/testData/psi/BabySteps_ERR.txt
index 10f833378f0..b6c52df6421 100644
--- a/idea/testData/psi/BabySteps_ERR.txt
+++ b/idea/testData/psi/BabySteps_ERR.txt
@@ -47,7 +47,9 @@ JetFile: BabySteps_ERR.jet
           VALUE_ARGUMENT_LIST
             PsiElement(LPAR)('(')
             VALUE_ARGUMENT
-              PsiElement(IDENTIFIER)('d')
+              VALUE_ARGUMENT_NAME
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('d')
               PsiElement(EQ)('=')
               INTEGER_CONSTANT
                 PsiElement(INTEGER_LITERAL)('0')
diff --git a/idea/testData/psi/FunctionLiterals_ERR.txt b/idea/testData/psi/FunctionLiterals_ERR.txt
index b6544f93aae..846d93a7a81 100644
--- a/idea/testData/psi/FunctionLiterals_ERR.txt
+++ b/idea/testData/psi/FunctionLiterals_ERR.txt
@@ -298,7 +298,7 @@ JetFile: FunctionLiterals_ERR.jet
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(DOT)('.')
-            PsiErrorElement:To specify a receiverType type, use the full notation: {ReceiverType.(parameters) [: ReturnType] => ...}
+            PsiErrorElement:To specify a receiver type, use the full notation: {ReceiverType.(parameters) [: ReturnType] => ...}
               PsiElement(IDENTIFIER)('a')
               PsiWhiteSpace(' ')
               PsiElement(COLON)(':')
diff --git a/idea/testData/psi/Properties_ERR.txt b/idea/testData/psi/Properties_ERR.txt
index c5dd405d09c..b4a8fc99fb2 100644
--- a/idea/testData/psi/Properties_ERR.txt
+++ b/idea/testData/psi/Properties_ERR.txt
@@ -3,7 +3,7 @@ JetFile: Properties_ERR.jet
     PROPERTY
       PsiElement(var)('var')
       PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting property name or receiverType type
+      PsiErrorElement:Expecting property name or receiver type
         PsiElement(MINUS)('-')
       PsiWhiteSpace(' ')
       PsiErrorElement:Property getter or setter expected
diff --git a/idea/testData/psi/examples/UpdateOperation.txt b/idea/testData/psi/examples/UpdateOperation.txt
index 77631d3f417..c624c2a4f1c 100644
--- a/idea/testData/psi/examples/UpdateOperation.txt
+++ b/idea/testData/psi/examples/UpdateOperation.txt
@@ -166,7 +166,9 @@ JetFile: UpdateOperation.jet
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
             VALUE_ARGUMENT
-              PsiElement(IDENTIFIER)('x')
+              VALUE_ARGUMENT_NAME
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('x')
               PsiWhiteSpace(' ')
               PsiElement(EQ)('=')
               PsiWhiteSpace(' ')
@@ -196,7 +198,9 @@ JetFile: UpdateOperation.jet
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
             VALUE_ARGUMENT
-              PsiElement(IDENTIFIER)('y')
+              VALUE_ARGUMENT_NAME
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('y')
               PsiWhiteSpace(' ')
               PsiElement(EQ)('=')
               PsiWhiteSpace(' ')
diff --git a/idea/testData/psi/examples/With.txt b/idea/testData/psi/examples/With.txt
index 5a23d21e7a6..25fdde079e5 100644
--- a/idea/testData/psi/examples/With.txt
+++ b/idea/testData/psi/examples/With.txt
@@ -23,7 +23,7 @@ JetFile: With.jet
       VALUE_PARAMETER_LIST
         PsiElement(LPAR)('(')
         VALUE_PARAMETER
-          PsiElement(IDENTIFIER)('receiverType')
+          PsiElement(IDENTIFIER)('receiver')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
@@ -63,7 +63,7 @@ JetFile: With.jet
       PsiWhiteSpace(' ')
       DOT_QUALIFIED_EXPRESSION
         REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('receiverType')
+          PsiElement(IDENTIFIER)('receiver')
         PsiElement(DOT)('.')
         CALL_EXPRESSION
           REFERENCE_EXPRESSION