mirror of
https://github.com/sigmasternchen/xtext-core
synced 2025-03-15 16:28:56 +00:00
Fixed spaces after ML comments in format(#1543)
When customizing the formatter to consider indentation + spaces, ML comments are prepended with a space. This patch fixes that.
This commit is contained in:
Titouan Vervack
GitHub
parent
6cbbe8f608
commit
c15d749416
6 changed files with 990 additions and 91 deletions
|
|
@ -9,8 +9,10 @@
|
|||
package org.eclipse.xtext.formatting2.internal
|
||||
|
||||
import com.google.inject.Inject
|
||||
import org.eclipse.xtext.formatting2.IFormattableDocument
|
||||
import org.eclipse.xtext.formatting2.internal.formattertestlanguage.IDList
|
||||
import org.eclipse.xtext.formatting2.internal.tests.FormatterTestLanguageInjectorProvider
|
||||
import org.eclipse.xtext.formatting2.regionaccess.ITextRegionExtensions
|
||||
import org.eclipse.xtext.testing.InjectWith
|
||||
import org.eclipse.xtext.testing.XtextRunner
|
||||
import org.junit.Test
|
||||
|
|
@ -23,7 +25,12 @@ import org.junit.runner.RunWith
|
|||
@InjectWith(FormatterTestLanguageInjectorProvider)
|
||||
class CommentFormatterTest {
|
||||
@Inject extension GenericFormatterTester
|
||||
//@Inject extension FormatterTestLanguageGrammarAccess
|
||||
|
||||
static class CustomFormatter extends GenericFormatter<IDList> {
|
||||
override format(IDList model, ITextRegionExtensions regionAccess, extension IFormattableDocument document) {
|
||||
model.regionFor.keyword("idlist").append[oneSpace]
|
||||
}
|
||||
}
|
||||
|
||||
@Test def void SL_inline() {
|
||||
assertFormatted[
|
||||
|
|
@ -31,9 +38,7 @@ class CommentFormatterTest {
|
|||
idlist //x
|
||||
a
|
||||
'''
|
||||
formatter = [ IDList model, extension regions, extension document |
|
||||
model.regionFor.keyword("idlist").append[oneSpace]
|
||||
]
|
||||
formatter = new CustomFormatter()
|
||||
expectation = '''
|
||||
idlist //x
|
||||
a
|
||||
|
|
@ -51,9 +56,7 @@ class CommentFormatterTest {
|
|||
|
||||
a
|
||||
'''
|
||||
formatter = [ IDList model, extension regions, extension document |
|
||||
model.regionFor.keyword("idlist").append[oneSpace]
|
||||
]
|
||||
formatter = new CustomFormatter()
|
||||
expectation = '''
|
||||
idlist //x
|
||||
a
|
||||
|
|
@ -66,14 +69,24 @@ class CommentFormatterTest {
|
|||
toBeFormatted = '''
|
||||
idlist /*x*/ a
|
||||
'''
|
||||
formatter = [ IDList model, extension regions, extension document |
|
||||
model.regionFor.keyword("idlist").append[oneSpace]
|
||||
]
|
||||
formatter = new CustomFormatter()
|
||||
expectation = '''
|
||||
idlist /*x*/ a
|
||||
'''
|
||||
]
|
||||
}
|
||||
|
||||
@Test def void MLSL_double_inline() {
|
||||
assertFormatted[
|
||||
toBeFormatted = '''
|
||||
idlist /*x*//*y*/ a
|
||||
'''
|
||||
formatter = new CustomFormatter()
|
||||
expectation = '''
|
||||
idlist /*x*/ /*y*/ a
|
||||
'''
|
||||
]
|
||||
}
|
||||
|
||||
@Test def void MLSL_paragraph() {
|
||||
assertFormatted[
|
||||
|
|
@ -86,9 +99,7 @@ class CommentFormatterTest {
|
|||
|
||||
a
|
||||
'''
|
||||
formatter = [ IDList model, extension regions, extension document |
|
||||
model.regionFor.keyword("idlist").append[oneSpace]
|
||||
]
|
||||
formatter = new CustomFormatter()
|
||||
expectation = '''
|
||||
idlist /*x*/
|
||||
a
|
||||
|
|
@ -103,9 +114,7 @@ class CommentFormatterTest {
|
|||
x
|
||||
*/ a
|
||||
'''
|
||||
formatter = [ IDList model, extension regions, extension document |
|
||||
model.regionFor.keyword("idlist").append[oneSpace]
|
||||
]
|
||||
formatter = new CustomFormatter()
|
||||
expectation = '''
|
||||
idlist
|
||||
/*
|
||||
|
|
@ -129,9 +138,7 @@ class CommentFormatterTest {
|
|||
|
||||
a
|
||||
'''
|
||||
formatter = [ IDList model, extension regions, extension document |
|
||||
model.regionFor.keyword("idlist").append[oneSpace]
|
||||
]
|
||||
formatter = new CustomFormatter()
|
||||
expectation = '''
|
||||
idlist
|
||||
|
||||
|
|
@ -143,6 +150,4 @@ class CommentFormatterTest {
|
|||
'''
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,376 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2017 TypeFox GmbH (http://www.typefox.io) and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*******************************************************************************/
|
||||
package org.eclipse.xtext.formatting2.internal
|
||||
|
||||
import com.google.inject.Inject
|
||||
import org.eclipse.xtext.formatting2.IFormattableDocument
|
||||
import org.eclipse.xtext.formatting2.IHiddenRegionFormatting
|
||||
import org.eclipse.xtext.formatting2.ITextReplacer
|
||||
import org.eclipse.xtext.formatting2.ITextReplacerContext
|
||||
import org.eclipse.xtext.formatting2.internal.formattertestlanguage.IDList
|
||||
import org.eclipse.xtext.formatting2.internal.tests.FormatterTestLanguageInjectorProvider
|
||||
import org.eclipse.xtext.formatting2.regionaccess.ITextRegionExtensions
|
||||
import org.eclipse.xtext.formatting2.regionaccess.ITextSegment
|
||||
import org.eclipse.xtext.testing.InjectWith
|
||||
import org.eclipse.xtext.testing.XtextRunner
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
|
||||
/**
|
||||
* @author Moritz Eysholdt - Initial contribution and API
|
||||
*/
|
||||
@RunWith(XtextRunner)
|
||||
@InjectWith(FormatterTestLanguageInjectorProvider)
|
||||
class CommentWithSpacesFormatterTest {
|
||||
|
||||
@Inject extension GenericFormatterTester
|
||||
|
||||
static class CustomFormatter extends GenericFormatter<IDList> {
|
||||
override format(IDList model, ITextRegionExtensions regionAccess, extension IFormattableDocument document) {
|
||||
model.regionFor.keyword("idlist").append[oneSpace].append[newLines = 0 highPriority]
|
||||
model.regionFor.keyword("idlist").nextSemanticRegion.append[setNewLines(0,1,2)]
|
||||
}
|
||||
}
|
||||
|
||||
static class TabsAndSpacesSupportingFormatter extends CustomFormatter {
|
||||
override ITextReplacer createWhitespaceReplacer(ITextSegment hiddens, IHiddenRegionFormatting formatting) {
|
||||
return new TabAndSpacesSupportingWhiteSpaceReplacer(hiddens, formatting);
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
def void SL_inline() {
|
||||
val input = '''
|
||||
idlist //x
|
||||
a
|
||||
'''
|
||||
|
||||
val output = '''
|
||||
idlist //x
|
||||
a
|
||||
'''
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new TabsAndSpacesSupportingFormatter()
|
||||
// Space before comment because of `oneSpace` no space after because `addSpace` is false because there is a
|
||||
// trailing new lines
|
||||
expectation = output
|
||||
]
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new CustomFormatter()
|
||||
expectation = output
|
||||
]
|
||||
}
|
||||
|
||||
@Test
|
||||
def void SL_multiline() {
|
||||
val input = '''
|
||||
idlist
|
||||
|
||||
//x
|
||||
|
||||
|
||||
a
|
||||
'''
|
||||
|
||||
val output = '''
|
||||
idlist //x
|
||||
a
|
||||
'''
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new TabsAndSpacesSupportingFormatter()
|
||||
// Space before comment because of `oneSpace` and `addSpace` is false because `space == null`
|
||||
expectation = output
|
||||
]
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new CustomFormatter()
|
||||
expectation = output
|
||||
]
|
||||
}
|
||||
|
||||
@Test
|
||||
def void MLSL_inline() {
|
||||
val input = '''
|
||||
idlist /*x*/ a
|
||||
'''
|
||||
|
||||
val output = '''
|
||||
idlist /*x*/ a
|
||||
'''
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new TabsAndSpacesSupportingFormatter()
|
||||
// The spaces around here are from the `oneSpace` being propagated
|
||||
// in MultilineCommentReplacer.configureWhitespace()
|
||||
expectation = output
|
||||
]
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new CustomFormatter()
|
||||
expectation = output
|
||||
]
|
||||
}
|
||||
|
||||
@Test
|
||||
def void MLSLOnSecondLine() {
|
||||
val input = '''
|
||||
idlist a
|
||||
/*x*/
|
||||
'''
|
||||
|
||||
val output = '''
|
||||
idlist a
|
||||
/*x*/
|
||||
'''
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new TabsAndSpacesSupportingFormatter()
|
||||
expectation = output
|
||||
]
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new CustomFormatter()
|
||||
expectation = output
|
||||
]
|
||||
}
|
||||
|
||||
@Test
|
||||
def void MLSL_paragraph() {
|
||||
val input = '''
|
||||
idlist
|
||||
|
||||
|
||||
/*x*/
|
||||
|
||||
|
||||
a
|
||||
'''
|
||||
|
||||
val output = '''
|
||||
idlist /*x*/
|
||||
a
|
||||
'''
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new TabsAndSpacesSupportingFormatter()
|
||||
// Space before comment because of `oneSpace` and `addSpace` is false because `space == null`
|
||||
expectation = output
|
||||
]
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new CustomFormatter()
|
||||
expectation = output
|
||||
]
|
||||
}
|
||||
|
||||
@Test
|
||||
def void MLML_inline() {
|
||||
val input = '''
|
||||
idlist /*
|
||||
x
|
||||
*/ a
|
||||
'''
|
||||
|
||||
val output = '''
|
||||
idlist
|
||||
/*
|
||||
* x
|
||||
*/ a
|
||||
'''
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new TabsAndSpacesSupportingFormatter()
|
||||
// Follows the regular path
|
||||
expectation = output
|
||||
]
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new CustomFormatter()
|
||||
expectation = output
|
||||
]
|
||||
}
|
||||
|
||||
@Test
|
||||
def void MLML_paragraph() {
|
||||
val input = '''
|
||||
idlist
|
||||
|
||||
|
||||
/*
|
||||
x
|
||||
*/
|
||||
|
||||
|
||||
a
|
||||
b
|
||||
'''
|
||||
|
||||
val output = '''
|
||||
idlist /*
|
||||
* x
|
||||
*/
|
||||
a
|
||||
b
|
||||
'''
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new TabsAndSpacesSupportingFormatter()
|
||||
// Follows the regular path
|
||||
expectation = output
|
||||
]
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new CustomFormatter()
|
||||
expectation = output
|
||||
]
|
||||
}
|
||||
|
||||
@Test
|
||||
def void MLOverOneLineSLML() {
|
||||
val input = '''
|
||||
idlist /* i
|
||||
j *//*y*/ a
|
||||
'''
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new TabsAndSpacesSupportingFormatter()
|
||||
expectation = '''
|
||||
idlist
|
||||
/* i
|
||||
j */
|
||||
/*y*/ a
|
||||
'''
|
||||
]
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new CustomFormatter()
|
||||
expectation = '''
|
||||
idlist
|
||||
/* i
|
||||
j */
|
||||
/*y*/ a
|
||||
'''
|
||||
]
|
||||
}
|
||||
|
||||
@Test
|
||||
def void MLOverOneLineMLOverOneLine() {
|
||||
val input = '''
|
||||
idlist /* i
|
||||
j *//*x
|
||||
y*/ a
|
||||
'''
|
||||
|
||||
val output = '''
|
||||
idlist
|
||||
/* i
|
||||
j */
|
||||
/*x
|
||||
y*/ a
|
||||
'''
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new TabsAndSpacesSupportingFormatter()
|
||||
expectation = output
|
||||
]
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new CustomFormatter()
|
||||
expectation = output
|
||||
]
|
||||
}
|
||||
|
||||
@Test
|
||||
def void SLMLMLOverOneLine() {
|
||||
val input = '''
|
||||
idlist /* n *//*x
|
||||
y*/ a
|
||||
'''
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new TabsAndSpacesSupportingFormatter()
|
||||
expectation = '''
|
||||
idlist /* n */
|
||||
/*x
|
||||
y*/ a
|
||||
'''
|
||||
]
|
||||
|
||||
assertFormatted[
|
||||
toBeFormatted = input
|
||||
formatter = new CustomFormatter()
|
||||
expectation = '''
|
||||
idlist /* n */
|
||||
/*x
|
||||
y*/ a
|
||||
'''
|
||||
]
|
||||
}
|
||||
|
||||
private static class TabAndSpacesSupportingWhiteSpaceReplacer extends WhitespaceReplacer {
|
||||
|
||||
new(ITextSegment whitespace, IHiddenRegionFormatting formatting) {
|
||||
super(whitespace, formatting)
|
||||
}
|
||||
|
||||
/**
|
||||
* Copied from {@link WhitespaceReplacer}
|
||||
*/
|
||||
override ITextReplacerContext createReplacements(ITextReplacerContext context) {
|
||||
if (formatting.getAutowrap() !== null && formatting.getAutowrap() >= 0)
|
||||
context.setCanAutowrap(formatting.getAutowrap());
|
||||
val space = formatting.getSpace();
|
||||
val trailingNewLinesOfPreviousRegion = trailingNewLinesOfPreviousRegion();
|
||||
val computedNewLineCount = computeNewLineCount(context);
|
||||
var newLineCount = Math.max(computedNewLineCount - trailingNewLinesOfPreviousRegion, 0);
|
||||
|
||||
if (newLineCount == 0 && context.isAutowrap()) {
|
||||
val onAutowrap = formatting.getOnAutowrap();
|
||||
if (onAutowrap !== null) {
|
||||
onAutowrap.format(region, formatting, context.getDocument());
|
||||
}
|
||||
newLineCount = 1;
|
||||
}
|
||||
val indentationCount = computeNewIndentation(context);
|
||||
if (newLineCount == 0 && trailingNewLinesOfPreviousRegion == 0) {
|
||||
if (space !== null)
|
||||
context.addReplacement(region.replaceWith(space));
|
||||
} else {
|
||||
val noIndentation = formatting.getNoIndentation() == Boolean.TRUE;
|
||||
val newLines = context.getNewLinesString(newLineCount);
|
||||
val indentation = if(noIndentation) "" else context.getIndentationString(indentationCount);
|
||||
// START CHANGE
|
||||
// Added "+ space" on the next line
|
||||
val addSpace = trailingNewLinesOfPreviousRegion == 0 && space !== null
|
||||
context.addReplacement(region.replaceWith(newLines + indentation + (addSpace ? space : "")));
|
||||
// END CHANGE
|
||||
}
|
||||
return context.withIndentation(indentationCount)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -32,6 +32,16 @@ import org.junit.runner.RunWith;
|
|||
@InjectWith(FormatterTestLanguageInjectorProvider.class)
|
||||
@SuppressWarnings("all")
|
||||
public class CommentFormatterTest {
|
||||
public static class CustomFormatter extends GenericFormatter<IDList> {
|
||||
@Override
|
||||
public void format(final IDList model, final ITextRegionExtensions regionAccess, @Extension final IFormattableDocument document) {
|
||||
final Procedure1<IHiddenRegionFormatter> _function = (IHiddenRegionFormatter it) -> {
|
||||
it.oneSpace();
|
||||
};
|
||||
document.append(this.textRegionExtensions.regionFor(model).keyword("idlist"), _function);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject
|
||||
@Extension
|
||||
private GenericFormatterTester _genericFormatterTester;
|
||||
|
|
@ -45,16 +55,8 @@ public class CommentFormatterTest {
|
|||
_builder.append("a");
|
||||
_builder.newLine();
|
||||
it.setToBeFormatted(_builder);
|
||||
final GenericFormatter<IDList> _function_1 = new GenericFormatter<IDList>() {
|
||||
@Override
|
||||
protected void format(final IDList model, @Extension final ITextRegionExtensions regions, @Extension final IFormattableDocument document) {
|
||||
final Procedure1<IHiddenRegionFormatter> _function = (IHiddenRegionFormatter it_1) -> {
|
||||
it_1.oneSpace();
|
||||
};
|
||||
document.append(regions.regionFor(model).keyword("idlist"), _function);
|
||||
}
|
||||
};
|
||||
it.setFormatter(_function_1);
|
||||
CommentFormatterTest.CustomFormatter _customFormatter = new CommentFormatterTest.CustomFormatter();
|
||||
it.setFormatter(_customFormatter);
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist //x");
|
||||
_builder_1.newLine();
|
||||
|
|
@ -79,16 +81,8 @@ public class CommentFormatterTest {
|
|||
_builder.append("a");
|
||||
_builder.newLine();
|
||||
it.setToBeFormatted(_builder);
|
||||
final GenericFormatter<IDList> _function_1 = new GenericFormatter<IDList>() {
|
||||
@Override
|
||||
protected void format(final IDList model, @Extension final ITextRegionExtensions regions, @Extension final IFormattableDocument document) {
|
||||
final Procedure1<IHiddenRegionFormatter> _function = (IHiddenRegionFormatter it_1) -> {
|
||||
it_1.oneSpace();
|
||||
};
|
||||
document.append(regions.regionFor(model).keyword("idlist"), _function);
|
||||
}
|
||||
};
|
||||
it.setFormatter(_function_1);
|
||||
CommentFormatterTest.CustomFormatter _customFormatter = new CommentFormatterTest.CustomFormatter();
|
||||
it.setFormatter(_customFormatter);
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist //x");
|
||||
_builder_1.newLine();
|
||||
|
|
@ -106,16 +100,8 @@ public class CommentFormatterTest {
|
|||
_builder.append("idlist /*x*/ a");
|
||||
_builder.newLine();
|
||||
it.setToBeFormatted(_builder);
|
||||
final GenericFormatter<IDList> _function_1 = new GenericFormatter<IDList>() {
|
||||
@Override
|
||||
protected void format(final IDList model, @Extension final ITextRegionExtensions regions, @Extension final IFormattableDocument document) {
|
||||
final Procedure1<IHiddenRegionFormatter> _function = (IHiddenRegionFormatter it_1) -> {
|
||||
it_1.oneSpace();
|
||||
};
|
||||
document.append(regions.regionFor(model).keyword("idlist"), _function);
|
||||
}
|
||||
};
|
||||
it.setFormatter(_function_1);
|
||||
CommentFormatterTest.CustomFormatter _customFormatter = new CommentFormatterTest.CustomFormatter();
|
||||
it.setFormatter(_customFormatter);
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist /*x*/ a");
|
||||
_builder_1.newLine();
|
||||
|
|
@ -124,6 +110,23 @@ public class CommentFormatterTest {
|
|||
this._genericFormatterTester.assertFormatted(_function);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void MLSL_double_inline() {
|
||||
final Procedure1<GenericFormatterTestRequest> _function = (GenericFormatterTestRequest it) -> {
|
||||
StringConcatenation _builder = new StringConcatenation();
|
||||
_builder.append("idlist /*x*//*y*/ a");
|
||||
_builder.newLine();
|
||||
it.setToBeFormatted(_builder);
|
||||
CommentFormatterTest.CustomFormatter _customFormatter = new CommentFormatterTest.CustomFormatter();
|
||||
it.setFormatter(_customFormatter);
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist /*x*/ /*y*/ a");
|
||||
_builder_1.newLine();
|
||||
it.setExpectation(_builder_1);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void MLSL_paragraph() {
|
||||
final Procedure1<GenericFormatterTestRequest> _function = (GenericFormatterTestRequest it) -> {
|
||||
|
|
@ -139,16 +142,8 @@ public class CommentFormatterTest {
|
|||
_builder.append("a");
|
||||
_builder.newLine();
|
||||
it.setToBeFormatted(_builder);
|
||||
final GenericFormatter<IDList> _function_1 = new GenericFormatter<IDList>() {
|
||||
@Override
|
||||
protected void format(final IDList model, @Extension final ITextRegionExtensions regions, @Extension final IFormattableDocument document) {
|
||||
final Procedure1<IHiddenRegionFormatter> _function = (IHiddenRegionFormatter it_1) -> {
|
||||
it_1.oneSpace();
|
||||
};
|
||||
document.append(regions.regionFor(model).keyword("idlist"), _function);
|
||||
}
|
||||
};
|
||||
it.setFormatter(_function_1);
|
||||
CommentFormatterTest.CustomFormatter _customFormatter = new CommentFormatterTest.CustomFormatter();
|
||||
it.setFormatter(_customFormatter);
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist /*x*/");
|
||||
_builder_1.newLine();
|
||||
|
|
@ -170,16 +165,8 @@ public class CommentFormatterTest {
|
|||
_builder.append("*/ a");
|
||||
_builder.newLine();
|
||||
it.setToBeFormatted(_builder);
|
||||
final GenericFormatter<IDList> _function_1 = new GenericFormatter<IDList>() {
|
||||
@Override
|
||||
protected void format(final IDList model, @Extension final ITextRegionExtensions regions, @Extension final IFormattableDocument document) {
|
||||
final Procedure1<IHiddenRegionFormatter> _function = (IHiddenRegionFormatter it_1) -> {
|
||||
it_1.oneSpace();
|
||||
};
|
||||
document.append(regions.regionFor(model).keyword("idlist"), _function);
|
||||
}
|
||||
};
|
||||
it.setFormatter(_function_1);
|
||||
CommentFormatterTest.CustomFormatter _customFormatter = new CommentFormatterTest.CustomFormatter();
|
||||
it.setFormatter(_customFormatter);
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist");
|
||||
_builder_1.newLine();
|
||||
|
|
@ -217,16 +204,8 @@ public class CommentFormatterTest {
|
|||
_builder.append("a");
|
||||
_builder.newLine();
|
||||
it.setToBeFormatted(_builder);
|
||||
final GenericFormatter<IDList> _function_1 = new GenericFormatter<IDList>() {
|
||||
@Override
|
||||
protected void format(final IDList model, @Extension final ITextRegionExtensions regions, @Extension final IFormattableDocument document) {
|
||||
final Procedure1<IHiddenRegionFormatter> _function = (IHiddenRegionFormatter it_1) -> {
|
||||
it_1.oneSpace();
|
||||
};
|
||||
document.append(regions.regionFor(model).keyword("idlist"), _function);
|
||||
}
|
||||
};
|
||||
it.setFormatter(_function_1);
|
||||
CommentFormatterTest.CustomFormatter _customFormatter = new CommentFormatterTest.CustomFormatter();
|
||||
it.setFormatter(_customFormatter);
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist");
|
||||
_builder_1.newLine();
|
||||
|
|
|
|||
|
|
@ -0,0 +1,497 @@
|
|||
/**
|
||||
* Copyright (c) 2017 TypeFox GmbH (http://www.typefox.io) and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*/
|
||||
package org.eclipse.xtext.formatting2.internal;
|
||||
|
||||
import com.google.common.base.Objects;
|
||||
import com.google.inject.Inject;
|
||||
import org.eclipse.xtend2.lib.StringConcatenation;
|
||||
import org.eclipse.xtext.formatting2.IAutowrapFormatter;
|
||||
import org.eclipse.xtext.formatting2.IFormattableDocument;
|
||||
import org.eclipse.xtext.formatting2.IHiddenRegionFormatter;
|
||||
import org.eclipse.xtext.formatting2.IHiddenRegionFormatting;
|
||||
import org.eclipse.xtext.formatting2.ITextReplacer;
|
||||
import org.eclipse.xtext.formatting2.ITextReplacerContext;
|
||||
import org.eclipse.xtext.formatting2.internal.GenericFormatter;
|
||||
import org.eclipse.xtext.formatting2.internal.GenericFormatterTestRequest;
|
||||
import org.eclipse.xtext.formatting2.internal.GenericFormatterTester;
|
||||
import org.eclipse.xtext.formatting2.internal.WhitespaceReplacer;
|
||||
import org.eclipse.xtext.formatting2.internal.formattertestlanguage.IDList;
|
||||
import org.eclipse.xtext.formatting2.internal.tests.FormatterTestLanguageInjectorProvider;
|
||||
import org.eclipse.xtext.formatting2.regionaccess.ITextRegionExtensions;
|
||||
import org.eclipse.xtext.formatting2.regionaccess.ITextSegment;
|
||||
import org.eclipse.xtext.testing.InjectWith;
|
||||
import org.eclipse.xtext.testing.XtextRunner;
|
||||
import org.eclipse.xtext.xbase.lib.Extension;
|
||||
import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
/**
|
||||
* @author Moritz Eysholdt - Initial contribution and API
|
||||
*/
|
||||
@RunWith(XtextRunner.class)
|
||||
@InjectWith(FormatterTestLanguageInjectorProvider.class)
|
||||
@SuppressWarnings("all")
|
||||
public class CommentWithSpacesFormatterTest {
|
||||
public static class CustomFormatter extends GenericFormatter<IDList> {
|
||||
@Override
|
||||
public void format(final IDList model, final ITextRegionExtensions regionAccess, @Extension final IFormattableDocument document) {
|
||||
final Procedure1<IHiddenRegionFormatter> _function = (IHiddenRegionFormatter it) -> {
|
||||
it.oneSpace();
|
||||
};
|
||||
final Procedure1<IHiddenRegionFormatter> _function_1 = (IHiddenRegionFormatter it) -> {
|
||||
it.setNewLines(0);
|
||||
it.highPriority();
|
||||
};
|
||||
document.append(document.append(this.textRegionExtensions.regionFor(model).keyword("idlist"), _function), _function_1);
|
||||
final Procedure1<IHiddenRegionFormatter> _function_2 = (IHiddenRegionFormatter it) -> {
|
||||
it.setNewLines(0, 1, 2);
|
||||
};
|
||||
document.append(this.textRegionExtensions.regionFor(model).keyword("idlist").getNextSemanticRegion(), _function_2);
|
||||
}
|
||||
}
|
||||
|
||||
public static class TabsAndSpacesSupportingFormatter extends CommentWithSpacesFormatterTest.CustomFormatter {
|
||||
@Override
|
||||
public ITextReplacer createWhitespaceReplacer(final ITextSegment hiddens, final IHiddenRegionFormatting formatting) {
|
||||
return new CommentWithSpacesFormatterTest.TabAndSpacesSupportingWhiteSpaceReplacer(hiddens, formatting);
|
||||
}
|
||||
}
|
||||
|
||||
private static class TabAndSpacesSupportingWhiteSpaceReplacer extends WhitespaceReplacer {
|
||||
public TabAndSpacesSupportingWhiteSpaceReplacer(final ITextSegment whitespace, final IHiddenRegionFormatting formatting) {
|
||||
super(whitespace, formatting);
|
||||
}
|
||||
|
||||
/**
|
||||
* Copied from {@link WhitespaceReplacer}
|
||||
*/
|
||||
@Override
|
||||
public ITextReplacerContext createReplacements(final ITextReplacerContext context) {
|
||||
if (((this.getFormatting().getAutowrap() != null) && ((this.getFormatting().getAutowrap()).intValue() >= 0))) {
|
||||
context.setCanAutowrap(this.getFormatting().getAutowrap());
|
||||
}
|
||||
final String space = this.getFormatting().getSpace();
|
||||
final int trailingNewLinesOfPreviousRegion = this.trailingNewLinesOfPreviousRegion();
|
||||
final int computedNewLineCount = this.computeNewLineCount(context);
|
||||
int newLineCount = Math.max((computedNewLineCount - trailingNewLinesOfPreviousRegion), 0);
|
||||
if (((newLineCount == 0) && context.isAutowrap())) {
|
||||
final IAutowrapFormatter onAutowrap = this.getFormatting().getOnAutowrap();
|
||||
if ((onAutowrap != null)) {
|
||||
onAutowrap.format(this.getRegion(), this.getFormatting(), context.getDocument());
|
||||
}
|
||||
newLineCount = 1;
|
||||
}
|
||||
final int indentationCount = this.computeNewIndentation(context);
|
||||
if (((newLineCount == 0) && (trailingNewLinesOfPreviousRegion == 0))) {
|
||||
if ((space != null)) {
|
||||
context.addReplacement(this.getRegion().replaceWith(space));
|
||||
}
|
||||
} else {
|
||||
Boolean _noIndentation = this.getFormatting().getNoIndentation();
|
||||
final boolean noIndentation = Objects.equal(_noIndentation, Boolean.TRUE);
|
||||
final String newLines = context.getNewLinesString(newLineCount);
|
||||
String _xifexpression = null;
|
||||
if (noIndentation) {
|
||||
_xifexpression = "";
|
||||
} else {
|
||||
_xifexpression = context.getIndentationString(indentationCount);
|
||||
}
|
||||
final String indentation = _xifexpression;
|
||||
final boolean addSpace = ((trailingNewLinesOfPreviousRegion == 0) && (space != null));
|
||||
ITextSegment _region = this.getRegion();
|
||||
String _xifexpression_1 = null;
|
||||
if (addSpace) {
|
||||
_xifexpression_1 = space;
|
||||
} else {
|
||||
_xifexpression_1 = "";
|
||||
}
|
||||
String _plus = ((newLines + indentation) + _xifexpression_1);
|
||||
context.addReplacement(_region.replaceWith(_plus));
|
||||
}
|
||||
return context.withIndentation(indentationCount);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject
|
||||
@Extension
|
||||
private GenericFormatterTester _genericFormatterTester;
|
||||
|
||||
@Test
|
||||
public void SL_inline() {
|
||||
StringConcatenation _builder = new StringConcatenation();
|
||||
_builder.append("idlist //x");
|
||||
_builder.newLine();
|
||||
_builder.append("a");
|
||||
_builder.newLine();
|
||||
final String input = _builder.toString();
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist //x");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append("a");
|
||||
_builder_1.newLine();
|
||||
final String output = _builder_1.toString();
|
||||
final Procedure1<GenericFormatterTestRequest> _function = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter _tabsAndSpacesSupportingFormatter = new CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter();
|
||||
it.setFormatter(_tabsAndSpacesSupportingFormatter);
|
||||
it.setExpectation(output);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function);
|
||||
final Procedure1<GenericFormatterTestRequest> _function_1 = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.CustomFormatter _customFormatter = new CommentWithSpacesFormatterTest.CustomFormatter();
|
||||
it.setFormatter(_customFormatter);
|
||||
it.setExpectation(output);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function_1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void SL_multiline() {
|
||||
StringConcatenation _builder = new StringConcatenation();
|
||||
_builder.append("idlist");
|
||||
_builder.newLine();
|
||||
_builder.newLine();
|
||||
_builder.append("//x");
|
||||
_builder.newLine();
|
||||
_builder.newLine();
|
||||
_builder.newLine();
|
||||
_builder.append("a");
|
||||
_builder.newLine();
|
||||
final String input = _builder.toString();
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist //x");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append("a");
|
||||
_builder_1.newLine();
|
||||
final String output = _builder_1.toString();
|
||||
final Procedure1<GenericFormatterTestRequest> _function = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter _tabsAndSpacesSupportingFormatter = new CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter();
|
||||
it.setFormatter(_tabsAndSpacesSupportingFormatter);
|
||||
it.setExpectation(output);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function);
|
||||
final Procedure1<GenericFormatterTestRequest> _function_1 = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.CustomFormatter _customFormatter = new CommentWithSpacesFormatterTest.CustomFormatter();
|
||||
it.setFormatter(_customFormatter);
|
||||
it.setExpectation(output);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function_1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void MLSL_inline() {
|
||||
StringConcatenation _builder = new StringConcatenation();
|
||||
_builder.append("idlist /*x*/ a");
|
||||
_builder.newLine();
|
||||
final String input = _builder.toString();
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist /*x*/ a");
|
||||
_builder_1.newLine();
|
||||
final String output = _builder_1.toString();
|
||||
final Procedure1<GenericFormatterTestRequest> _function = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter _tabsAndSpacesSupportingFormatter = new CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter();
|
||||
it.setFormatter(_tabsAndSpacesSupportingFormatter);
|
||||
it.setExpectation(output);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function);
|
||||
final Procedure1<GenericFormatterTestRequest> _function_1 = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.CustomFormatter _customFormatter = new CommentWithSpacesFormatterTest.CustomFormatter();
|
||||
it.setFormatter(_customFormatter);
|
||||
it.setExpectation(output);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function_1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void MLSLOnSecondLine() {
|
||||
StringConcatenation _builder = new StringConcatenation();
|
||||
_builder.append("idlist a");
|
||||
_builder.newLine();
|
||||
_builder.append("/*x*/");
|
||||
_builder.newLine();
|
||||
final String input = _builder.toString();
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist a");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append("/*x*/");
|
||||
_builder_1.newLine();
|
||||
final String output = _builder_1.toString();
|
||||
final Procedure1<GenericFormatterTestRequest> _function = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter _tabsAndSpacesSupportingFormatter = new CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter();
|
||||
it.setFormatter(_tabsAndSpacesSupportingFormatter);
|
||||
it.setExpectation(output);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function);
|
||||
final Procedure1<GenericFormatterTestRequest> _function_1 = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.CustomFormatter _customFormatter = new CommentWithSpacesFormatterTest.CustomFormatter();
|
||||
it.setFormatter(_customFormatter);
|
||||
it.setExpectation(output);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function_1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void MLSL_paragraph() {
|
||||
StringConcatenation _builder = new StringConcatenation();
|
||||
_builder.append("idlist");
|
||||
_builder.newLine();
|
||||
_builder.newLine();
|
||||
_builder.newLine();
|
||||
_builder.append("/*x*/");
|
||||
_builder.newLine();
|
||||
_builder.newLine();
|
||||
_builder.newLine();
|
||||
_builder.append("a");
|
||||
_builder.newLine();
|
||||
final String input = _builder.toString();
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist /*x*/");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append("a");
|
||||
_builder_1.newLine();
|
||||
final String output = _builder_1.toString();
|
||||
final Procedure1<GenericFormatterTestRequest> _function = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter _tabsAndSpacesSupportingFormatter = new CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter();
|
||||
it.setFormatter(_tabsAndSpacesSupportingFormatter);
|
||||
it.setExpectation(output);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function);
|
||||
final Procedure1<GenericFormatterTestRequest> _function_1 = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.CustomFormatter _customFormatter = new CommentWithSpacesFormatterTest.CustomFormatter();
|
||||
it.setFormatter(_customFormatter);
|
||||
it.setExpectation(output);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function_1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void MLML_inline() {
|
||||
StringConcatenation _builder = new StringConcatenation();
|
||||
_builder.append("idlist /*");
|
||||
_builder.newLine();
|
||||
_builder.append("x");
|
||||
_builder.newLine();
|
||||
_builder.append("*/ a");
|
||||
_builder.newLine();
|
||||
final String input = _builder.toString();
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append("/*");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append(" ");
|
||||
_builder_1.append("* x");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append(" ");
|
||||
_builder_1.append("*/ a");
|
||||
_builder_1.newLine();
|
||||
final String output = _builder_1.toString();
|
||||
final Procedure1<GenericFormatterTestRequest> _function = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter _tabsAndSpacesSupportingFormatter = new CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter();
|
||||
it.setFormatter(_tabsAndSpacesSupportingFormatter);
|
||||
it.setExpectation(output);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function);
|
||||
final Procedure1<GenericFormatterTestRequest> _function_1 = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.CustomFormatter _customFormatter = new CommentWithSpacesFormatterTest.CustomFormatter();
|
||||
it.setFormatter(_customFormatter);
|
||||
it.setExpectation(output);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function_1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void MLML_paragraph() {
|
||||
StringConcatenation _builder = new StringConcatenation();
|
||||
_builder.append("idlist");
|
||||
_builder.newLine();
|
||||
_builder.newLine();
|
||||
_builder.newLine();
|
||||
_builder.append("/*");
|
||||
_builder.newLine();
|
||||
_builder.append("x");
|
||||
_builder.newLine();
|
||||
_builder.append("*/");
|
||||
_builder.newLine();
|
||||
_builder.newLine();
|
||||
_builder.newLine();
|
||||
_builder.append("a");
|
||||
_builder.newLine();
|
||||
_builder.append("b");
|
||||
_builder.newLine();
|
||||
final String input = _builder.toString();
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist /*");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append(" ");
|
||||
_builder_1.append("* x");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append(" ");
|
||||
_builder_1.append("*/");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append("a");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append("b");
|
||||
_builder_1.newLine();
|
||||
final String output = _builder_1.toString();
|
||||
final Procedure1<GenericFormatterTestRequest> _function = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter _tabsAndSpacesSupportingFormatter = new CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter();
|
||||
it.setFormatter(_tabsAndSpacesSupportingFormatter);
|
||||
it.setExpectation(output);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function);
|
||||
final Procedure1<GenericFormatterTestRequest> _function_1 = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.CustomFormatter _customFormatter = new CommentWithSpacesFormatterTest.CustomFormatter();
|
||||
it.setFormatter(_customFormatter);
|
||||
it.setExpectation(output);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function_1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void MLOverOneLineSLML() {
|
||||
StringConcatenation _builder = new StringConcatenation();
|
||||
_builder.append("idlist /* i");
|
||||
_builder.newLine();
|
||||
_builder.append("j *//*y*/ a");
|
||||
_builder.newLine();
|
||||
final String input = _builder.toString();
|
||||
final Procedure1<GenericFormatterTestRequest> _function = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter _tabsAndSpacesSupportingFormatter = new CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter();
|
||||
it.setFormatter(_tabsAndSpacesSupportingFormatter);
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append("/* i");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append(" ");
|
||||
_builder_1.append("j */");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append(" ");
|
||||
_builder_1.append("/*y*/ a");
|
||||
_builder_1.newLine();
|
||||
it.setExpectation(_builder_1);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function);
|
||||
final Procedure1<GenericFormatterTestRequest> _function_1 = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.CustomFormatter _customFormatter = new CommentWithSpacesFormatterTest.CustomFormatter();
|
||||
it.setFormatter(_customFormatter);
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append("/* i");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append(" ");
|
||||
_builder_1.append("j */");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append("/*y*/ a");
|
||||
_builder_1.newLine();
|
||||
it.setExpectation(_builder_1);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function_1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void MLOverOneLineMLOverOneLine() {
|
||||
StringConcatenation _builder = new StringConcatenation();
|
||||
_builder.append("idlist /* i");
|
||||
_builder.newLine();
|
||||
_builder.append("j *//*x");
|
||||
_builder.newLine();
|
||||
_builder.append(" ");
|
||||
_builder.append("y*/ a");
|
||||
_builder.newLine();
|
||||
final String input = _builder.toString();
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append("/* i");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append(" ");
|
||||
_builder_1.append("j */");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append("/*x");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append(" ");
|
||||
_builder_1.append("y*/ a");
|
||||
_builder_1.newLine();
|
||||
final String output = _builder_1.toString();
|
||||
final Procedure1<GenericFormatterTestRequest> _function = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter _tabsAndSpacesSupportingFormatter = new CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter();
|
||||
it.setFormatter(_tabsAndSpacesSupportingFormatter);
|
||||
it.setExpectation(output);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function);
|
||||
final Procedure1<GenericFormatterTestRequest> _function_1 = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.CustomFormatter _customFormatter = new CommentWithSpacesFormatterTest.CustomFormatter();
|
||||
it.setFormatter(_customFormatter);
|
||||
it.setExpectation(output);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function_1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void SLMLMLOverOneLine() {
|
||||
StringConcatenation _builder = new StringConcatenation();
|
||||
_builder.append("idlist /* n *//*x");
|
||||
_builder.newLine();
|
||||
_builder.append(" ");
|
||||
_builder.append("y*/ a");
|
||||
_builder.newLine();
|
||||
final String input = _builder.toString();
|
||||
final Procedure1<GenericFormatterTestRequest> _function = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter _tabsAndSpacesSupportingFormatter = new CommentWithSpacesFormatterTest.TabsAndSpacesSupportingFormatter();
|
||||
it.setFormatter(_tabsAndSpacesSupportingFormatter);
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist /* n */");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append(" ");
|
||||
_builder_1.append("/*x");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append(" ");
|
||||
_builder_1.append("y*/ a");
|
||||
_builder_1.newLine();
|
||||
it.setExpectation(_builder_1);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function);
|
||||
final Procedure1<GenericFormatterTestRequest> _function_1 = (GenericFormatterTestRequest it) -> {
|
||||
it.setToBeFormatted(input);
|
||||
CommentWithSpacesFormatterTest.CustomFormatter _customFormatter = new CommentWithSpacesFormatterTest.CustomFormatter();
|
||||
it.setFormatter(_customFormatter);
|
||||
StringConcatenation _builder_1 = new StringConcatenation();
|
||||
_builder_1.append("idlist /* n */");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append("/*x");
|
||||
_builder_1.newLine();
|
||||
_builder_1.append(" ");
|
||||
_builder_1.append("y*/ a");
|
||||
_builder_1.newLine();
|
||||
it.setExpectation(_builder_1);
|
||||
};
|
||||
this._genericFormatterTester.assertFormatted(_function_1);
|
||||
}
|
||||
}
|
||||
|
|
@ -38,14 +38,26 @@ public class HiddenRegionReplacer implements ITextReplacer {
|
|||
}
|
||||
|
||||
/**
|
||||
* This method is when we have multiple TextReplacers for this HiddenRegion because the HiddenRegion contains
|
||||
* This method is called when we have multiple TextReplacers for this HiddenRegion because the HiddenRegion contains
|
||||
* comments. It applies the formatting configuration from {@link #formatting} to the {@link WhitespaceReplacer} that
|
||||
* surround the comment.
|
||||
* surrounds the comment.
|
||||
*/
|
||||
protected void applyHiddenRegionFormatting(List<ITextReplacer> replacers) {
|
||||
IHiddenRegionFormatting separator = findWhitespaceThatSeparatesSemanticRegions(replacers).getFormatting();
|
||||
|
||||
// 1. apply indentation
|
||||
applyIndentation(replacers, separator);
|
||||
|
||||
applySeparatorConfiguration(separator);
|
||||
|
||||
applyPriorityAndDefaultFormatting(replacers, separator);
|
||||
|
||||
introduceNewlinesAroundMLComments(replacers);
|
||||
}
|
||||
|
||||
/**
|
||||
* @since 2.23
|
||||
*/
|
||||
protected void applyIndentation(List<ITextReplacer> replacers, IHiddenRegionFormatting separator) {
|
||||
Integer inc = formatting.getIndentationIncrease();
|
||||
Integer dec = formatting.getIndentationDecrease();
|
||||
if (inc != null && dec != null) {
|
||||
|
|
@ -56,26 +68,52 @@ public class HiddenRegionReplacer implements ITextReplacer {
|
|||
} else if (dec != null) {
|
||||
separator.setIndentationDecrease(dec);
|
||||
}
|
||||
}
|
||||
|
||||
// 2. apply NewLine and space configuration to the first whitespace region that follows or contains a linewrap.
|
||||
/**
|
||||
* Apply newline and space configuration to the first whitespace region that follows or contains a linewrap.
|
||||
* @since 2.23
|
||||
*/
|
||||
protected void applySeparatorConfiguration(IHiddenRegionFormatting separator) {
|
||||
separator.setNewLinesDefault(formatting.getNewLineDefault());
|
||||
separator.setNewLinesMax(formatting.getNewLineMax());
|
||||
separator.setNewLinesMin(formatting.getNewLineMin());
|
||||
separator.setSpace(formatting.getSpace());
|
||||
}
|
||||
|
||||
// 3. apply the 'priority' configuration for all and set a default formatting
|
||||
for (ITextReplacer replacer : replacers)
|
||||
/**
|
||||
* @since 2.23
|
||||
*/
|
||||
protected void applyPriorityAndDefaultFormatting(List<ITextReplacer> replacers, IHiddenRegionFormatting separator) {
|
||||
for (int i = 0; i < replacers.size(); i++) {
|
||||
ITextReplacer replacer = replacers.get(i);
|
||||
if (replacer instanceof WhitespaceReplacer) {
|
||||
IHiddenRegionFormatting formatting2 = ((WhitespaceReplacer) replacer).getFormatting();
|
||||
formatting2.setPriority(formatting.getPriority());
|
||||
if (formatting2 != separator) {
|
||||
formatting2.setSpace(replacer.getRegion().getOffset() > 0 ? " " : "");
|
||||
ITextReplacer previous = (i == 0) ? null : replacers.get(i - 1);
|
||||
ITextReplacer next = (i + 1 >= replacers.size()) ? null : replacers.get(i + 1);
|
||||
// Don't add single spaces after comments
|
||||
if (previous == null || !(previous instanceof CommentReplacer)) {
|
||||
// Don't add spaces before ML comments because in the next step
|
||||
// a newline will be added in front of ML comments.
|
||||
// You don't want to end up with a ML comment on a newline that
|
||||
// starts with a space
|
||||
if (next == null || !(next instanceof MultilineCommentReplacer)) {
|
||||
formatting2.setSpace(replacer.getRegion().getOffset() > 0 ? " " : "");
|
||||
}
|
||||
}
|
||||
formatting2.setNewLinesMin(0);
|
||||
formatting2.setNewLinesMax(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 4. make sure whitespace before and after multiline comments introduce a NewLine
|
||||
/**
|
||||
* @since 2.23
|
||||
*/
|
||||
protected void introduceNewlinesAroundMLComments(List<ITextReplacer> replacers) {
|
||||
for (int i = 0; i < replacers.size(); i++) {
|
||||
ITextReplacer replacer = replacers.get(i);
|
||||
if (replacer instanceof CommentReplacer) {
|
||||
|
|
|
|||
|
|
@ -36,8 +36,12 @@ public class MultilineCommentReplacer extends CommentReplacer {
|
|||
enforceNewLine(leading);
|
||||
enforceNewLine(trailing);
|
||||
} else {
|
||||
enforceSingleSpace(leading);
|
||||
enforceSingleSpace(trailing);
|
||||
if (!leading.getRegion().isMultiline()) {
|
||||
enforceSingleSpace(leading);
|
||||
}
|
||||
if (!trailing.getRegion().isMultiline()) {
|
||||
enforceSingleSpace(trailing);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue