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

some annotations in code

Browse Source
This commit is contained in:
Maxim Medvedev
2011-04-08 12:18:48 +04:00
parent 7eaffc2742
commit 76ee833791
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/TryCatchStatement.java
+6 -6
View File
@@ -56,21 +56,21 @@ public class TryCatchStatement implements GroovyElementTypes {
parseHandlers(builder, parser);
}
if (kFINALLY.equals(builder.getTokenType()) |
ParserUtils.lookAhead(builder,mNLS, kFINALLY)) {
if (kFINALLY.equals(builder.getTokenType()) || ParserUtils.lookAhead(builder, mNLS, kFINALLY)) {
ParserUtils.getToken(builder, mNLS);
PsiBuilder.Marker finallyMarker = builder.mark();
warn = builder.mark();
ParserUtils.getToken(builder, kFINALLY);
ParserUtils.getToken(builder, mNLS);
if (!mLCURLY.equals(builder.getTokenType()) || !OpenOrClosableBlock.parseOpenBlock(builder, parser)) {
if (mLCURLY.equals(builder.getTokenType()) && OpenOrClosableBlock.parseOpenBlock(builder, parser)) {
warn.drop();
finallyMarker.done(FINALLY_CLAUSE);
}
else {
finallyMarker.drop();
warn.rollbackTo();
builder.error(GroovyBundle.message("expression.expected"));
} else {
warn.drop();
finallyMarker.done(FINALLY_CLAUSE);
}
}
marker.done(TRY_BLOCK_STATEMENT);
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrCatchClause.java
+3 -2
View File
@@ -12,8 +12,9 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter;
public interface GrCatchClause extends GrParametersOwner {
@Nullable
public GrParameter getParameter();
GrParameter getParameter();
public GrOpenBlock getBody();
@Nullable
GrOpenBlock getBody();
}
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrFinallyClause.java
+3 -1
View File
@@ -1,6 +1,7 @@
package org.jetbrains.plugins.groovy.lang.psi.api.statements;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrOpenBlock;
@@ -10,6 +11,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrOpenBlock;
*/
public interface GrFinallyClause extends GroovyPsiElement {
public GrOpenBlock getBody();
@NotNull
GrOpenBlock getBody();
}
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrFinallyClauseImpl.java
+2 -1
View File
@@ -38,8 +38,9 @@ public class GrFinallyClauseImpl extends GroovyPsiElementImpl implements GrFinal
return "Finally clause";
}
@NotNull
public GrOpenBlock getBody() {
return findChildByClass(GrOpenBlock.class);
return findNotNullChildByClass(GrOpenBlock.class);
}
}