extract method: correct extraction with leading comment

java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java

@@ -895,7 +895,7 @@ public class ExtractMethodProcessor implements MatchProvider {
 
   protected PsiElement addToMethodCallLocation(PsiStatement statement) throws IncorrectOperationException {
     if (myEnclosingBlockStatement == null) {
-      PsiElement containingStatement = PsiTreeUtil.getParentOfType(myExpression != null ? myExpression : myElements[0], PsiStatement.class, false);
+      PsiElement containingStatement = myElements[0] instanceof PsiComment ? myElements[0] : PsiTreeUtil.getParentOfType(myExpression != null ? myExpression : myElements[0], PsiStatement.class, false);
       if (containingStatement == null) {
         containingStatement = PsiTreeUtil.getParentOfType(myExpression != null ? myExpression : myElements[0], PsiComment.class, false);
       }

java/java-tests/testData/refactoring/extractMethod/ExtractWithLeadingComment.java

@@ -0,0 +1,12 @@
+class Test {
+    public void method2() {
+      if (true) {
+        <selection>
+        // add to list2
+        list2.add(true);</selection>
+
+      } else {
+
+      }
+    }
+}

java/java-tests/testData/refactoring/extractMethod/ExtractWithLeadingComment_after.java

@@ -0,0 +1,16 @@
+class Test {
+    public void method2() {
+      if (true) {
+          newMethod();
+
+
+      } else {
+
+      }
+    }
+
+    private void newMethod() {
+        // add to list2
+        list2.add(true);
+    }
+}

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

@@ -482,6 +482,10 @@ public class ExtractMethodTest extends LightCodeInsightTestCase {
     doTest();
   }
 
+  public void testExtractWithLeadingComment() throws Exception {
+    doTest();
+  }
+
   private void doPrepareErrorTest(final String expectedMessage) throws Exception {
     String expectedError = null;
     try {