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

Merge pull request #325 from eclipse/msp_generatorErrorMessage

Browse source 
Improved error message of Xtext grammar validation
This commit is contained in:
Miro Spönemann 2017-04-27 08:43:54 +02:00 committed by GitHub
commit 82b2ad56a7
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
org.eclipse.xtext/src/org/eclipse/xtext/xtext/ecoreInference/EClassifierInfo.java
View file

@ -11,6 +11,7 @@ package org.eclipse.xtext.xtext.ecoreInference;
import java.util.Collection;
import java.util.Set;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.emf.ecore.EDataType;
@ -21,6 +22,7 @@ import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.EcoreFactory;
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.xtext.AbstractElement;
@ -204,6 +206,9 @@ public abstract class EClassifierInfo {
if (isAssignableByID(castedExistingType, castedExpectedType)) {
errorMessage.append("The type " + classifierToString(castedExistingType) + " used in the reference '" + name + "' is inconsistent. " +
"Probably this is due to an unsupported kind of metamodel hierarchy.");
} else if (castedExistingType instanceof InternalEObject && castedExistingType.eIsProxy()) {
URI proxyURI = ((InternalEObject) castedExistingType).eProxyURI();
errorMessage.append("The type of the reference '" + name + "' could not be resolved. The URI is " + proxyURI);
} else {
errorMessage.append("The existing reference '" + name + "' has an incompatible type " + classifierToString(castedExistingType) + ". " +
"The expected type is " + classifierToString(castedExpectedType) + ".");