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

added logging to inform the user that calling the formatter with an non resource eobject is a bad idea

Browse source 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
This commit is contained in:
Christian Dietrich 2017-05-18 11:32:36 +02:00
parent f60ead2a56
commit 9158fdbed0
2 changed files with 13 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/formatting/impl/AbstractDeclarativeFormatter.java
View file

@ -13,6 +13,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import org.apache.log4j.Logger;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.EcoreUtil2;
@ -34,6 +35,8 @@ import com.google.inject.Singleton;
*/
public abstract class AbstractDeclarativeFormatter extends BaseFormatter {
private static final Logger log = Logger.getLogger(AbstractDeclarativeFormatter.class);
@Singleton
protected static class ConfigStore {
protected FormattingConfig config;
@ -71,6 +74,8 @@ public abstract class AbstractDeclarativeFormatter extends BaseFormatter {
public ITokenStream createFormatterStream(EObject context, String indent, ITokenStream out, boolean preserveWhitespaces) {
if(context != null && context.eResource() != null && context.eResource().getURI() != null) {
contextResourceURI = EcoreUtil2.getPlatformResourceOrNormalizedURI(context).trimFragment();
} else if (context != null && context.eResource() == null) {
log.error("Model has no XtextResource. This is likely to cause follow-up errors");
}
return new FormattingConfigBasedStream(out, indent, getConfig(), createMatcher(), hiddenTokenHelper,
preserveWhitespaces);

8
org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/TextRegionAccessBuildingSequencer.java
View file

@ -9,12 +9,14 @@ package org.eclipse.xtext.formatting2.regionaccess.internal;
import java.util.LinkedList;
import org.apache.log4j.Logger;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.AbstractElement;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.Action;
import org.eclipse.xtext.Keyword;
import org.eclipse.xtext.RuleCall;
import org.eclipse.xtext.generator.trace.internal.AbstractTraceForURIProvider;
import org.eclipse.xtext.nodemodel.ICompositeNode;
import org.eclipse.xtext.nodemodel.ILeafNode;
import org.eclipse.xtext.resource.XtextResource;
@ -24,6 +26,9 @@ import org.eclipse.xtext.serializer.analysis.SerializationContext;
import org.eclipse.xtext.util.Strings;
public class TextRegionAccessBuildingSequencer implements ISequenceAcceptor {
private static final Logger log = Logger.getLogger(TextRegionAccessBuildingSequencer.class);
private StringHiddenRegion last;
private StringBasedRegionAccess regionAccess;
private final LinkedList<AbstractEObjectRegion> stack = new LinkedList<AbstractEObjectRegion>();
@ -201,6 +206,9 @@ public class TextRegionAccessBuildingSequencer implements ISequenceAcceptor {
}
public TextRegionAccessBuildingSequencer withRoot(ISerializationContext ctx, EObject root) {
if (root.eResource() == null) {
log.error("Root has no XtextResource. This is likely to cause follow-up errors");
}
this.regionAccess = new StringBasedRegionAccess((XtextResource) root.eResource());
this.last = createHiddenRegion();
this.regionAccess.setRootEObject(enterEObject(((SerializationContext) ctx).getActionOrRule(), root));