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

forbid change signature for functions with tuple params

Browse Source
This commit is contained in:
Ekaterina Tuzova
2012-11-23 15:07:53 +04:00
parent b2c764765b
commit 7dbfef52e9
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureHandler.java
+21 -7
View File
@@ -2,6 +2,7 @@ package com.jetbrains.python.refactoring.changeSignature;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.LangDataKeys;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.application.ex.ApplicationManagerEx;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
@@ -9,11 +10,11 @@ import com.intellij.openapi.ui.Messages;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.refactoring.RefactoringBundle;
import com.intellij.refactoring.changeSignature.ChangeSignatureHandler;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.jetbrains.python.PyBundle;
import com.jetbrains.python.psi.PyClass;
import com.jetbrains.python.psi.PyFunction;
import com.jetbrains.python.psi.PyUtil;
import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.search.PySuperMethodsSearch;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -43,13 +44,14 @@ public class PyChangeSignatureHandler implements ChangeSignatureHandler {
if (element == null) {
element = LangDataKeys.PSI_ELEMENT.getData(dataContext);
}
invokeOnElement(project, element);
invokeOnElement(project, element, editor);
}
@Override
public void invoke(@NotNull Project project, @NotNull PsiElement[] elements, @Nullable DataContext dataContext) {
if (elements.length != 1) return;
invokeOnElement(project, elements[0]);
Editor editor = dataContext == null ? null : PlatformDataKeys.EDITOR.getData(dataContext);
invokeOnElement(project, elements[0], editor);
}
@Nullable
@@ -58,14 +60,26 @@ public class PyChangeSignatureHandler implements ChangeSignatureHandler {
return PyBundle.message("refactoring.change.signature.error.wrong.caret.position.method.name");
}
private static void invokeOnElement(Project project, PsiElement element) {
private static void invokeOnElement(Project project, PsiElement element, Editor editor) {
if (!(element instanceof PyFunction)) return;
final PyFunction newFunction = getSuperMethod((PyFunction)element);
if (newFunction == null) return;
if (!newFunction.equals(element)) {
invokeOnElement(project, newFunction);
invokeOnElement(project, newFunction, editor);
}
else {
final PyFunction function = (PyFunction)element;
final PyParameter[] parameters = function.getParameterList().getParameters();
for (PyParameter p : parameters) {
if (p instanceof PyTupleParameter) {
String message =
RefactoringBundle.getCannotRefactorMessage("Function contains tuple parameters");
CommonRefactoringUtil.showErrorHint(project, editor, message,
REFACTORING_NAME, REFACTORING_NAME);
return;
}
}
final PyMethodDescriptor method = new PyMethodDescriptor((PyFunction)element);
PyChangeSignatureDialog dialog = new PyChangeSignatureDialog(project, method);
dialog.show();