From ca290e71ecfa9759db5803879d404f008cad0cc5 Mon Sep 17 00:00:00 2001 From: Moritz Eysholdt Date: Mon, 20 Apr 2015 15:39:49 +0200 Subject: [PATCH] [formatter] fix ITextRegionAccess#getInvokingGrammarElement(EObject) Make sure this method returns the same grammar element, no matter whether the text region access has been constructid via serializer or node model. Signed-off-by: Moritz Eysholdt --- .../regionaccess/internal/NodeModelBasedRegionAccess.java | 4 +++- .../regionaccess/internal/StringBasedRegionAccess.java | 2 ++ .../regionaccess/internal/StringEObjectRegion.java | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccess.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccess.java index 497608b2b..945fbe8ec 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccess.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccess.java @@ -7,6 +7,7 @@ *******************************************************************************/ package org.eclipse.xtext.formatting2.regionaccess.internal; +import java.util.List; import java.util.Map; import org.eclipse.emf.ecore.EObject; @@ -14,6 +15,7 @@ import org.eclipse.xtext.formatting2.regionaccess.IEObjectRegion; import org.eclipse.xtext.formatting2.regionaccess.ITextSegment; import org.eclipse.xtext.resource.XtextResource; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; /** @@ -63,5 +65,5 @@ public class NodeModelBasedRegionAccess extends AbstractRegionAccess { public boolean hasSyntaxError() { return resource.getParseResult().hasSyntaxErrors(); } - + } diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringBasedRegionAccess.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringBasedRegionAccess.java index b3d0757cb..c8265ada0 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringBasedRegionAccess.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringBasedRegionAccess.java @@ -7,6 +7,7 @@ *******************************************************************************/ package org.eclipse.xtext.formatting2.regionaccess.internal; +import java.util.List; import java.util.Map; import org.eclipse.emf.ecore.EObject; @@ -14,6 +15,7 @@ import org.eclipse.xtext.formatting2.regionaccess.IEObjectRegion; import org.eclipse.xtext.formatting2.regionaccess.ITextSegment; import org.eclipse.xtext.resource.XtextResource; +import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; /** diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringEObjectRegion.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringEObjectRegion.java index ff43decea..053202d53 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringEObjectRegion.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringEObjectRegion.java @@ -19,4 +19,5 @@ public class StringEObjectRegion extends AbstractEObjectRegion { this.setGrammarElement(grammarElement); this.setSemantcElement(semanticElement); } + } \ No newline at end of file