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

IDEA-90860 Reformat Code breaks Copyright/Header

Browse Source 
1. Don't preserve blank lines when formatter is called explicitly on operations like refactoring;
2. Test data is corrected;
This commit is contained in:
Denis.Zhdanov
2012-09-01 19:38:42 +04:00
parent 1c3036e8d7
commit 79d2e31132
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
+3 -1
View File
@@ -72,7 +72,9 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
if (myChild1 == null) {
// Given node corresponds to the first document block.
createSpaceInCode(false);
if (FormatterUtil.isFormatterCalledExplicitly()) {
createSpaceInCode(false);
}
return;
}
java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy
+4 -4
View File
@@ -24,7 +24,7 @@ public class AddImportActionTest extends LightCodeInsightFixtureTestCase {
public void testMap15() {
IdeaTestUtil.setModuleLanguageLevel(myModule, LanguageLevel.JDK_1_5)
myFixture.configureByText 'a.java', '''
myFixture.configureByText 'a.java', '''\
public class Foo {
void foo() {
Ma<caret>p<> l;
@@ -50,7 +50,7 @@ public class Foo {
public void testMapLatestLanguageLevel() {
IdeaTestUtil.setModuleLanguageLevel(myModule, LanguageLevel.HIGHEST)
myFixture.configureByText 'a.java', '''
myFixture.configureByText 'a.java', '''\
public class Foo {
void foo() {
Ma<caret>p<> l;
@@ -71,7 +71,7 @@ public class Foo {
public void testStringValue() {
myFixture.addClass 'package java.lang; class StringValue {}'
myFixture.addClass 'package foo; public class StringValue {}'
myFixture.configureByText 'a.java', '''
myFixture.configureByText 'a.java', '''\
public class Foo {
String<caret>Value sv;
}
@@ -90,7 +90,7 @@ public class Foo {
myFixture.addClass 'package foo; public class Log {}'
myFixture.addClass 'package bar; public class Log {}'
myFixture.addClass 'package bar; public class LogFactory { public static Log log(){} }'
myFixture.configureByText 'a.java', '''
myFixture.configureByText 'a.java', '''\
public class Foo {
Lo<caret>g l = bar.LogFactory.log();
}