IDEA-259050 refactor this: don't search target element to Move between all possible parents

GitOrigin-RevId: c558f8718dcc473878acff1e29a09b96d9824d6c

java/java-tests/testData/refactoring/refactorThis/MoveIsFilteredOnMethodReference.java

@@ -0,0 +1,6 @@
+public class Test {
+
+    void test(){
+      System.out.println<caret>();
+    }
+}

java/java-tests/testData/refactoring/refactorThis/MoveIsFilteredOnStatement.java

@@ -0,0 +1,6 @@
+public class Test {
+
+    void test(){
+      <caret>System.out.println();
+    }
+}

java/java-tests/testData/refactoring/refactorThis/MoveOnClassDeclaration.java

@@ -0,0 +1,6 @@
+public class Test<caret> {
+
+    void test(){
+      System.out.println();
+    }
+}

java/java-tests/testData/refactoring/refactorThis/MoveOnMethodDeclaration.java

@@ -0,0 +1,6 @@
+public class Test {
+
+    void test<caret>(){
+      System.out.println();
+    }
+}

java/java-tests/testSrc/com/intellij/java/refactoring/RefactorThisTest.kt

@@ -87,6 +87,22 @@ class RefactorThisTest: LightJavaCodeInsightTestCase() {
     assertFalse(doActionExists<SafeDeleteAction>())
   }
 
+  fun testMoveIsFilteredOnStatement() {
+    assertFalse(doActionExists<MoveAction>())
+  }
+
+  fun testMoveIsFilteredOnMethodReference() {
+    assertFalse(doActionExists<MoveAction>())
+  }
+
+  fun testMoveIsFilteredOnConstructor() {
+    assertFalse(doActionExists<MoveAction>())
+  }
+
+  fun testMoveOnMethodDeclaration() {
+    assertTrue(doActionExists<MoveAction>())
+  }
+
   private inline fun <reified A> doActionExists(): Boolean {
     configureByFile("$BASE_PATH/${getTestName(false)}.java")
     return findAvailableActions().any { action -> action is A }

platform/lang-impl/src/com/intellij/refactoring/actions/MoveAction.java

@@ -17,8 +17,12 @@
 package com.intellij.refactoring.actions;
 
 import com.intellij.lang.Language;
+import com.intellij.openapi.actionSystem.ActionPlaces;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.refactoring.RefactoringActionHandler;
 import com.intellij.refactoring.move.MoveHandler;
 import org.jetbrains.annotations.NotNull;
@@ -46,6 +50,23 @@ public class MoveAction extends BaseRefactoringAction {
     return MoveHandler.canMove(elements, null);
   }
 
+  @Override
+  protected boolean isAvailableOnElementInEditorAndFile(@NotNull PsiElement element,
+                                                        @NotNull Editor editor,
+                                                        @NotNull PsiFile file,
+                                                        @NotNull DataContext context,
+                                                        @NotNull String place) {
+    if (place.equals(ActionPlaces.REFACTORING_QUICKLIST)) {
+      PsiElement caretElement = BaseRefactoringAction.getElementAtCaret(editor, file);
+      if (PsiTreeUtil.isAncestor(element, caretElement, false)) {
+        return isEnabledOnElements(new PsiElement[]{element});
+      } else {
+        return isEnabledOnElements(new PsiElement[]{caretElement});
+      }
+    }
+    return super.isAvailableOnElementInEditorAndFile(element, editor, file, context, place);
+  }
+
   @Override
   protected boolean isEnabledOnDataContext(@NotNull DataContext dataContext) {
     return MoveHandler.canMove(dataContext);