Keep else part on unwrap for and while

fixed  PY-8569 Unwrap for loop statement should not delete else part

python/src/com/jetbrains/python/refactoring/unwrap/PyForUnwrapper.java

@@ -28,6 +28,7 @@ public class PyForUnwrapper extends PyUnwrapper {
   protected void doUnwrap(final PsiElement element, final Context context) throws IncorrectOperationException {
     final PyForStatement forStatement = (PyForStatement)element;
     context.extractPart(forStatement);
+    context.extractPart(forStatement.getElsePart());
     context.delete(forStatement);
   }
 }

python/src/com/jetbrains/python/refactoring/unwrap/PyWhileUnwrapper.java

@@ -28,6 +28,7 @@ public class PyWhileUnwrapper extends PyUnwrapper {
   protected void doUnwrap(final PsiElement element, final Context context) throws IncorrectOperationException {
     final PyWhileStatement whileStatement = (PyWhileStatement)element;
     context.extractPart(whileStatement);
+    context.extractPart(whileStatement.getElsePart());
     context.delete(whileStatement);
   }
 }

python/testData/refactoring/unwrap/forElseUnwrap_after.py

@@ -0,0 +1,2 @@
+print 1
+print 2

python/testData/refactoring/unwrap/forElseUnwrap_before.py

@@ -0,0 +1,4 @@
+for item in range(1):
+        prin<caret>t 1
+else:
+        print 2

python/testData/refactoring/unwrap/whileElseUnwrap_after.py

@@ -0,0 +1,2 @@
+x = 1
+print 2

python/testData/refactoring/unwrap/whileElseUnwrap_before.py

@@ -0,0 +1,4 @@
+while True:
+    x =<caret> 1
+else:
+    print 2

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

@@ -21,6 +21,7 @@ public class PyUnwrapperTest extends PyTestCase {
   public void testWhileUnwrap()                       throws Throwable {doTest();}
   public void testWhileUnwrapEmpty()                  throws Throwable {doNegativeTest();}
   public void testWhileUnwrapMultipleStatements()     throws Throwable {doTest();}
+  public void testWhileElseUnwrap()                   throws Throwable {doTest();}
 
   public void testIfWithElseUnwrap()                  throws Throwable {doTest();}
   public void testIfInWhileUnwrap()                   throws Throwable {doTest();}
@@ -40,6 +41,7 @@ public class PyUnwrapperTest extends PyTestCase {
   public void testTryElseFinallyUnwrap()              throws Throwable {doTest();}
 
   public void testForUnwrap()                         throws Throwable {doTest();}
+  public void testForElseUnwrap()                     throws Throwable {doTest();}
 
   public void testWithUnwrap()                        throws Throwable {doTest(LanguageLevel.PYTHON32);}