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

[xtext][fragments] Fixed NPE in TokenUtil

Browse source
This commit is contained in:
Sebastian Zarnekow 2015-11-13 10:19:41 +01:00
parent c292366748
commit 065936319d
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/org.eclipse.xtext/src/org/eclipse/xtext/parsetree/reconstr/impl/TokenUtil.java
View file

@ -9,7 +9,6 @@ package org.eclipse.xtext.parsetree.reconstr.impl;
import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.Action;
@ -53,9 +52,7 @@ public class TokenUtil {
if (node.getParent().hasDirectSemanticElement())
return node.getParent().getSemanticElement();
EObject parentGrammarElement = node.getParent().getGrammarElement();
boolean isParser = parentGrammarElement instanceof ParserRule
|| (parentGrammarElement instanceof RuleCall &&
((RuleCall) parentGrammarElement).getRule().getType().getClassifier() instanceof EClass);
boolean isParser = GrammarUtil.isEObjectRule(parentGrammarElement) || GrammarUtil.isEObjectRuleCall(parentGrammarElement);
for (INode sibling : node.getParent().getChildren())
if (sibling.hasDirectSemanticElement() && (isParser || sibling.getGrammarElement() instanceof Action))
return sibling.getSemanticElement();