PY-2102 Extract method fails

python/src/com/jetbrains/python/codeInsight/codeFragment/PyCodeFragmentUtil.java

@@ -7,6 +7,7 @@ import com.intellij.codeInsight.codeFragment.Position;
 import com.intellij.codeInsight.controlflow.ConditionalInstruction;
 import com.intellij.codeInsight.controlflow.Instruction;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.containers.HashSet;
 import com.jetbrains.python.PyBundle;
 import com.jetbrains.python.codeInsight.controlflow.ScopeOwner;
@@ -83,6 +84,10 @@ public class PyCodeFragmentUtil {
           if (nextElement instanceof PyExceptPart){
             continue;
           }
+          // We allow raise statements in code
+          if (nextElement == null && PsiTreeUtil.getParentOfType(element, PyRaiseStatement.class) != null){
+            continue;
+          }
           if (!CodeFragmentUtil.elementFit(nextElement, start, end)){
             outerInstructions.add(next);
           }

python/testData/codeInsight/codefragment/raise2102.test

@@ -0,0 +1,17 @@
+foo()
+<begin>
+for i in range(l):
+    if foo:
+        if tag is None:
+            if bar:
+                do
+        else:
+            if baz:
+                raise ValueError(i)
+    else:
+        bzzzz
+<end>
+bar()
+<result>
+In:
+Out:

python/testSrc/com/jetbrains/python/refactoring/PyCodeFragmentTest.java

@@ -159,5 +159,10 @@ public class PyCodeFragmentTest extends LightMarkedTestCase {
   public void testForIfReturn() throws Exception {
     doTest();
   }
+
+  public void testRaise2102() throws Exception {
+    doTest();
+  }
+
 }