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

compact

Browse Source
This commit is contained in:
peter
2011-03-21 13:38:10 +01:00
parent 6b98e1bf03
commit 5b4a212949
3 changed files with 65 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/typeDefinitions/TypeDefinition.java
+65 -4
View File
@@ -23,10 +23,11 @@ import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes;
import org.jetbrains.plugins.groovy.lang.parser.GroovyParser;
import org.jetbrains.plugins.groovy.lang.parser.parsing.auxiliary.Separators;
import org.jetbrains.plugins.groovy.lang.parser.parsing.statements.declaration.Declaration;
import org.jetbrains.plugins.groovy.lang.parser.parsing.statements.typeDefinitions.blocks.EnumBlock;
import org.jetbrains.plugins.groovy.lang.parser.parsing.statements.typeDefinitions.blocks.InterfaceBlock;
import org.jetbrains.plugins.groovy.lang.parser.parsing.auxiliary.modifiers.Modifiers;
import org.jetbrains.plugins.groovy.lang.parser.parsing.statements.typeDefinitions.members.ClassMember;
import org.jetbrains.plugins.groovy.lang.parser.parsing.statements.typeDefinitions.members.EnumConstant;
import org.jetbrains.plugins.groovy.lang.parser.parsing.statements.typeDefinitions.members.EnumConstants;
import org.jetbrains.plugins.groovy.lang.parser.parsing.statements.typeDefinitions.members.InterfaceMember;
import org.jetbrains.plugins.groovy.lang.parser.parsing.types.TypeParameters;
import org.jetbrains.plugins.groovy.lang.parser.parsing.util.ParserUtils;
@@ -101,7 +102,7 @@ public class TypeDefinition implements GroovyElementTypes {
ImplementsClause.parse(builder);
ParserUtils.getToken(builder, mNLS);
if (!InterfaceBlock.parse(builder, name, parser)) {
if (!parseInterfaceBlock(builder, name, parser)) {
builder.error(GroovyBundle.message("interface.body.expected"));
}
@@ -167,7 +168,7 @@ public class TypeDefinition implements GroovyElementTypes {
Separators.parse(builder);
EnumBlock.parse(builder, name, parser);
parseEnumBlock(builder, name, parser);
return true;
}
@@ -258,4 +259,64 @@ public class TypeDefinition implements GroovyElementTypes {
cbMarker.done(CLASS_BODY);
return true;
}
private static boolean parseEnumBlock(PsiBuilder builder, String enumName, GroovyParser parser) {
//see also InterfaceBlock, EnumBlock, AnnotationBlock
PsiBuilder.Marker ebMarker = builder.mark();
if (!ParserUtils.getToken(builder, mLCURLY)) {
ebMarker.rollbackTo();
return false;
}
Separators.parse(builder);
if (parseEnumConstantStart(builder, parser)) {
EnumConstants.parse(builder, parser);
} else {
ClassMember.parse(builder, enumName, parser);
}
while (Separators.parse(builder)) {
ClassMember.parse(builder, enumName, parser);
}
ParserUtils.getToken(builder, mRCURLY, GroovyBundle.message("rcurly.expected"));
ebMarker.done(ENUM_BODY);
return true;
}
private static boolean parseEnumConstantStart(PsiBuilder builder, GroovyParser parser) {
PsiBuilder.Marker checkMarker = builder.mark();
boolean result = !WRONGWAY.equals(EnumConstant.parse(builder, parser))
&& (ParserUtils.getToken(builder, mCOMMA)
|| ParserUtils.getToken(builder, mSEMI)
|| ParserUtils.getToken(builder, mNLS)
|| ParserUtils.getToken(builder, mRCURLY));
checkMarker.rollbackTo();
return result;
}
private static boolean parseInterfaceBlock(PsiBuilder builder, String interfaceName, GroovyParser parser) {
//see also InterfaceBlock, EnumBlock, AnnotationBlock
PsiBuilder.Marker ibMarker = builder.mark();
if (!ParserUtils.getToken(builder, mLCURLY)) {
ibMarker.rollbackTo();
return false;
}
while (!builder.eof() && builder.getTokenType() != mRCURLY) {
if (!InterfaceMember.parse(builder, interfaceName, parser)) builder.advanceLexer();
Separators.parse(builder);
}
ParserUtils.getToken(builder, mRCURLY, GroovyBundle.message("rcurly.expected"));
ibMarker.done(CLASS_BODY);
return true;
}
}
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/typeDefinitions/blocks/EnumBlock.java
-73
View File
@@ -1,73 +0,0 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.plugins.groovy.lang.parser.parsing.statements.typeDefinitions.blocks;
import com.intellij.lang.PsiBuilder;
import org.jetbrains.plugins.groovy.GroovyBundle;
import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes;
import org.jetbrains.plugins.groovy.lang.parser.GroovyParser;
import org.jetbrains.plugins.groovy.lang.parser.parsing.auxiliary.Separators;
import org.jetbrains.plugins.groovy.lang.parser.parsing.statements.typeDefinitions.members.ClassMember;
import org.jetbrains.plugins.groovy.lang.parser.parsing.statements.typeDefinitions.members.EnumConstant;
import org.jetbrains.plugins.groovy.lang.parser.parsing.statements.typeDefinitions.members.EnumConstants;
import org.jetbrains.plugins.groovy.lang.parser.parsing.util.ParserUtils;
/**
* @autor: Dmitry.Krasilschikov
* @date: 16.03.2007
*/
public class EnumBlock implements GroovyElementTypes {
public static boolean parse(PsiBuilder builder, String enumName, GroovyParser parser) {
//see also InterfaceBlock, EnumBlock, AnnotationBlock
PsiBuilder.Marker ebMarker = builder.mark();
if (!ParserUtils.getToken(builder, mLCURLY)) {
ebMarker.rollbackTo();
return false;
}
Separators.parse(builder);
if (parseEnumConstantStart(builder, parser)) {
EnumConstants.parse(builder, parser);
} else {
ClassMember.parse(builder, enumName, parser);
}
while (Separators.parse(builder)) {
ClassMember.parse(builder, enumName, parser);
}
ParserUtils.getToken(builder, mRCURLY, GroovyBundle.message("rcurly.expected"));
ebMarker.done(ENUM_BODY);
return true;
}
private static boolean parseEnumConstantStart(PsiBuilder builder, GroovyParser parser) {
PsiBuilder.Marker checkMarker = builder.mark();
boolean result = !WRONGWAY.equals(EnumConstant.parse(builder, parser))
&& (ParserUtils.getToken(builder, mCOMMA)
|| ParserUtils.getToken(builder, mSEMI)
|| ParserUtils.getToken(builder, mNLS)
|| ParserUtils.getToken(builder, mRCURLY));
checkMarker.rollbackTo();
return result;
}
}
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/typeDefinitions/blocks/InterfaceBlock.java
-51
View File
@@ -1,51 +0,0 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.plugins.groovy.lang.parser.parsing.statements.typeDefinitions.blocks;
import com.intellij.lang.PsiBuilder;
import org.jetbrains.plugins.groovy.GroovyBundle;
import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes;
import org.jetbrains.plugins.groovy.lang.parser.GroovyParser;
import org.jetbrains.plugins.groovy.lang.parser.parsing.auxiliary.Separators;
import org.jetbrains.plugins.groovy.lang.parser.parsing.statements.typeDefinitions.members.InterfaceMember;
import org.jetbrains.plugins.groovy.lang.parser.parsing.util.ParserUtils;
/**
* @autor: Dmitry.Krasilschikov
* @date: 16.03.2007
*/
public class InterfaceBlock implements GroovyElementTypes {
public static boolean parse(PsiBuilder builder, String interfaceName, GroovyParser parser) {
//see also InterfaceBlock, EnumBlock, AnnotationBlock
PsiBuilder.Marker ibMarker = builder.mark();
if (!ParserUtils.getToken(builder, mLCURLY)) {
ibMarker.rollbackTo();
return false;
}
while (!builder.eof() && builder.getTokenType() != mRCURLY) {
if (!InterfaceMember.parse(builder, interfaceName, parser)) builder.advanceLexer();
Separators.parse(builder);
}
ParserUtils.getToken(builder, mRCURLY, GroovyBundle.message("rcurly.expected"));
ibMarker.done(CLASS_BODY);
return true;
}
}