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

[#483] Append trailing whitespaces and newlines after appending separator in for-loops

Browse source 
Signed-off-by: Thomas Kutz <thomas.kutz@itemis.de>
This commit is contained in:
Thomas Kutz 2017-09-29 13:40:36 +02:00
parent 25e2d9d381
commit 0b74443d41
4 changed files with 134 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/trace/node/TemplateNodeTest.xtend
View file

@ -77,6 +77,33 @@ class TemplateNodeTest {
''')
}
@Test def void testSeparatorLoopWithWhitespace() {
val strings = #['a', 'b', 'c']
assertEquals('''
«FOR s : strings SEPARATOR ', '»«s» «s»«ENDFOR»
''')
}
@Test def void testSeparatorLoopWithWhitespace2() {
val strings = #['a', 'b', 'c']
assertEquals('''
«FOR s : strings SEPARATOR ','»
«s» «s»
«ENDFOR»
''')
}
@Test def void testSeparatorLoopWithWhitespace3() {
val strings = #['a', 'b', 'c']
assertEquals('''
«FOR s : strings SEPARATOR ','»
«s»
«ENDFOR»
''')
}
@Test def void testIndentedIf() {
val condition = true
val string = 'foo'
@ -96,6 +123,8 @@ class TemplateNodeTest {
''')
}
@Test def void testIndentedTemplate() {
val StringConcatenationClient template = '''
sometimes foo

76
org.eclipse.xtext.tests/xtend-gen/org/eclipse/xtext/generator/trace/node/TemplateNodeTest.java
View file

@ -172,6 +172,82 @@ public class TemplateNodeTest {
this.assertEquals(_client);
}
@Test
public void testSeparatorLoopWithWhitespace() {
final List<String> strings = Collections.<String>unmodifiableList(CollectionLiterals.<String>newArrayList("a", "b", "c"));
StringConcatenationClient _client = new StringConcatenationClient() {
@Override
protected void appendTo(StringConcatenationClient.TargetStringConcatenation _builder) {
{
boolean _hasElements = false;
for(final String s : strings) {
if (!_hasElements) {
_hasElements = true;
} else {
_builder.appendImmediate(", ", "");
}
_builder.append(s);
_builder.append(" ");
_builder.append(s);
}
}
_builder.newLineIfNotEmpty();
}
};
this.assertEquals(_client);
}
@Test
public void testSeparatorLoopWithWhitespace2() {
final List<String> strings = Collections.<String>unmodifiableList(CollectionLiterals.<String>newArrayList("a", "b", "c"));
StringConcatenationClient _client = new StringConcatenationClient() {
@Override
protected void appendTo(StringConcatenationClient.TargetStringConcatenation _builder) {
{
boolean _hasElements = false;
for(final String s : strings) {
if (!_hasElements) {
_hasElements = true;
} else {
_builder.appendImmediate(",", "");
}
_builder.append(s);
_builder.append(" ");
_builder.append(s);
_builder.newLineIfNotEmpty();
}
}
}
};
this.assertEquals(_client);
}
@Test
public void testSeparatorLoopWithWhitespace3() {
final List<String> strings = Collections.<String>unmodifiableList(CollectionLiterals.<String>newArrayList("a", "b", "c"));
StringConcatenationClient _client = new StringConcatenationClient() {
@Override
protected void appendTo(StringConcatenationClient.TargetStringConcatenation _builder) {
{
boolean _hasElements = false;
for(final String s : strings) {
if (!_hasElements) {
_hasElements = true;
} else {
_builder.appendImmediate(",", "");
}
_builder.newLine();
_builder.append(s);
_builder.append(" ");
_builder.newLineIfNotEmpty();
_builder.newLine();
}
}
}
};
this.assertEquals(_client);
}
@Test
public void testIndentedIf() {
final boolean condition = true;

14
org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/node/TemplateNode.xtend
View file

@ -12,6 +12,7 @@ import com.google.common.collect.Iterables
import java.util.regex.Pattern
import org.eclipse.xtend2.lib.StringConcatenationClient
import org.eclipse.xtend2.lib.StringConcatenationClient.TargetStringConcatenation
import com.google.common.collect.Lists
/**
* A template node applies a {@link StringConcatenationClient} to compute its children.
@ -85,12 +86,17 @@ class TemplateNode extends CompositeGeneratorNode implements TargetStringConcate
}
override appendImmediate(Object object, String indentation) {
val removed = Lists.newArrayList
for (var i = currentParent.children.size - 1; i >= 0; i--) {
val node = currentParent.children.get(i)
if (node instanceof TextNode) {
if (!node.text.hasContent) {
currentParent.children.remove(i)
}
if (node instanceof TextNode && !(node as TextNode).text.hasContent) {
removed += currentParent.children.remove(i)
} else if (node instanceof NewLineNode) {
removed += currentParent.children.remove(i)
} else {
append(object, indentation)
removed.reverse.forEach[append(it, indentation)]
return
}
}
append(object, indentation)

24
org.eclipse.xtext/xtend-gen/org/eclipse/xtext/generator/trace/node/TemplateNode.java
View file

@ -9,15 +9,19 @@ package org.eclipse.xtext.generator.trace.node;
import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.function.Consumer;
import java.util.regex.Pattern;
import org.eclipse.xtend2.lib.StringConcatenationClient;
import org.eclipse.xtext.generator.trace.node.CompositeGeneratorNode;
import org.eclipse.xtext.generator.trace.node.GeneratorNodeExtensions;
import org.eclipse.xtext.generator.trace.node.IGeneratorNode;
import org.eclipse.xtext.generator.trace.node.IndentNode;
import org.eclipse.xtext.generator.trace.node.NewLineNode;
import org.eclipse.xtext.generator.trace.node.TextNode;
import org.eclipse.xtext.xbase.lib.CollectionLiterals;
import org.eclipse.xtext.xbase.lib.Functions.Function1;
@ -126,14 +130,24 @@ public class TemplateNode extends CompositeGeneratorNode implements StringConcat
@Override
public void appendImmediate(final Object object, final String indentation) {
final ArrayList<IGeneratorNode> removed = Lists.<IGeneratorNode>newArrayList();
for (int i = (this.currentParent.getChildren().size() - 1); (i >= 0); i--) {
{
final IGeneratorNode node = this.currentParent.getChildren().get(i);
if ((node instanceof TextNode)) {
boolean _hasContent = TemplateNode.hasContent(((TextNode)node).getText());
boolean _not = (!_hasContent);
if (_not) {
this.currentParent.getChildren().remove(i);
if (((node instanceof TextNode) && (!TemplateNode.hasContent(((TextNode) node).getText())))) {
IGeneratorNode _remove = this.currentParent.getChildren().remove(i);
removed.add(_remove);
} else {
if ((node instanceof NewLineNode)) {
IGeneratorNode _remove_1 = this.currentParent.getChildren().remove(i);
removed.add(_remove_1);
} else {
this.append(object, indentation);
final Consumer<IGeneratorNode> _function = (IGeneratorNode it) -> {
this.append(it, indentation);
};
ListExtensions.<IGeneratorNode>reverse(removed).forEach(_function);
return;
}
}
}