Need references in decomposer's properties list.

idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java

@@ -330,10 +330,10 @@ public class JetExpressionParsing extends AbstractJetParsing {
         else if (at(IDENTIFIER)) {
             if (JetParsing.MODIFIER_KEYWORD_MAP.containsKey(myBuilder.getTokenText())) {
                 if (!parseLocalDeclaration()) {
-                    parseSimpleName();
+                    parseSimpleNameExpression();
                 }
             } else {
-                parseSimpleName();
+                parseSimpleNameExpression();
             }
         }
         else if (at(LBRACE)) {
@@ -544,7 +544,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
     /*
      * SimpleName
      */
-    private void parseSimpleName() {
+    public void parseSimpleNameExpression() {
         PsiBuilder.Marker simpleName = mark();
         expect(IDENTIFIER, "Expecting an identifier [Interal error]");
         simpleName.done(REFERENCE_EXPRESSION);

idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java

@@ -276,7 +276,11 @@ public class JetParsing extends AbstractJetParsing {
         if (!at(RPAR)) {
             while (true) {
                 parseAttributeList();
-                if (!expect(IDENTIFIER, "Expecting a property name", TokenSet.create(COMMA, RPAR))) {
+                if (at(IDENTIFIER)) {
+                    myExpressionParsing.parseSimpleNameExpression();
+                }
+                else {
+                    errorWithRecovery("Expecting a property name", TokenSet.create(COMMA, RPAR));
                     skipUntil(TokenSet.create(COMMA, RPAR, EOL_OR_SEMICOLON));
                 }
                 if (!at(COMMA)) {

idea/testData/psi/Decomposers.txt

@@ -5,9 +5,11 @@ JetFile: Decomposers.jet
       PsiWhiteSpace(' ')
       DECOMPOSER_PROPERTY_LIST
         PsiElement(LPAR)('(')
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('a')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('a')
         PsiElement(RPAR)(')')
     PsiWhiteSpace('\n')
@@ -50,9 +52,11 @@ JetFile: Decomposers.jet
       PsiElement(IDENTIFIER)('bar')
       DECOMPOSER_PROPERTY_LIST
         PsiElement(LPAR)('(')
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('a')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('a')
         PsiElement(RPAR)(')')
     PsiWhiteSpace('\n')
@@ -90,6 +94,7 @@ JetFile: Decomposers.jet
               PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('s')
         PsiElement(RPAR)(')')
     PsiWhiteSpace('\n')

idea/testData/psi/Decomposers_ERR.txt

@@ -5,6 +5,7 @@ JetFile: Decomposers_ERR.jet
       PsiWhiteSpace(' ')
       DECOMPOSER_PROPERTY_LIST
         PsiElement(LPAR)('(')
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('a')
         PsiErrorElement:Expecting ',' or a closing ')'
           <empty list>
@@ -48,6 +49,7 @@ JetFile: Decomposers_ERR.jet
           <empty list>
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('a')
         PsiElement(RPAR)(')')
     PsiWhiteSpace('\n')
@@ -86,6 +88,7 @@ JetFile: Decomposers_ERR.jet
               PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('s')
         PsiElement(COMMA)(',')
         PsiErrorElement:Expecting a property name
@@ -114,9 +117,11 @@ JetFile: Decomposers_ERR.jet
       PsiWhiteSpace(' ')
       DECOMPOSER_PROPERTY_LIST
         PsiElement(LPAR)('(')
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('a')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('a')
         PsiElement(RPAR)(')')
       PsiErrorElement:Cannot define an extension decomposer on a tuple
@@ -167,9 +172,11 @@ JetFile: Decomposers_ERR.jet
       PsiElement(IDENTIFIER)('bar')
       DECOMPOSER_PROPERTY_LIST
         PsiElement(LPAR)('(')
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('a')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('a')
         PsiElement(RPAR)(')')
     PsiErrorElement:Expecting namespace or top level declaration

idea/testData/psi/EOLsOnRollback.txt

@@ -61,6 +61,7 @@ JetFile: EOLsOnRollback.jet
           PsiWhiteSpace(' ')
           DECOMPOSER_PROPERTY_LIST
             PsiElement(LPAR)('(')
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('df')
             PsiElement(RPAR)(')')
         PsiWhiteSpace('\n\n    ')

idea/testData/psi/LocalDeclarations.txt

@@ -153,6 +153,7 @@ JetFile: LocalDeclarations.jet
               PsiElement(IDENTIFIER)('foo')
           DECOMPOSER_PROPERTY_LIST
             PsiElement(LPAR)('(')
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('bar')
             PsiElement(RPAR)(')')
         PsiWhiteSpace('\n')

idea/testData/psi/SimpleClassMembers.txt

@@ -93,12 +93,15 @@ JetFile: SimpleClassMembers.jet
               PsiWhiteSpace(' ')
               DECOMPOSER_PROPERTY_LIST
                 PsiElement(LPAR)('(')
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
                 PsiElement(COMMA)(',')
                 PsiWhiteSpace(' ')
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('b')
                 PsiElement(COMMA)(',')
                 PsiWhiteSpace(' ')
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('c')
                 PsiElement(RPAR)(')')
             PsiWhiteSpace('\n\n        ')
@@ -338,12 +341,15 @@ JetFile: SimpleClassMembers.jet
               PsiWhiteSpace(' ')
               DECOMPOSER_PROPERTY_LIST
                 PsiElement(LPAR)('(')
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
                 PsiElement(COMMA)(',')
                 PsiWhiteSpace(' ')
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('b')
                 PsiElement(COMMA)(',')
                 PsiWhiteSpace(' ')
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('c')
                 PsiElement(RPAR)(')')
             PsiWhiteSpace('\n\n        ')
@@ -433,12 +439,15 @@ JetFile: SimpleClassMembers.jet
           PsiWhiteSpace(' ')
           DECOMPOSER_PROPERTY_LIST
             PsiElement(LPAR)('(')
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('a')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('c')
             PsiElement(RPAR)(')')
         PsiWhiteSpace('\n\n    ')

idea/testData/psi/SimpleClassMembers_ERR.txt

@@ -85,12 +85,15 @@ JetFile: SimpleClassMembers_ERR.jet
           PsiWhiteSpace(' ')
           DECOMPOSER_PROPERTY_LIST
             PsiElement(LPAR)('(')
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('a')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('c')
             PsiErrorElement:Expecting ',' or a closing ')'
               <empty list>