diff --git a/java/java-tests/testData/refactoring/extractMethodNew/DontMakeParametersFinalDueToUsagesInsideAnonymous.java b/java/java-tests/testData/refactoring/extractMethodNew/DontMakeParametersFinalDueToUsagesInsideAnonymous.java
index 20edcc5e6b05..6542c25bde21 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/DontMakeParametersFinalDueToUsagesInsideAnonymous.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/DontMakeParametersFinalDueToUsagesInsideAnonymous.java
@@ -1,20 +1,21 @@
 class Box {
-  private void test(String str1, String str2) {
-    Data data = <selection>new Data() {
-      @Override
-      public String getA() {
-        return str1;
-      }
-      @Override
-      public String getB() {
-        return str2;
-      }
-    }</selection>;
-    System.out.println(data);
-  }
+    private void test(String str1, String str2) {
+        Data data = <selection>new Data() {
+            @Override
+            public String getA() {
+                return str1;
+            }
 
-  static interface Data {
-    String getA();
-    String getB();
-  }
+            @Override
+            public String getB() {
+                return str2;
+            }
+        }</selection>;
+        System.out.println(data);
+    }
+
+    static interface Data {
+        String getA();
+        String getB();
+    }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/DontMakeParametersFinalDueToUsagesInsideAnonymous_after.java b/java/java-tests/testData/refactoring/extractMethodNew/DontMakeParametersFinalDueToUsagesInsideAnonymous_after.java
index 86a55fec2408..f16c12cd90c0 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/DontMakeParametersFinalDueToUsagesInsideAnonymous_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/DontMakeParametersFinalDueToUsagesInsideAnonymous_after.java
@@ -1,27 +1,28 @@
 import org.jetbrains.annotations.NotNull;
 
 class Box {
-  private void test(String str1, String str2) {
-    Data data = newMethod(str1, str2);
-    System.out.println(data);
-  }
+    private void test(String str1, String str2) {
+        Data data = newMethod(str1, str2);
+        System.out.println(data);
+    }
 
     @NotNull
     private Data newMethod(String str1, String str2) {
         return new Data() {
-          @Override
-          public String getA() {
-            return str1;
-          }
-          @Override
-          public String getB() {
-            return str2;
-          }
+            @Override
+            public String getA() {
+                return str1;
+            }
+
+            @Override
+            public String getB() {
+                return str2;
+            }
         };
     }
 
     static interface Data {
-    String getA();
-    String getB();
-  }
+        String getA();
+        String getB();
+    }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NoExpressionFormatting1.java b/java/java-tests/testData/refactoring/extractMethodNew/NoExpressionFormatting1.java
new file mode 100644
index 000000000000..7a10b559b9da
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethodNew/NoExpressionFormatting1.java
@@ -0,0 +1,5 @@
+class C {
+    void foo(Object o) {
+        <selection>((Runnable)(() -> System.out.println()))</selection>.run();
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NoExpressionFormatting1_after.java b/java/java-tests/testData/refactoring/extractMethodNew/NoExpressionFormatting1_after.java
new file mode 100644
index 000000000000..2b4fee274bb5
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethodNew/NoExpressionFormatting1_after.java
@@ -0,0 +1,12 @@
+import org.jetbrains.annotations.NotNull;
+
+class C {
+    void foo(Object o) {
+        newMethod().run();
+    }
+
+    @NotNull
+    private Runnable newMethod() {
+        return (Runnable)(() -> System.out.println());
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NoExpressionFormatting2.java b/java/java-tests/testData/refactoring/extractMethodNew/NoExpressionFormatting2.java
new file mode 100644
index 000000000000..db8d307dafe4
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethodNew/NoExpressionFormatting2.java
@@ -0,0 +1,7 @@
+import java.util.*;
+
+class Test extends GregorianCalendar {
+    public boolean isSaturday() {
+        return <selection>get  ( Calendar      .DAY_OF_WEEK )</selection> == SATURDAY;
+    }    
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NoExpressionFormatting2_after.java b/java/java-tests/testData/refactoring/extractMethodNew/NoExpressionFormatting2_after.java
new file mode 100644
index 000000000000..9570b90a3d07
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethodNew/NoExpressionFormatting2_after.java
@@ -0,0 +1,11 @@
+import java.util.*;
+
+class Test extends GregorianCalendar {
+    public boolean isSaturday() {
+        return newMethod() == SATURDAY;
+    }
+
+    private int newMethod() {
+        return get  ( Calendar      .DAY_OF_WEEK );
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInIfNoBlock.java b/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInIfNoBlock.java
index 11e403c6b6e1..6d6556a8611b 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInIfNoBlock.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInIfNoBlock.java
@@ -4,7 +4,7 @@ import org.jetbrains.annotations.Nullable;
 class C {
     void foo(@Nullable Object o) {
         if (o != null)
-            <selection>((Runnable)(() -> bar(o)))</selection>.run();
+            <selection>((Runnable) (() -> bar(o)))</selection>.run();
     }
 
     void bar(@NotNull Object o) {
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInIfNoBlock_after.java b/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInIfNoBlock_after.java
index af3f2fcfd3e8..be5f095fa784 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInIfNoBlock_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInIfNoBlock_after.java
@@ -9,7 +9,7 @@ class C {
 
     @NotNull
     private Runnable newMethod(@NotNull Object o) {
-        return (Runnable)(() -> bar(o));
+        return (Runnable) (() -> bar(o));
     }
 
     void bar(@NotNull Object o) {
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInWhileNoBlock.java b/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInWhileNoBlock.java
index 2538c7ceb899..37ef555a4680 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInWhileNoBlock.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInWhileNoBlock.java
@@ -4,7 +4,7 @@ import org.jetbrains.annotations.Nullable;
 class C {
     void foo(@Nullable Object o) {
         while (o != null)
-            <selection>((Runnable)(() -> bar(o)))</selection>.run();
+            <selection>((Runnable) (() -> bar(o)))</selection>.run();
     }
 
     void bar(@NotNull Object o) {
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInWhileNoBlock_after.java b/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInWhileNoBlock_after.java
index 927416cea2b7..037d898917a9 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInWhileNoBlock_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInWhileNoBlock_after.java
@@ -9,7 +9,7 @@ class C {
 
     @NotNull
     private Runnable newMethod(@NotNull Object o) {
-        return (Runnable)(() -> bar(o));
+        return (Runnable) (() -> bar(o));
     }
 
     void bar(@NotNull Object o) {
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ParameterFormatting.java b/java/java-tests/testData/refactoring/extractMethodNew/ParameterFormatting.java
new file mode 100644
index 000000000000..9365273669d1
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ParameterFormatting.java
@@ -0,0 +1,8 @@
+class Test {
+    void foo(String[] ss) {
+        int x = 42;
+        <selection>
+        System.out.println(x+1);
+        </selection>
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ParameterFormatting_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ParameterFormatting_after.java
new file mode 100644
index 000000000000..ea64aff09f8c
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ParameterFormatting_after.java
@@ -0,0 +1,12 @@
+class Test {
+    void foo(String[] ss) {
+        int x = 42;
+
+        newMethod(x);
+
+    }
+
+    private void newMethod(int x) {
+        System.out.println(x+1);
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/Scr6241.java b/java/java-tests/testData/refactoring/extractMethodNew/Scr6241.java
index e7c8a2ed2d99..41422e2ca664 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/Scr6241.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/Scr6241.java
@@ -2,6 +2,6 @@ import java.util.*;
 
 class Test extends GregorianCalendar {
     public boolean isSaturday() {
-        return <selection>get( Calendar.DAY_OF_WEEK )</selection> == SATURDAY;
+        return <selection>get(Calendar.DAY_OF_WEEK)</selection> == SATURDAY;
     }    
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/Scr6241_after.java b/java/java-tests/testData/refactoring/extractMethodNew/Scr6241_after.java
index 6dc9793981d6..ed31b7d06fd4 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/Scr6241_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/Scr6241_after.java
@@ -6,6 +6,6 @@ class Test extends GregorianCalendar {
     }
 
     private int newMethod() {
-        return get( Calendar.DAY_OF_WEEK );
+        return get(Calendar.DAY_OF_WEEK);
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/VerboseArrayAccess.java b/java/java-tests/testData/refactoring/extractMethodNew/VerboseArrayAccess.java
index cb8c06d93422..865d7660f3e5 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/VerboseArrayAccess.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/VerboseArrayAccess.java
@@ -3,7 +3,7 @@ class Test {
      for(int i = 0; i < ss.length; i++) {
        <selection>
        System.out.println(ss[i]);
-       System.out.println(ss[i+1]);
+       System.out.println(ss[i + 1]);
        </selection>
      }
   }
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/VerboseArrayAccess_after.java b/java/java-tests/testData/refactoring/extractMethodNew/VerboseArrayAccess_after.java
index 3d1de598e627..875c5c2e73b1 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/VerboseArrayAccess_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/VerboseArrayAccess_after.java
@@ -9,6 +9,6 @@ class Test {
 
     private void newMethod(String[] ss, int i) {
         System.out.println(ss[i]);
-        System.out.println(ss[i+1]);
+        System.out.println(ss[i + 1]);
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodNewTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodNewTest.java
index 2dbe2f5f40db..79d0277f36ae 100644
--- a/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodNewTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodNewTest.java
@@ -618,6 +618,18 @@ public class ExtractMethodNewTest extends LightJavaCodeInsightTestCase {
     doTest();
   }
 
+  public void testParameterFormatting() throws Exception {
+    doTest();
+  }
+
+  public void testNoExpressionFormatting1() throws Exception {
+    doTest();
+  }
+
+  public void testNoExpressionFormatting2() throws Exception {
+    doTest();
+  }
+
   public void testReturnStatementFolding() throws Exception {
     doTest();
   }