From babdd2a18c1c5de8df9235e2c53a0d5df6fd798b Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 31 May 2012 14:01:14 +0400
Subject: [PATCH] Cleanup

---
 .../com/intellij/lang/java/parser/ExpressionParser.java  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
index 1e2cebe67217..b65578b6df00 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
@@ -62,7 +62,7 @@ public class ExpressionParser {
   private static final TokenSet ARGS_LIST_END = TokenSet.create(JavaTokenType.RPARENTH, JavaTokenType.RBRACE, JavaTokenType.RBRACKET);
   private static final TokenSet ARGS_LIST_CONTINUE = TokenSet.create(
     JavaTokenType.IDENTIFIER, TokenType.BAD_CHARACTER, JavaTokenType.COMMA, JavaTokenType.INTEGER_LITERAL, JavaTokenType.STRING_LITERAL);
-  private static final TokenSet CONSTRUCTOR_CALL = TokenSet.create(JavaTokenType.THIS_KEYWORD, JavaTokenType.SUPER_KEYWORD);
+  private static final TokenSet THIS_OR_SUPER = TokenSet.create(JavaTokenType.THIS_KEYWORD, JavaTokenType.SUPER_KEYWORD);
 
   public ExpressionParser(DeclarationParser declarationParser, ReferenceParser referenceParser) {
     myDeclarationParser = declarationParser;
@@ -363,8 +363,7 @@ public class ExpressionParser {
           dotPos.drop();
           expr = parseNew(builder, expr);
         }
-        else if ((dotTokenType == JavaTokenType.THIS_KEYWORD || dotTokenType == JavaTokenType.SUPER_KEYWORD) &&
-                 exprType(expr) == JavaElementType.REFERENCE_EXPRESSION) {
+        else if (THIS_OR_SUPER.contains(dotTokenType) && exprType(expr) == JavaElementType.REFERENCE_EXPRESSION) {
           if (breakPoint == BreakPoint.P2 && builder.getCurrentOffset() == breakOffset) {
             dotPos.rollbackTo();
             startMarker.drop();
@@ -581,13 +580,13 @@ public class ExpressionParser {
       }
 
       tokenType = builder.getTokenType();
-      if (!CONSTRUCTOR_CALL.contains(tokenType)) {
+      if (!THIS_OR_SUPER.contains(tokenType)) {
         expr.rollbackTo();
         return null;
       }
     }
 
-    if (CONSTRUCTOR_CALL.contains(tokenType)) {
+    if (THIS_OR_SUPER.contains(tokenType)) {
       if (expr == null) {
         expr = builder.mark();
         builder.mark().done(JavaElementType.REFERENCE_PARAMETER_LIST);