From 62ee5370f791c113f15e80f72cd7165c57f25def Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 9 Aug 2010 21:10:55 +0400
Subject: [PATCH] Cleanup

---
 .../src/com/intellij/lang/impl/PsiBuilderImpl.java | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java b/platform/lang-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
index c04fc6be155d..7cb9ad66da4f 100644
--- a/platform/lang-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
+++ b/platform/lang-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
@@ -632,7 +632,7 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
   private boolean isEmpty(final int startIdx, final int endIdx) {
     for (int i = startIdx; i < endIdx; i++) {
       final IElementType token = myLexTypes[i];
-      if (!myWhitespaces.contains(token) && !myComments.contains(token)) return false;
+      if (!whitespaceOrComment(token)) return false;
     }
     return true;
   }
@@ -801,30 +801,24 @@ public class PsiBuilderImpl extends UserDataHolderBase implements PsiBuilder {
 
       if (item instanceof StartMarker && ((StartMarker)item).myDoneMarker.myTieToTheLeft) {
         int prevProductionLexIndex = fProduction.get(i - 1).myLexemeIndex;
-        IElementType prevTokenType;
         while (item.myLexemeIndex > prevProductionLexIndex &&
                item.myLexemeIndex - 1 < myLexemeCount &&
-               (myWhitespaces.contains(prevTokenType = myLexTypes[item.myLexemeIndex - 1]) ||
-                myComments.contains(prevTokenType))) {
+               whitespaceOrComment(myLexTypes[item.myLexemeIndex - 1])) {
           item.myLexemeIndex--;
         }
         ((StartMarker)item).myDoneMarker.myLexemeIndex = item.myLexemeIndex;
       }
       else if (item instanceof StartMarker) {
-        IElementType nextTokenType;
         while (item.myLexemeIndex < myLexemeCount &&
-               (myWhitespaces.contains(nextTokenType = myLexTypes[item.myLexemeIndex]) ||
-                myComments.contains(nextTokenType))) {
+               whitespaceOrComment(myLexTypes[item.myLexemeIndex])) {
           item.myLexemeIndex++;
         }
       }
       else if (item instanceof DoneMarker || item instanceof ErrorItem) {
         int prevProductionLexIndex = fProduction.get(i - 1).myLexemeIndex;
-        IElementType prevTokenType;
         while (item.myLexemeIndex > prevProductionLexIndex &&
                item.myLexemeIndex - 1 < myLexemeCount &&
-               (myWhitespaces.contains(prevTokenType = myLexTypes[item.myLexemeIndex - 1]) ||
-                myComments.contains(prevTokenType))) {
+               whitespaceOrComment(myLexTypes[item.myLexemeIndex - 1])) {
           item.myLexemeIndex--;
         }
       }