From 6627e289a75571f4bdefd4bfcb3a59bd3fd1e43b Mon Sep 17 00:00:00 2001 From: Sebastian Zarnekow Date: Thu, 13 Aug 2015 10:35:52 +0200 Subject: [PATCH] [263773] Incorporated review comments --- .../src/org/eclipse/xtext/GrammarUtil.java | 6 ++++-- .../src/org/eclipse/xtext/enumrules/GrammarParserTest.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/GrammarUtil.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/GrammarUtil.java index d06da47b4..c9ed01841 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/GrammarUtil.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/GrammarUtil.java @@ -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; } diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GrammarParserTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GrammarParserTest.java index b5715dfee..052863f76 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GrammarParserTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/enumrules/GrammarParserTest.java @@ -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); } }