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

[formatter] fix ITextRegionAccess#getInvokingGrammarElement(EObject)

Browse source 
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 <moritz.eysholdt@itemis.de>
This commit is contained in:
Moritz Eysholdt 2015-04-20 15:39:49 +02:00 committed by Sebastian Zarnekow
parent f318b5e6a3
commit ca290e71ec
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccess.java
View file

@ -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();
}
}

2
plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringBasedRegionAccess.java
View file

@ -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;
/**

1
plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/StringEObjectRegion.java
View file

@ -19,4 +19,5 @@ public class StringEObjectRegion extends AbstractEObjectRegion {
this.setGrammarElement(grammarElement);
this.setSemantcElement(semanticElement);
}
}