From 6b98e1bf035ceeb5c9bb346f0d867f5fde8da523 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 21 Mar 2011 13:22:53 +0100
Subject: [PATCH] minor

---
 .../expressions/ExpressionStatement.java      |  4 ++--
 .../arguments/CommandArguments.java           | 20 ++++++++-----------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/expressions/ExpressionStatement.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/expressions/ExpressionStatement.java
index ba622c7e08b9..bfd397c46780 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/expressions/ExpressionStatement.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/expressions/ExpressionStatement.java
@@ -49,7 +49,7 @@ public class ExpressionStatement implements GroovyElementTypes {
         marker.drop();
         return PATH_METHOD_CALL;
       }
-      else if (CommandArguments.parse(builder, parser)) {
+      else if (CommandArguments.parseCommandArguments(builder, parser)) {
         marker.done(CALL_EXPRESSION);
         return CALL_EXPRESSION;
       }
@@ -111,7 +111,7 @@ public class ExpressionStatement implements GroovyElementTypes {
         exprStatement = exprStatement.precede();
         exprStatement.done(PATH_METHOD_CALL);
       }
-      else if (CommandArguments.parse(builder, parser)) {
+      else if (CommandArguments.parseCommandArguments(builder, parser)) {
         exprStatement.done(CALL_EXPRESSION);
       }
       else {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/expressions/arguments/CommandArguments.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/expressions/arguments/CommandArguments.java
index 41cd35bedd62..03d1cdd32765 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/expressions/arguments/CommandArguments.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/expressions/arguments/CommandArguments.java
@@ -28,12 +28,10 @@ import org.jetbrains.plugins.groovy.lang.parser.parsing.util.ParserUtils;
  */
 public class CommandArguments implements GroovyElementTypes {
 
-  public static boolean parse(PsiBuilder builder, GroovyParser parser) {
-
+  public static boolean parseCommandArguments(PsiBuilder builder, GroovyParser parser) {
     PsiBuilder.Marker marker = builder.mark();
     if (commandArgParse(builder, parser)) {
-      while (builder.getTokenType() == mCOMMA) {
-        ParserUtils.getToken(builder, mCOMMA);
+      while (ParserUtils.getToken(builder, mCOMMA)) {
         ParserUtils.getToken(builder, mNLS);
         if (!commandArgParse(builder, parser)) {
           builder.error(GroovyBundle.message("expression.expected"));
@@ -43,10 +41,9 @@ public class CommandArguments implements GroovyElementTypes {
       marker.done(COMMAND_ARGUMENTS);
       return true;
     }
-    else {
-      marker.drop();
-      return false;
-    }
+
+    marker.drop();
+    return false;
   }
 
   private static boolean commandArgParse(PsiBuilder builder, GroovyParser parser) {
@@ -62,9 +59,8 @@ public class CommandArguments implements GroovyElementTypes {
       }
       return true;
     }
-    else {
-      commandMarker.drop();
-      return ExpressionStatement.argParse(builder, parser);
-    }
+
+    commandMarker.drop();
+    return ExpressionStatement.argParse(builder, parser);
   }
 }