fixed PY-9260 Unwrap/Remove action is not available inside statement with caret on indented space

python/src/com/jetbrains/python/psi/PyUtil.java

@@ -1177,7 +1177,7 @@ public class PyUtil {
   }
 
   @Nullable
-  public static PsiElement findNonWhitespaceAtOffset(PsiFile psiFile, int caretOffset) {
+  public static PsiElement findPrevNonWhitespaceAtOffset(PsiFile psiFile, int caretOffset) {
     PsiElement element = psiFile.findElementAt(caretOffset);
     if (element == null) {
       return null;
@@ -1195,6 +1195,14 @@ public class PyUtil {
     return element instanceof PsiWhiteSpace ? null : element;
   }
 
+  @Nullable
+  public static PsiElement findNonWhitespaceAtOffset(PsiFile psiFile, int caretOffset) {
+    PsiElement element = findNextNonWhitespaceAtOffset(psiFile, caretOffset);
+    if (element == null)
+      element = findPrevNonWhitespaceAtOffset(psiFile, caretOffset);
+    return element;
+  }
+
   @Nullable
   public static PsiElement findNextNonWhitespaceAtOffset(@NotNull final PsiFile psiFile, int caretOffset) {
     PsiElement element = psiFile.findElementAt(caretOffset);

python/testData/refactoring/unwrap/whitespaceAtCaretUnwrap_after.py

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

python/testData/refactoring/unwrap/whitespaceAtCaretUnwrap_before.py

@@ -0,0 +1,4 @@
+
+if True:
+  <caret>  print 1
+    print 2

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

@@ -50,6 +50,8 @@ public class PyUnwrapperTest extends PyTestCase {
 
   public void testIfInElifBranchUnwrap()              throws Throwable {doNegativeTest(PyBundle.message("unwrap.if"));}
 
+  public void testWhitespaceAtCaretUnwrap()           throws Throwable {doTest();}
+
   private void doTest() {
     doTest(0);
   }