MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-10 13:17:09 +07:00
Code Issues Packages Projects Releases Wiki Activity

[formatter-core: context formatting] simplified

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2016-07-06 18:36:19 +03:00
parent 65c8a3834e
commit 6a3f7d34ad
12 changed files with 79 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/psi/formatter/java/AbstractJavaFormatterTest.java
+4 -2
View File
@@ -110,7 +110,8 @@ public abstract class AbstractJavaFormatterTest extends LightIdeaTestCase {
@Override
public void run(PsiFile psiFile, int startOffset, int endOffset) {
SimpleFormatRangesInfo info = new SimpleFormatRangesInfo(new TextRange(startOffset, endOffset));
CodeStyleManager.getInstance(getProject()).reformatTextWithContext(psiFile, info);
List<TextRange> ranges = info.getRangesToFormat();
CodeStyleManager.getInstance(getProject()).reformatTextWithContext(psiFile, ranges, null);
}
});
ACTIONS.put(Action.REFORMAT_WITH_INSERTED_LINE_CONTEXT, new TestFormatAction() {
@@ -122,7 +123,8 @@ public abstract class AbstractJavaFormatterTest extends LightIdeaTestCase {
return startOffset <= offset && offset < endOffset;
}
};
CodeStyleManager.getInstance(getProject()).reformatTextWithContext(psiFile, info);
List<TextRange> ranges = info.getRangesToFormat();
CodeStyleManager.getInstance(getProject()).reformatTextWithContext(psiFile, ranges, info);
}
});
}
java/java-tests/testSrc/com/intellij/psi/formatter/performance/JavaSmartReformatPerformanceTest.java
+1 -2
View File
@@ -22,7 +22,6 @@ import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.codeStyle.SimpleFormatRangesInfo;
import com.intellij.psi.formatter.java.AbstractJavaFormatterTest;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.util.ThrowableRunnable;
@@ -73,7 +72,7 @@ public class JavaSmartReformatPerformanceTest extends AbstractJavaFormatterTest
return () -> CommandProcessor.getInstance().executeCommand(
getProject(),
() -> ApplicationManager.getApplication().runWriteAction(
() -> codeStyleManager.reformatTextWithContext(file, new SimpleFormatRangesInfo(ranges))
() -> codeStyleManager.reformatTextWithContext(file, ranges, null)
),
null,
null);