functional expressions: push down conflicts

java/java-tests/testData/refactoring/pushDown/FunctionalExpression.java

@@ -0,0 +1,12 @@
+interface Base {
+    default void foo() {
+        System.out.println("Hi there.");
+    }
+    void ba<caret>r();
+}
+
+class Test {
+  {
+    Base base = () -> {};
+  }
+}

java/java-tests/testData/refactoring/pushDown/FunctionalExpressionDefaultMethod.java

@@ -0,0 +1,14 @@
+interface Base {
+    default void foo<caret>() {
+        System.out.println("Hi there.");
+    }
+    void bar();
+}
+
+class Test {
+  {
+    Base base = () -> {};
+  }
+}
+
+class Child implements Base {}

java/java-tests/testData/refactoring/pushDown/FunctionalExpressionDefaultMethod_after.java

@@ -0,0 +1,15 @@
+interface Base {
+    void bar();
+}
+
+class Test {
+  {
+    Base base = () -> {};
+  }
+}
+
+class Child implements Base {
+    public void foo() {
+    System.out.println("Hi there.");
+}
+}

java/java-tests/testData/refactoring/pushDown/FunctionalExpression_after.java

@@ -0,0 +1,11 @@
+interface Base {
+    default void foo() {
+        System.out.println("Hi there.");
+    }
+}
+
+class Test {
+  {
+    Base base = () -> {};
+  }
+}

java/java-tests/testSrc/com/intellij/refactoring/PushDownTest.java

@@ -54,6 +54,9 @@ public class PushDownTest extends LightRefactoringTestCase {
   public void testExtensionMethodToInterface() { doTest(); }
   public void testExtensionMethodToClass() { doTest(); }
 
+  public void testFunctionalExpression() { doTest(true);}
+  public void testFunctionalExpressionDefaultMethod() { doTest();}
+
   private void doTest() {
     doTest(false);
   }