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

File indent options provider API: a flag to skip a provider on full reformat, logging

Browse Source
This commit is contained in:
Rustam Vishnyakov
2014-09-24 11:45:44 +04:00
parent 0c0b29bf42
commit ec603b4814
14 changed files with 156 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/indentProvider/reformatFileSupported_after.java
+8
View File
@@ -0,0 +1,8 @@
class A {
private void foo(boolean b) {
int x;
if (b) {
System.out.println(x);
}
}
}
java/java-tests/testData/codeInsight/indentProvider/reformatFileSupported_before.java
+8
View File
@@ -0,0 +1,8 @@
class A {
private void foo(boolean b) {
int x;
if (b) {
System.out.println(x);
}
}
}
java/java-tests/testData/codeInsight/indentProvider/reformatFile_after.java
+6 -6
View File
@@ -1,8 +1,8 @@
class A {
private void foo(boolean b) {
int x;
if (b) {
System.out.println(x);
}
}
private void foo(boolean b) {
int x;
if (b) {
System.out.println(x);
}
}
}
java/java-tests/testData/codeInsight/indentProvider/reformatTextFullSupported_after.java
+8
View File
@@ -0,0 +1,8 @@
class A {
private void foo(boolean b) {
int x;
if (b) {
System.out.println(x);
}
}
}
java/java-tests/testData/codeInsight/indentProvider/reformatTextFullSupported_before.java
+8
View File
@@ -0,0 +1,8 @@
class A {
private void foo(boolean b) {
int x;
if (b) {
System.out.println(x);
}
}
}
java/java-tests/testData/codeInsight/indentProvider/reformatTextRange_after.java
+8
View File
@@ -0,0 +1,8 @@
class A {
private void foo(boolean b) {
int x;
if (b) {
System.out.println(x);
}
}
}
java/java-tests/testData/codeInsight/indentProvider/reformatTextRange_before.java
+8
View File
@@ -0,0 +1,8 @@
class A {
private void foo(boolean b) {
int x;
if (b) {
System.out.println(x);
}
}
}
java/java-tests/testData/codeInsight/indentProvider/reformatText_after.java
+6 -6
View File
@@ -1,8 +1,8 @@
class A {
private void foo(boolean b) {
int x;
if (b) {
System.out.println(x);
}
}
private void foo(boolean b) {
int x;
if (b) {
System.out.println(x);
}
}
}
java/java-tests/testSrc/com/intellij/codeInsight/indentOptionsProvider/FileIndentProviderTest.java
+40
View File
@@ -38,6 +38,7 @@ public class FileIndentProviderTest extends LightPlatformCodeInsightFixtureTestC
private final static FileIndentOptionsProvider TEST_FILE_INDENT_OPTIONS_PROVIDER = new TestIndentOptionsProvider();
private static CommonCodeStyleSettings.IndentOptions myTestIndentOptions;
private static boolean myUseOnFullReformat;
@Override
protected void setUp() throws Exception {
@@ -54,6 +55,7 @@ public class FileIndentProviderTest extends LightPlatformCodeInsightFixtureTestC
Extensions.getRootArea().getExtensionPoint(FileIndentOptionsProvider.EP_NAME);
extensionPoint.unregisterExtension(TEST_FILE_INDENT_OPTIONS_PROVIDER);
myTestIndentOptions = null;
myUseOnFullReformat = false;
super.tearDown();
}
@@ -80,6 +82,11 @@ public class FileIndentProviderTest extends LightPlatformCodeInsightFixtureTestC
public CommonCodeStyleSettings.IndentOptions getIndentOptions(@NotNull PsiFile file) {
return myTestIndentOptions;
}
@Override
public boolean useOnFullReformat() {
return myUseOnFullReformat;
}
}
public void testTypeEnter() {
@@ -111,6 +118,16 @@ public class FileIndentProviderTest extends LightPlatformCodeInsightFixtureTestC
myFixture.checkResultByFile(getTestName(true) + "_after.java");
}
public void testReformatFileSupported() {
myUseOnFullReformat = true;
myTestIndentOptions.INDENT_SIZE = 3;
myTestIndentOptions.TAB_SIZE = 2;
myTestIndentOptions.USE_TAB_CHARACTER = true;
PsiFile file = myFixture.configureByFile(getTestName(true) + "_before.java");
CodeStyleManager.getInstance(getProject()).reformat(file);
myFixture.checkResultByFile(getTestName(true) + "_after.java");
}
public void testReformatText() {
myTestIndentOptions.INDENT_SIZE = 3;
myTestIndentOptions.TAB_SIZE = 2;
@@ -119,4 +136,27 @@ public class FileIndentProviderTest extends LightPlatformCodeInsightFixtureTestC
CodeStyleManager.getInstance(getProject()).reformatText(file, 0, file.getTextRange().getEndOffset());
myFixture.checkResultByFile(getTestName(true) + "_after.java");
}
/**
* Reformat using indent provider if a part of the file is selected.
*/
public void testReformatTextRange() {
myTestIndentOptions.INDENT_SIZE = 3;
myTestIndentOptions.TAB_SIZE = 2;
myTestIndentOptions.USE_TAB_CHARACTER = true;
PsiFile file = myFixture.configureByFile(getTestName(true) + "_before.java");
// Just any range smaller than the file
CodeStyleManager.getInstance(getProject()).reformatText(file, 6, file.getTextRange().getEndOffset() - 1);
myFixture.checkResultByFile(getTestName(true) + "_after.java");
}
public void testReformatTextFullSupported() {
myUseOnFullReformat = true;
myTestIndentOptions.INDENT_SIZE = 3;
myTestIndentOptions.TAB_SIZE = 2;
myTestIndentOptions.USE_TAB_CHARACTER = true;
PsiFile file = myFixture.configureByFile(getTestName(true) + "_before.java");
CodeStyleManager.getInstance(getProject()).reformatText(file, 0, file.getTextRange().getEndOffset());
myFixture.checkResultByFile(getTestName(true) + "_after.java");
}
}