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

[473612] [serializer] don't loose causing exception

Browse source 
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
This commit is contained in:
Moritz Eysholdt 2015-08-06 10:29:15 +02:00
parent 88f88178f4
commit 30b3b0c1e7
4 changed files with 93 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/serializer/SerializerTester.java
View file

@ -36,6 +36,7 @@ import org.eclipse.xtext.util.EmfFormatter;
import org.eclipse.xtext.util.ITextRegion;
import org.eclipse.xtext.util.Pair;
import org.eclipse.xtext.util.Tuples;
import org.eclipse.xtext.xbase.lib.Exceptions;
import org.junit.Assert;
import com.google.common.base.Joiner;
@ -222,7 +223,8 @@ public class SerializerTester {
System.out.println("Serializer debug output:");
System.out.println(debug.toString());
}
throw new RuntimeException(t);
Exceptions.sneakyThrow(t);
return "";
}
}

62
plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/ISerializationDiagnostic.java
View file

@ -7,17 +7,25 @@
*******************************************************************************/
package org.eclipse.xtext.serializer.diagnostic;
import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.xtext.serializer.analysis.Context2NameFunction;
import org.eclipse.xtext.util.EmfFormatter;
import com.google.common.base.Joiner;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
/**
* @author Moritz Eysholdt - Initial contribution and API
*/
public interface ISerializationDiagnostic {
String EXCEPTION_DIAGNOSTIC = "exception diagnostic";
public interface Acceptor {
void accept(ISerializationDiagnostic diagnostic);
}
@ -59,22 +67,52 @@ public interface ISerializationDiagnostic {
public String getId() {
return EXCEPTION_DIAGNOSTIC;
}
@Override
public EStructuralFeature getEStructuralFeature() {
return null;
}
}
public class ToString {
public String toString(ISerializationDiagnostic diagnostic) {
List<String> result = Lists.newArrayList();
String msg = diagnostic.getMessage();
EObject eObject = diagnostic.getSemanticObject();
Throwable exception = diagnostic.getException();
if (!Strings.isNullOrEmpty(msg))
result.add(msg);
if (exception != null && exception.getMessage() != null && !exception.getMessage().equals(msg))
result.add("Caused By: " + exception.getClass().getName() + ": " + exception.getMessage());
if (eObject != null) {
result.add("Semantic Object: " + EmfFormatter.objPath(eObject));
if (eObject.eResource() != null && eObject.eResource().getURI() != null)
result.add("URI: " + eObject.eResource().getURI());
}
if (diagnostic.getContext() != null)
result.add("Context: " + new Context2NameFunction().getContextName(diagnostic.getContext()));
if (diagnostic.getEStructuralFeature() != null) {
EStructuralFeature feature = diagnostic.getEStructuralFeature();
EClass eClass = feature.getEContainingClass();
String nsPrefix = eClass.getEPackage().getNsPrefix();
result.add("EStructuralFeature: " + nsPrefix + "::" + eClass.getName() + "." + feature.getName());
}
return Joiner.on("\n").join(result);
}
}
public class ExceptionThrowingAcceptor implements Acceptor {
@Override
public void accept(ISerializationDiagnostic diagnostic) {
if (diagnostic == null || diagnostic.getMessage() == null)
if (diagnostic == null)
throw new RuntimeException("Something went wrong during serialization");
else if (diagnostic.getException() != null)
throw new RuntimeException(diagnostic.getException());
else {
String msg = diagnostic.getMessage();
if (diagnostic.getSemanticObject() != null)
msg += "\nSemantic Object: " + EmfFormatter.objPath(diagnostic.getSemanticObject());
if (diagnostic.getContext() != null)
msg += "\nContext: " + new Context2NameFunction().getContextName(diagnostic.getContext());
throw new RuntimeException(msg);
String msg = new ToString().toString(diagnostic);
Throwable exception = diagnostic.getException();
if (exception != null)
throw new RuntimeException(msg, exception);
else
throw new RuntimeException(msg);
}
}
}
@ -102,6 +140,8 @@ public interface ISerializationDiagnostic {
EObject getSemanticObject();
EObject getContext();
String getId();
EStructuralFeature getEStructuralFeature();
}

28
plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SerializationDiagnostic.java
View file

@ -7,10 +7,11 @@
*******************************************************************************/
package org.eclipse.xtext.serializer.diagnostic;
import static org.eclipse.xtext.serializer.impl.FeatureFinderUtil.*;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.xtext.AbstractElement;
import org.eclipse.xtext.serializer.impl.FeatureFinderUtil;
/**
* @author Moritz Eysholdt - Initial contribution and API
@ -26,10 +27,15 @@ public class SerializationDiagnostic implements ISerializationDiagnostic {
protected EObject context;
private String id;
private Throwable throwable;
public SerializationDiagnostic(String id, EObject semantic, AbstractElement element, String msg, Throwable exc) {
this(id, semantic, semantic != null ? getFeature(element, semantic.eClass()) : null, msg, exc);
}
public SerializationDiagnostic(String id, EObject semanticObject, AbstractElement element, String message) {
this(id, semanticObject, semanticObject != null ? FeatureFinderUtil.getFeature(element, semanticObject.eClass())
: null, message);
this(id, semanticObject, semanticObject != null ? getFeature(element, semanticObject.eClass()) : null, message);
}
public SerializationDiagnostic(String id, EObject semanticObject, EStructuralFeature feature, String message) {
@ -39,6 +45,15 @@ public class SerializationDiagnostic implements ISerializationDiagnostic {
this.message = message;
this.feature = feature;
}
public SerializationDiagnostic(String id, EObject semanticObject, EStructuralFeature feature, String message, Throwable throwable) {
super();
this.id = id;
this.semanticObject = semanticObject;
this.throwable = throwable;
this.feature = feature;
this.message = message;
}
public SerializationDiagnostic(String id, EObject semanticObject, EObject context, String message) {
super();
@ -59,7 +74,7 @@ public class SerializationDiagnostic implements ISerializationDiagnostic {
@Override
public Throwable getException() {
return null;
return throwable;
}
@Override
@ -81,4 +96,9 @@ public class SerializationDiagnostic implements ISerializationDiagnostic {
public String getId() {
return id;
}
@Override
public EStructuralFeature getEStructuralFeature() {
return feature;
}
}

18
plugins/org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/TokenDiagnosticProvider.java
View file

@ -16,17 +16,22 @@ import org.eclipse.xtext.CrossReference;
import org.eclipse.xtext.EnumLiteralDeclaration;
import org.eclipse.xtext.GrammarUtil;
import org.eclipse.xtext.RuleCall;
import org.eclipse.xtext.linking.impl.LinkingHelper;
import org.eclipse.xtext.scoping.IScope;
import org.eclipse.xtext.util.EmfFormatter;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.inject.Inject;
/**
* @author Moritz Eysholdt - Initial contribution and API
*/
public class TokenDiagnosticProvider implements ITokenDiagnosticProvider {
@Inject
private LinkingHelper linkingHelper;
protected String getFullReferenceName(EObject semanticObject, CrossReference reference) {
EReference ref = GrammarUtil.getReference(reference);
String clazz = semanticObject.eClass().getName();
@ -68,9 +73,16 @@ public class TokenDiagnosticProvider implements ITokenDiagnosticProvider {
}
@Override
public ISerializationDiagnostic getValueConversionExceptionDiagnostic(EObject semanticObject,
AbstractElement element, Object value, Throwable exception) {
return new SerializationDiagnostic(VALUE_CONVERSION_EXCEPTION, semanticObject, element, exception.getMessage());
public ISerializationDiagnostic getValueConversionExceptionDiagnostic(EObject semantic, AbstractElement element,
Object value, Throwable exception) {
String ruleName = linkingHelper.getRuleNameFrom(element);
StringBuilder msg = new StringBuilder();
msg.append("Error while converting value '");
msg.append(value);
msg.append("' for grammar rule '");
msg.append(ruleName);
msg.append("' to string via ValueConverter.");
return new SerializationDiagnostic(VALUE_CONVERSION_EXCEPTION, semantic, element, msg.toString(), exception);
}
}