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

Added class back to the location string of a function (PY-14205)

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2014-11-10 17:11:03 +03:00
parent d10a06d4ff
commit 12bbfd0625
7 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
+10
View File
@@ -270,6 +270,16 @@ public class PyFunctionImpl extends PyBaseElementImpl<PyFunctionStub> implements
public String getPresentableText() {
return notNullize(getName(), PyNames.UNNAMED_ELEMENT) + getParameterList().getPresentableText(true);
}
@Nullable
@Override
public String getLocationString() {
final PyClass containingClass = getContainingClass();
if (containingClass != null) {
return "(" + containingClass.getName() + " in " + getPackageForFile(getContainingFile()) + ")";
}
return super.getLocationString();
}
};
}
python/testData/hierarchy/call/Static/Constructor/Constructor_callee_verification.xml
+3 -3
View File
@@ -1,8 +1,8 @@
<node text="A.__init__(self) (hierarchy.call.Static.Constructor.main)" base="true">
<node text="A.__init__(self) (A in hierarchy.call.Static.Constructor.main)" base="true">
<node text="invoke1(p) (hierarchy.call.Static.Constructor.main)">
<node text="A.method1(self) (hierarchy.call.Static.Constructor.main)"/>
<node text="A.method1(self) (A in hierarchy.call.Static.Constructor.main)"/>
</node>
<node text="invoke2(p) (hierarchy.call.Static.Constructor.main)">
<node text="A.method2(self) (hierarchy.call.Static.Constructor.main)"/>
<node text="A.method2(self) (A in hierarchy.call.Static.Constructor.main)"/>
</node>
</node>
python/testData/hierarchy/call/Static/Constructor/Constructor_caller_verification.xml
+3 -3
View File
@@ -1,6 +1,6 @@
<node text="A.__init__(self) (hierarchy.call.Static.Constructor.main)" base="true">
<node text="A.__init__(self) (A in hierarchy.call.Static.Constructor.main)" base="true">
<node text="invokeA() (hierarchy.call.Static.Constructor.main)">
<node text="C.bar(self) (hierarchy.call.Static.Constructor.main)"/>
<node text="C.bar(self) (C in hierarchy.call.Static.Constructor.main)"/>
</node>
<node text="C.bar(self) (hierarchy.call.Static.Constructor.main)"/>
<node text="C.bar(self) (C in hierarchy.call.Static.Constructor.main)"/>
</node>
python/testData/hierarchy/call/Static/Inheritance/Inheritance_callee_verification.xml
+1 -1
View File
@@ -1 +1 @@
<node text="A.target_func(self) (hierarchy.call.Static.Inheritance.main)" base="true"/>
<node text="A.target_func(self) (A in hierarchy.call.Static.Inheritance.main)" base="true"/>
python/testData/hierarchy/call/Static/Inheritance/Inheritance_caller_verification.xml
+2 -2
View File
@@ -1,4 +1,4 @@
<node text="A.target_func(self) (hierarchy.call.Static.Inheritance.main)" base="true">
<node text="C.func(self, a) (hierarchy.call.Static.Inheritance.main)"/>
<node text="A.target_func(self) (A in hierarchy.call.Static.Inheritance.main)" base="true">
<node text="C.func(self, a) (C in hierarchy.call.Static.Inheritance.main)"/>
<node text="foo2(b) (hierarchy.call.Static.Inheritance.main)"/>
</node>
python/testData/hierarchy/call/Static/OverriddenMethod/OverriddenMethod_callee_verification.xml
+2 -2
View File
@@ -1,3 +1,3 @@
<node text="B.target_func(self, p) (hierarchy.call.Static.OverriddenMethod.main)" base="true">
<node text="A.another_func(self) (hierarchy.call.Static.OverriddenMethod.file_1)"/>
<node text="B.target_func(self, p) (B in hierarchy.call.Static.OverriddenMethod.main)" base="true">
<node text="A.another_func(self) (A in hierarchy.call.Static.OverriddenMethod.file_1)"/>
</node>
python/testData/hierarchy/call/Static/OverriddenMethod/OverriddenMethod_caller_verification.xml
+3 -3
View File
@@ -1,5 +1,5 @@
<node text="B.target_func(self, p) (hierarchy.call.Static.OverriddenMethod.main)" base="true">
<node text="C.func1(self, a) (hierarchy.call.Static.OverriddenMethod.main)"/>
<node text="B.target_func(self, p) (B in hierarchy.call.Static.OverriddenMethod.main)" base="true">
<node text="C.func1(self, a) (C in hierarchy.call.Static.OverriddenMethod.main)"/>
<node text="bar1(a) (hierarchy.call.Static.OverriddenMethod.main)"/>
<node text="C.func2(self) (hierarchy.call.Static.OverriddenMethod.main)"/>
<node text="C.func2(self) (C in hierarchy.call.Static.OverriddenMethod.main)"/>
</node>