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

XbaseUsageDetector for overridden rules

Browse source 
Fix XbaseUsageDetector for overridden rules, where the grammar is a
different one than org.eclipse.xtext.xbase.Xtype. Instead use
EcoreUtil2#isAssignableFrom.
This commit is contained in:
rubenporras 2022-02-04 09:00:03 +01:00 committed by rubenporras
parent 0c502352c7
commit f40dfb1e0d
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/xbase/XbaseUsageDetector.java
View file

@ -11,9 +11,11 @@ package org.eclipse.xtext.xtext.generator.xbase;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.EcoreUtil2;
import org.eclipse.xtext.Grammar;
import org.eclipse.xtext.GrammarUtil;
import org.eclipse.xtext.xtext.UsedRulesFinder;
import org.eclipse.xtext.xtext.generator.util.GrammarUtil2;
@ -35,7 +37,7 @@ public class XbaseUsageDetector {
new UsedRulesFinder(usedRules).compute(grammar);
for (AbstractRule it : usedRules) {
if ("XImportSection".equals(it.getName())
&& "org.eclipse.xtext.xbase.Xtype".equals(GrammarUtil.getGrammar(it).getName())) {
&& EcoreUtil2.isAssignableFrom((EClass) it.eResource().getResourceSet().getEObject(URI.createURI("http://www.eclipse.org/xtext/xbase/Xtype#//XImportSection"), true), (EClass) it.getType().getClassifier())) {
return true;
}
}