MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed unnecessary cls argument when extracting @classmethod (PY-6624)

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2012-05-23 19:36:51 +04:00
parent 9544579b0e
commit f4f66b0f32
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
python/src/com/jetbrains/python/codeInsight/codeFragment/PyCodeFragmentUtil.java
View File

@@ -59,8 +59,8 @@ public class PyCodeFragmentUtil {
for (PsiElement element : filterElementsInScope(getInputElements(subGraph, graph), owner)) {
final String name = getName(element);
if (name != null) {
// Ignore "self", it is generated automatically when extracting any method fragment
if (PyPsiUtils.isMethodContext(element) && "self".equals(name)) {
// Ignore "self" and "cls", they are generated automatically when extracting any method fragment
if (resolvesToBoundMethodParameter(element)) {
continue;
}
if (globalWrites.contains(name)) {
@@ -82,6 +82,33 @@ public class PyCodeFragmentUtil {
return new PyCodeFragment(inputNames, outputNames, globalWrites, subGraphAnalysis.returns > 0);
}
private static boolean resolvesToBoundMethodParameter(@NotNull PsiElement element) {
if (PyPsiUtils.isMethodContext(element)) {
final PyFunction function = PsiTreeUtil.getParentOfType(element, PyFunction.class);
if (function != null) {
final PsiReference reference = element.getReference();
if (reference != null) {
final PsiElement resolved = reference.resolve();
if (resolved instanceof PyParameter) {
final PyParameterList parameterList = PsiTreeUtil.getParentOfType(resolved, PyParameterList.class);
if (parameterList != null) {
final PyParameter[] parameters = parameterList.getParameters();
if (parameters.length > 0) {
if (resolved == parameters[0]) {
final PyFunction.Modifier modifier = function.getModifier();
if (modifier == null || modifier == PyFunction.Modifier.CLASSMETHOD) {
return true;
}
}
}
}
}
}
}
}
return false;
}
@Nullable
private static String getName(@NotNull PsiElement element) {
if (element instanceof PsiNamedElement) {

4
python/testData/refactoring/extractmethod/ClassMethod.after.py
View File

@@ -1,8 +1,8 @@
class C:
@classmethod
def baz(cls):
print "hello world"
print('foo', cls)
@classmethod
def foo(cls):
cls.baz()
cls.baz()

2
python/testData/refactoring/extractmethod/ClassMethod.before.py
View File

@@ -1,4 +1,4 @@
class C:
@classmethod
def foo(cls):
<selection>print "hello world"</selection>
<selection>print('foo', cls)</selection>