Object expressions marked

idea/src/org/jetbrains/jet/JetNodeTypes.java

@@ -100,6 +100,7 @@ public interface JetNodeTypes {
     JetNodeType MATCH_ENTRY = new JetNodeType("MATCH_ENTRY");
     JetNodeType PATTERN = new JetNodeType("PATTERN");
     JetNodeType TUPLE_PATTERN = new JetNodeType("TUPLE_PATTERN");
+    JetNodeType OBJECT_LITERAL = new JetNodeType("OBJECT_LITERAL");
 
     IElementType NAMESPACE_NAME = new JetNodeType("NAMESPACE_NAME");
 }

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

@@ -272,6 +272,8 @@ public class JetExpressionParsing extends AbstractJetParsing {
      *   ;
      */
     private void parseAtomicExpression() {
+
+        // TODO: namespace.a.b.C
 //        System.out.println("atom at "  + myBuilder.getTokenText());
 
 
@@ -1127,6 +1129,8 @@ public class JetExpressionParsing extends AbstractJetParsing {
     public void parseObjectLiteral() {
         assert at(OBJECT_KEYWORD);
 
+        PsiBuilder.Marker literal = mark();
+
         advance(); // OBJECT_KEYWORD
 
         if (at(LBRACE)) {
@@ -1138,6 +1142,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
                 myJetParsing.parseClassBody();
             }
         }
+        literal.done(OBJECT_LITERAL);
     }
 
     private void parseOneTokenExpression(JetNodeType type) {

idea/testData/psi/SimpleClassMembers.txt

@@ -175,6 +175,7 @@ JetFile: SimpleClassMembers.jet
                 CLASS_OBJECT
                   PsiElement(class)('class')
                   PsiWhiteSpace(' ')
+                  OBJECT_LITERAL
                     PsiElement(object)('object')
                     PsiWhiteSpace(' ')
                     CLASS_BODY
@@ -188,6 +189,7 @@ JetFile: SimpleClassMembers.jet
                   PsiWhiteSpace(' ')
                   PsiElement(class)('class')
                   PsiWhiteSpace(' ')
+                  OBJECT_LITERAL
                     PsiElement(object)('object')
                     PsiWhiteSpace(' ')
                     CLASS_BODY
@@ -201,6 +203,7 @@ JetFile: SimpleClassMembers.jet
                   PsiWhiteSpace(' ')
                   PsiElement(class)('class')
                   PsiWhiteSpace(' ')
+                  OBJECT_LITERAL
                     PsiElement(object)('object')
                     PsiWhiteSpace(' ')
                     DELEGATION_SPECIFIER_LIST
@@ -221,6 +224,7 @@ JetFile: SimpleClassMembers.jet
                   PsiWhiteSpace(' ')
                   PsiElement(class)('class')
                   PsiWhiteSpace(' ')
+                  OBJECT_LITERAL
                     PsiElement(object)('object')
                     PsiWhiteSpace(' ')
                     DELEGATION_SPECIFIER_LIST
@@ -252,6 +256,7 @@ JetFile: SimpleClassMembers.jet
                   PsiWhiteSpace(' ')
                   PsiElement(class)('class')
                   PsiWhiteSpace(' ')
+                  OBJECT_LITERAL
                     PsiElement(object)('object')
                     PsiWhiteSpace(' ')
                     DELEGATION_SPECIFIER_LIST
@@ -525,6 +530,7 @@ JetFile: SimpleClassMembers.jet
         CLASS_OBJECT
           PsiElement(class)('class')
           PsiWhiteSpace(' ')
+          OBJECT_LITERAL
             PsiElement(object)('object')
             PsiWhiteSpace(' ')
             CLASS_BODY
@@ -538,6 +544,7 @@ JetFile: SimpleClassMembers.jet
           PsiWhiteSpace(' ')
           PsiElement(class)('class')
           PsiWhiteSpace(' ')
+          OBJECT_LITERAL
             PsiElement(object)('object')
             PsiWhiteSpace(' ')
             CLASS_BODY
@@ -551,6 +558,7 @@ JetFile: SimpleClassMembers.jet
           PsiWhiteSpace(' ')
           PsiElement(class)('class')
           PsiWhiteSpace(' ')
+          OBJECT_LITERAL
             PsiElement(object)('object')
             PsiWhiteSpace(' ')
             DELEGATION_SPECIFIER_LIST
@@ -571,6 +579,7 @@ JetFile: SimpleClassMembers.jet
           PsiWhiteSpace(' ')
           PsiElement(class)('class')
           PsiWhiteSpace(' ')
+          OBJECT_LITERAL
             PsiElement(object)('object')
             PsiWhiteSpace(' ')
             DELEGATION_SPECIFIER_LIST
@@ -602,6 +611,7 @@ JetFile: SimpleClassMembers.jet
           PsiWhiteSpace(' ')
           PsiElement(class)('class')
           PsiWhiteSpace(' ')
+          OBJECT_LITERAL
             PsiElement(object)('object')
             PsiWhiteSpace(' ')
             DELEGATION_SPECIFIER_LIST

idea/testData/psi/SimpleExpressions.txt

@@ -426,6 +426,7 @@ JetFile: SimpleExpressions.jet
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
           PsiWhiteSpace(' ')
+          OBJECT_LITERAL
             PsiElement(object)('object')
             PsiWhiteSpace(' ')
             DELEGATION_SPECIFIER_LIST

idea/testData/psi/examples/AnonymousObjects.txt

@@ -18,6 +18,7 @@ JetFile: AnonymousObjects.jet
           VALUE_ARGUMENT_LIST
             PsiElement(LPAR)('(')
             VALUE_ARGUMENT
+              OBJECT_LITERAL
                 PsiElement(object)('object')
                 PsiWhiteSpace(' ')
                 DELEGATION_SPECIFIER_LIST
@@ -145,6 +146,7 @@ JetFile: AnonymousObjects.jet
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
           PsiWhiteSpace(' ')
+          OBJECT_LITERAL
             PsiElement(object)('object')
             PsiWhiteSpace(' ')
             CLASS_BODY

idea/testData/psi/examples/BinaryTree.txt

@@ -1668,6 +1668,7 @@ JetFile: BinaryTree.jet
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
           PsiWhiteSpace(' ')
+          OBJECT_LITERAL
             PsiElement(object)('object')
             PsiWhiteSpace(' ')
             DELEGATION_SPECIFIER_LIST

idea/testData/psi/examples/Builder.txt

@@ -9,6 +9,7 @@ JetFile: Builder.jet
       PsiWhiteSpace(' ')
       CALL_EXPRESSION
         DOT_QIALIFIED_EXPRESSION
+          OBJECT_LITERAL
             PsiElement(object)('object')
             PsiWhiteSpace(' ')
             DELEGATION_SPECIFIER_LIST

idea/testData/psi/examples/PolymorphicClassObjects.txt

@@ -129,6 +129,7 @@ JetFile: PolymorphicClassObjects.jet
         CLASS_OBJECT
           PsiElement(class)('class')
           PsiWhiteSpace(' ')
+          OBJECT_LITERAL
             PsiElement(object)('object')
             PsiWhiteSpace(' ')
             DELEGATION_SPECIFIER_LIST

idea/testData/psi/examples/UpdateOperation.txt

@@ -34,6 +34,7 @@ JetFile: UpdateOperation.jet
         CLASS_OBJECT
           PsiElement(class)('class')
           PsiWhiteSpace(' ')
+          OBJECT_LITERAL
             PsiElement(object)('object')
             PsiWhiteSpace(' ')
             CLASS_BODY

idea/testData/psi/examples/collections/ArrayList.txt

@@ -133,6 +133,7 @@ JetFile: ArrayList.jet
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
           PsiWhiteSpace(' ')
+          OBJECT_LITERAL
             PsiElement(object)('object')
             PsiWhiteSpace(' ')
             DELEGATION_SPECIFIER_LIST