introduce code block parameter: extract from code block

java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java

@@ -1036,7 +1036,9 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase {
       text = start + refText + (suffix != null ? suffix : "") + end;
     }
     final PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory();
-    return parent instanceof PsiStatement || parent instanceof PsiCodeBlock ? factory.createStatementFromText(text, parent) : factory.createExpressionFromText(text, parent);
+    return parent instanceof PsiStatement ? factory.createStatementFromText(text, parent) :
+                                            parent instanceof PsiCodeBlock ? factory.createCodeBlockFromText(text, parent) 
+                                                                           : factory.createExpressionFromText(text, parent);
   }
 
   private boolean parentStatementNotFound(final Project project, Editor editor) {

java/java-tests/testData/refactoring/introduceFunctionalParameter/afterIntConsumer.java

@@ -10,7 +10,7 @@ class Test {
     });
   }
   
-  void foo(int i, Consumer<Integer> anObject){
+  void foo(int i, Consumer<Integer> anObject) {
 
       anObject.accept(i);
 

java/java-tests/testData/refactoring/introduceFunctionalParameter/afterIntConsumerFromIfStatement.java

@@ -0,0 +1,20 @@
+import java.util.function.Consumer;
+
+class Test {
+    void bar() {
+    foo(1, new Consumer<Integer>() {
+        public void accept(Integer i) {
+            System.out.println(i);
+            System.out.println(i);
+        }
+    });
+  }
+  
+  void foo(int i, Consumer<Integer> anObject) {
+    if (i > 0) {
+
+        anObject.accept(i);
+
+    }
+  }
+}

java/java-tests/testData/refactoring/introduceFunctionalParameter/afterSampleRunnable.java

@@ -8,7 +8,7 @@ class Test {
     });
   }
   
-  void foo(Runnable anObject){
+  void foo(Runnable anObject) {
 
       anObject.run();
 

java/java-tests/testData/refactoring/introduceFunctionalParameter/beforeIntConsumerFromIfStatement.java

@@ -0,0 +1,14 @@
+class Test {
+  void bar() {
+    foo(1);
+  }
+  
+  void foo(int i) {
+    if (i > 0) {
+      <selection>
+       System.out.println(i);
+      System.out.println(i);
+      </selection>
+    }
+  }
+}

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

@@ -33,6 +33,10 @@ public class IntroduceFunctionalParameterTest extends LightRefactoringTestCase
     doTest(null);
   }
 
+  public void testIntConsumerFromIfStatement() throws Exception {
+    doTest(null);
+  }
+
   @NotNull
   @Override
   protected String getTestDataPath() {