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

[formatter] fixed a spelling mistake in a class name

Browse source 
Change-Id: I959d92ba25319d72c0d1cd7bde44526c3e21c309
This commit is contained in:
Moritz Eysholdt 2015-01-29 10:50:03 +01:00
parent 1a18741b00
commit 9f674e43c3
7 changed files with 17 additions and 17 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/formatter/FormatterTester.java
View file

@ -20,7 +20,7 @@ import org.eclipse.xtext.formatting2.ITextReplacement;
import org.eclipse.xtext.formatting2.TextReplacements;
import org.eclipse.xtext.formatting2.debug.TextRegionsToString;
import org.eclipse.xtext.formatting2.regionaccess.ITextRegionAccess;
import org.eclipse.xtext.formatting2.regionaccess.internal.NodeModelBaseRegionAccess;
import org.eclipse.xtext.formatting2.regionaccess.internal.NodeModelBasedRegionAccess;
import org.eclipse.xtext.junit4.util.ParseHelper;
import org.eclipse.xtext.nodemodel.INode;
import org.eclipse.xtext.nodemodel.SyntaxErrorMessage;
@ -50,7 +50,7 @@ public class FormatterTester {
private Provider<FormatterTestRequest> formatterRequestProvider;
@Inject
private Provider<NodeModelBaseRegionAccess.Builder> nodeModelTokenAccessBuilderProvider;
private Provider<NodeModelBasedRegionAccess.Builder> nodeModelTokenAccessBuilderProvider;
@Inject
private ParseHelper<EObject> parseHelper;

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

@ -19,9 +19,9 @@ import org.eclipse.xtext.nodemodel.INode;
*/
public class EObjectTokens extends AbstractEObjectTokens {
private final INode node;
private final NodeModelBaseRegionAccess tokenAccess;
private final NodeModelBasedRegionAccess tokenAccess;
public EObjectTokens(NodeModelBaseRegionAccess tokenAccess, INode node) {
public EObjectTokens(NodeModelBasedRegionAccess tokenAccess, INode node) {
super();
this.tokenAccess = tokenAccess;
this.node = node;

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

@ -21,7 +21,7 @@ public class NodeHidden extends NodeRegion implements IHiddenRegionPart {
private final HiddenRegion hiddenRegion;
protected NodeHidden(HiddenRegion gap, INode node) {
super((NodeModelBaseRegionAccess) gap.getTextRegionAccess(), node);
super((NodeModelBasedRegionAccess) gap.getTextRegionAccess(), node);
this.hiddenRegion = gap;
}

16
plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBaseRegionAccess.java → plugins/org.eclipse.xtext/src/org/eclipse/xtext/formatting2/regionaccess/internal/NodeModelBasedRegionAccess.java
View file

@ -35,7 +35,7 @@ import com.google.common.collect.Maps;
/**
* @author Moritz Eysholdt - Initial contribution and API
*/
public class NodeModelBaseRegionAccess extends AbstractRegionAccess {
public class NodeModelBasedRegionAccess extends AbstractRegionAccess {
public static class Builder extends AbstractRegionAccess.Builder {
@ -45,7 +45,7 @@ public class NodeModelBaseRegionAccess extends AbstractRegionAccess {
private EObjectTokens lastTokens;
private XtextResource resource;
protected boolean add(NodeModelBaseRegionAccess tokenAccess, INode node) {
protected boolean add(NodeModelBasedRegionAccess tokenAccess, INode node) {
EObject semanticElement = tokenAccess.findSemanticElement(node);
if (lastTokens == null || semanticElement != lastTokens.getSemanticElement())
lastTokens = eObjToTokens.get(semanticElement);
@ -100,8 +100,8 @@ public class NodeModelBaseRegionAccess extends AbstractRegionAccess {
return result;
}
public NodeModelBaseRegionAccess create() {
NodeModelBaseRegionAccess tokenAccess = new NodeModelBaseRegionAccess(this);
public NodeModelBasedRegionAccess create() {
NodeModelBasedRegionAccess tokenAccess = new NodeModelBasedRegionAccess(this);
// System.out.println(tokenAccess);
return tokenAccess;
}
@ -117,11 +117,11 @@ public class NodeModelBaseRegionAccess extends AbstractRegionAccess {
return new NodeWhitespace(gap, node);
}
protected NodeSemanticRegion createToken(NodeModelBaseRegionAccess tokenAccess, INode node) {
protected NodeSemanticRegion createToken(NodeModelBasedRegionAccess tokenAccess, INode node) {
return new NodeSemanticRegion(tokenAccess, node);
}
protected EObjectTokens createTokens(NodeModelBaseRegionAccess access, INode node) {
protected EObjectTokens createTokens(NodeModelBasedRegionAccess access, INode node) {
return new EObjectTokens(access, node);
}
@ -131,7 +131,7 @@ public class NodeModelBaseRegionAccess extends AbstractRegionAccess {
this.lastTokenOrGap = null;
this.lastTokens = null;
this.firstToken = null;
NodeModelBaseRegionAccess access = (NodeModelBaseRegionAccess) tokenAccess;
NodeModelBasedRegionAccess access = (NodeModelBasedRegionAccess) tokenAccess;
ICompositeNode rootNode = resource.getParseResult().getRootNode();
TreeIterator<INode> iterator = rootNode.getAsTreeIterable().iterator();
while (iterator.hasNext()) {
@ -229,7 +229,7 @@ public class NodeModelBaseRegionAccess extends AbstractRegionAccess {
}
}
protected NodeModelBaseRegionAccess(Builder builder) {
protected NodeModelBasedRegionAccess(Builder builder) {
super(builder);
}

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

@ -18,9 +18,9 @@ import org.eclipse.xtext.nodemodel.INode;
*/
public class NodeRegion extends AbstractTextSegment {
private final INode node;
private final NodeModelBaseRegionAccess tokenAccess;
private final NodeModelBasedRegionAccess tokenAccess;
protected NodeRegion(NodeModelBaseRegionAccess tokenAccess, INode node) {
protected NodeRegion(NodeModelBasedRegionAccess tokenAccess, INode node) {
super();
this.tokenAccess = tokenAccess;
this.node = node;

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

@ -21,7 +21,7 @@ public class NodeSemanticRegion extends NodeRegion implements ISemanticRegion {
private IHiddenRegion leading;
private IHiddenRegion trailing;
protected NodeSemanticRegion(NodeModelBaseRegionAccess tokenAccess, INode node) {
protected NodeSemanticRegion(NodeModelBasedRegionAccess tokenAccess, INode node) {
super(tokenAccess, node);
}

2
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTest.xtend
View file

@ -96,7 +96,7 @@ class RegionAccessTest {
private def ===(CharSequence file, CharSequence expectation) {
val obj = parseHelper.parse(file)
val access = new NodeModelBaseRegionAccess.Builder().withResource(obj.eResource as XtextResource).create
val access = new org.eclipse.xtext.formatting2.regionaccess.internal.NodeModelBasedRegionAccess.Builder().withResource(obj.eResource as XtextResource).create
val actual = new TokenAccessToString().withOrigin(access).hideColumnExplanation().toString
Assert.assertEquals(expectation.toString, actual + "\n")
}