sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 08:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[263773] Incorporated review comments

Browse source
This commit is contained in:
Sebastian Zarnekow 2015-08-13 10:35:52 +02:00
parent 9572595662
commit 6627e289a7
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/org.eclipse.xtext/src/org/eclipse/xtext/GrammarUtil.java
View file

@ -194,9 +194,11 @@ public class GrammarUtil {
public static boolean isEObjectRule(EObject grammarElement) {
if (grammarElement instanceof ParserRule) {
ParserRule rule = (ParserRule) grammarElement;
if (rule.isWildcard()) {
return true;
}
TypeRef type = rule.getType();
// wildcard fragments are considered to be EObjectRules, too
return type == null || type.getClassifier() instanceof EClass;
return type != null && type.getClassifier() instanceof EClass;
}
return false;
}

2
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GrammarParserTest.java
View file

@ -278,6 +278,6 @@ public class GrammarParserTest extends AbstractEnumRulesTest {
assertEquals(grammar.eResource().getErrors().toString(), 1, grammar.eResource().getErrors().size());
TransformationDiagnostic diag = (TransformationDiagnostic) grammar.eResource().getErrors().get(0);
int offset = diag.getOffset();
assertEquals(modelAsString.lastIndexOf("enum ExistingEnum"), offset);
assertEquals(modelAsString.lastIndexOf("ExistingEnum"), offset);
}
}