MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-17265 Do not search for a movable function or a reference to it under the caret manually

Browse Source 
It was necessary when "Make  ... Top-Level" was a general refactoring
action, but now by MoveHandler's machinery takes care of it.
This commit is contained in:
Mikhail Golubev
2016-10-25 00:03:49 +03:00
parent 749221f704
commit 248ee0e44b
2 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/refactoring/move/PyMoveSymbolDelegate.java
+7 -23
View File
@@ -64,7 +64,7 @@ public class PyMoveSymbolDelegate extends MoveHandlerDelegate {
return false;
}
// Local function or method
if (findMovableLocalFunctionOrMethod(elements[0]) != null) {
if (isMovableLocalFunctionOrMethod(elements[0])) {
return true;
}
@@ -88,8 +88,8 @@ public class PyMoveSymbolDelegate extends MoveHandlerDelegate {
}
final BaseRefactoringProcessor processor;
final PyFunction function = findMovableLocalFunctionOrMethod(elements[0]);
if (function != null) {
if (isMovableLocalFunctionOrMethod(elements[0])) {
final PyFunction function = (PyFunction)elements[0];
final PyMakeFunctionTopLevelDialog dialog = new PyMakeFunctionTopLevelDialog(project, function, initialPath, initialPath);
if (!dialog.showAndGet()) {
return;
@@ -156,7 +156,7 @@ public class PyMoveSymbolDelegate extends MoveHandlerDelegate {
// Fallback to the old way to select single element to move
final PsiNamedElement e = PyMoveModuleMembersHelper.extractNamedElement(element);
if (e != null && PyMoveModuleMembersHelper.hasMovableElementType(e)) {
if (PyMoveModuleMembersHelper.isMovableModuleMember(e) || findMovableLocalFunctionOrMethod(e) != null) {
if (PyMoveModuleMembersHelper.isMovableModuleMember(e) || isMovableLocalFunctionOrMethod(e)) {
doMove(project, new PsiElement[]{e}, targetContainer, null);
}
else {
@@ -191,27 +191,11 @@ public class PyMoveSymbolDelegate extends MoveHandlerDelegate {
}
@VisibleForTesting
@Nullable
public static PyFunction findMovableLocalFunctionOrMethod(@NotNull PsiElement element) {
if (isLocalFunction(element) || isSuitableInstanceMethod(element)) {
return (PyFunction)element;
}
// e.g. caret is on "def" keyword
if (isLocalFunction(element.getParent()) || isSuitableInstanceMethod(element.getParent())) {
return (PyFunction)element.getParent();
}
final PyReferenceExpression refExpr = PsiTreeUtil.getParentOfType(element, PyReferenceExpression.class);
if (refExpr == null) {
return null;
}
final PsiElement resolved = refExpr.getReference().resolve();
if (isLocalFunction(resolved) || isSuitableInstanceMethod(resolved)) {
return (PyFunction)resolved;
}
return null;
public static boolean isMovableLocalFunctionOrMethod(@NotNull PsiElement element) {
return isLocalFunction(element) || isSuitableInstanceMethod(element);
}
public static boolean isSuitableInstanceMethod(@Nullable PsiElement element) {
private static boolean isSuitableInstanceMethod(@Nullable PsiElement element) {
final PyFunction function = as(element, PyFunction.class);
if (function == null || function.getContainingClass() == null) {
return false;
python/testSrc/com/jetbrains/python/refactoring/PyMakeFunctionTopLevelTest.java
+31 -3
View File
@@ -17,11 +17,17 @@ package com.jetbrains.python.refactoring;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiReference;
import com.intellij.refactoring.RefactoringBundle;
import com.intellij.refactoring.actions.MoveAction;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.testFramework.TestActionEvent;
import com.intellij.util.IncorrectOperationException;
import com.jetbrains.python.PyBundle;
import com.jetbrains.python.PyTokenTypes;
@@ -99,8 +105,30 @@ public class PyMakeFunctionTopLevelTest extends PyTestCase {
}
private boolean isActionEnabled() {
final PsiElement elementUnderCaret = myFixture.getFile().findElementAt(myFixture.getCaretOffset());
return PyMoveSymbolDelegate.findMovableLocalFunctionOrMethod(elementUnderCaret) != null;
final int offset = myFixture.getCaretOffset();
PsiElement element = myFixture.getFile().findElementAt(offset);
// Duplicates the logic of MoveHandler#invoke(), since it doesn't allow to check
// whether MoveHandlerDelegate#tryMove() returns true or false without actually
// invoking it.
while (element != null) {
if (PyMoveSymbolDelegate.isMovableLocalFunctionOrMethod(element)) {
return true;
}
final TextRange range = element.getTextRange();
if (range != null) {
final int relative = offset - range.getStartOffset();
final PsiReference reference = element.findReferenceAt(relative);
if (reference != null) {
final PsiElement refElement = reference.resolve();
if (refElement != null && PyMoveSymbolDelegate.isMovableLocalFunctionOrMethod(myFixture.getElementAtCaret())) {
return true;
}
}
}
element = element.getParent();
}
return false;
}
// PY-6637
@@ -122,7 +150,7 @@ public class PyMakeFunctionTopLevelTest extends PyTestCase {
myFixture.getEditor().getCaretModel().moveCaretRelatively(-3, 0, false, false, false);
final PsiElement tokenAtCaret = file.findElementAt(myFixture.getCaretOffset());
assertNotNull(tokenAtCaret);
assertEquals(tokenAtCaret.getNode().getElementType(), PyTokenTypes.DEF_KEYWORD);
assertEquals(PyTokenTypes.DEF_KEYWORD, tokenAtCaret.getNode().getElementType());
assertTrue(isActionEnabled());
moveByText("method");