[formatter] simplification: removed unnecessary classes

This commit is contained in:
Yaroslav Lepenkin
2016-07-15 16:15:01 +03:00
parent 1c25166cee
commit f21e71bd56
9 changed files with 36 additions and 63 deletions
@@ -43,7 +43,6 @@ import org.jetbrains.annotations.Nullable;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.util.Collection;
import java.util.EnumMap;
import java.util.List;
import java.util.Map;
@@ -111,16 +110,15 @@ public abstract class AbstractJavaFormatterTest extends LightIdeaTestCase {
ACTIONS.put(Action.REFORMAT_WITH_CONTEXT, new TestFormatAction() {
@Override
public void run(PsiFile psiFile, int startOffset, int endOffset) {
Collection<TextRange> ranges = ContainerUtil.newArrayList(new TextRange(startOffset, endOffset));
CodeStyleManager.getInstance(getProject()).reformatTextWithContext(psiFile, ranges, null);
List<TextRange> ranges = ContainerUtil.newArrayList(new TextRange(startOffset, endOffset));
CodeStyleManager.getInstance(getProject()).reformatTextWithContext(psiFile, ranges);
}
});
ACTIONS.put(Action.REFORMAT_WITH_INSERTED_LINE_CONTEXT, new TestFormatAction() {
@Override
public void run(PsiFile psiFile, int startOffset, int endOffset) {
TextRange range = new TextRange(startOffset, endOffset);
List<TextRange> ranges = ContainerUtil.newArrayList(range);
CodeStyleManager.getInstance(getProject()).reformatTextWithContext(psiFile, ranges, ranges);
List<TextRange> ranges = ContainerUtil.newArrayList(new TextRange(startOffset, endOffset));
CodeStyleManager.getInstance(getProject()).reformatTextWithContext(psiFile, new ChangedRangesInfo(ranges, ranges));
}
});
}
@@ -72,7 +72,7 @@ public class JavaSmartReformatPerformanceTest extends AbstractJavaFormatterTest
return () -> CommandProcessor.getInstance().executeCommand(
getProject(),
() -> ApplicationManager.getApplication().runWriteAction(
() -> codeStyleManager.reformatTextWithContext(file, ranges, null)
() -> codeStyleManager.reformatTextWithContext(file, ranges)
),
null,
null);