MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

minor

Browse Source
This commit is contained in:
peter
2011-03-21 13:38:10 +01:00
parent aca58ee45d
commit 6b98e1bf03
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/expressions/ExpressionStatement.java
+2 -2
View File
@@ -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 {
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/expressions/arguments/CommandArguments.java
+8 -12
View File
@@ -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);
}
}