From caf7e80e5f191fc123e636aa26abefd4af217f1f Mon Sep 17 00:00:00 2001
From: Maxim Shafirov <max@maxbook.labs.intellij.net>
Date: Tue, 11 Jan 2011 17:44:14 +0300
Subject: [PATCH] Empty expression removed (wasn't brightest idea anyway).

---
 idea/src/org/jetbrains/jet/JetNodeTypes.java   |  1 -
 .../jet/lang/parsing/JetExpressionParsing.java |  7 +------
 .../jet/lang/psi/JetEmptyExpression.java       | 18 ------------------
 .../org/jetbrains/jet/lang/psi/JetVisitor.java |  4 ----
 .../jet/lang/psi/JetWhileExpression.java       |  2 +-
 idea/testData/psi/ControlStructures.txt        |  8 ++++----
 6 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 idea/src/org/jetbrains/jet/lang/psi/JetEmptyExpression.java

diff --git a/idea/src/org/jetbrains/jet/JetNodeTypes.java b/idea/src/org/jetbrains/jet/JetNodeTypes.java
index 9bcb075f802..052dec313e7 100644
--- a/idea/src/org/jetbrains/jet/JetNodeTypes.java
+++ b/idea/src/org/jetbrains/jet/JetNodeTypes.java
@@ -108,7 +108,6 @@ public interface JetNodeTypes {
     JetNodeType DOT_QIALIFIED_EXPRESSION  = new JetNodeType("DOT_QIALIFIED_EXPRESSION", JetDotQualifiedExpression.class);
     JetNodeType HASH_QIALIFIED_EXPRESSION = new JetNodeType("HASH_QIALIFIED_EXPRESSION", JetHashQualifiedExpression.class);
     JetNodeType SAFE_ACCESS_EXPRESSION    = new JetNodeType("SAFE_ACCESS_EXPRESSION", JetSafeQualifiedExpression.class);
-    JetNodeType EMPTY_EXPRESSION          = new JetNodeType("EMPTY_EXPRESSION", JetEmptyExpression.class);
     JetNodeType MATCH_BLOCK               = new JetNodeType("MATCH_BLOCK", JetMatchBlock.class);
     JetNodeType MATCH_ENTRY               = new JetNodeType("MATCH_ENTRY");
     JetNodeType PATTERN                   = new JetNodeType("PATTERN");
diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
index fd62c4fff05..e7c2f31bfde 100644
--- a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+++ b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
@@ -856,12 +856,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
      */
     private void parseControlStructureBody() {
         PsiBuilder.Marker body = mark();
-        if (at(SEMICOLON)) {
-            PsiBuilder.Marker mark = mark();
-            advance();
-            mark.done(EMPTY_EXPRESSION);
-        }
-        else {
+        if (!at(SEMICOLON)) {
             parseExpression();
         }
         body.done(BODY);
diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetEmptyExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetEmptyExpression.java
deleted file mode 100644
index 10de8856ffb..00000000000
--- a/idea/src/org/jetbrains/jet/lang/psi/JetEmptyExpression.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.jetbrains.jet.lang.psi;
-
-import com.intellij.lang.ASTNode;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author max
- */
-public class JetEmptyExpression extends JetExpression {
-    public JetEmptyExpression(@NotNull ASTNode node) {
-        super(node);
-    }
-
-    @Override
-    public void accept(JetVisitor visitor) {
-        visitor.visitEmptyExpression(this);
-    }
-}
diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java b/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java
index 622280009e7..76fe7a5afe3 100644
--- a/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java
+++ b/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java
@@ -325,8 +325,4 @@ public class JetVisitor extends PsiElementVisitor {
     public void visitMatchBlock(JetMatchBlock block) {
         visitJetElement(block);
     }
-
-    public void visitEmptyExpression(JetEmptyExpression expression) {
-        visitExpression(expression);
-    }
 }
diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java
index e6eb44165bc..1370d5c555d 100644
--- a/idea/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java
+++ b/idea/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java
@@ -23,7 +23,7 @@ public class JetWhileExpression extends JetExpression {
         return findExpressionUnder(JetNodeTypes.CONDITION);
     }
 
-    @Nullable @IfNotParsed
+    @Nullable
     public JetExpression getBody() {
         return findExpressionUnder(JetNodeTypes.BODY);
     }
diff --git a/idea/testData/psi/ControlStructures.txt b/idea/testData/psi/ControlStructures.txt
index 679dd747f83..8002e61c255 100644
--- a/idea/testData/psi/ControlStructures.txt
+++ b/idea/testData/psi/ControlStructures.txt
@@ -642,8 +642,8 @@ JetFile: ControlStructures.jet
                   PsiElement(IDENTIFIER)('b')
               PsiElement(RPAR)(')')
               BODY
-                EMPTY_EXPRESSION
-                  PsiElement(SEMICOLON)(';')
+                <empty list>
+            PsiElement(SEMICOLON)(';')
             PsiWhiteSpace('\n      ')
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
@@ -707,8 +707,8 @@ JetFile: ControlStructures.jet
                     PsiElement(IDENTIFIER)('b')
               PsiElement(RPAR)(')')
               BODY
-                EMPTY_EXPRESSION
-                  PsiElement(SEMICOLON)(';')
+                <empty list>
+            PsiElement(SEMICOLON)(';')
             PsiWhiteSpace('\n      ')
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')