Reused PyHierarchyNodeDescriptor

Removed PyCallHierarchyNodeDescriptor, updated tests to include the
new presentation of tree elements.

python/testData/hierarchy/call/Static/ArgumentList/ArgumentList_callee_verification.xml

@@ -1 +1 @@
-<node text="target_func(file_1.py)" base="true"/>
+<node text="target_func() (hierarchy.call.Static.ArgumentList.file_1)" base="true"/>

python/testData/hierarchy/call/Static/ArgumentList/ArgumentList_caller_verification.xml

@@ -1 +1 @@
-<node text="target_func(file_1.py)" base="true"/>
+<node text="target_func() (hierarchy.call.Static.ArgumentList.file_1)" base="true"/>

python/testData/hierarchy/call/Static/Constructor/Constructor_callee_verification.xml

@@ -1,8 +1,8 @@
-<node text="A.__init__(main.py)" base="true">
-  <node text="invoke1(main.py)">
-    <node text="A.method1(main.py)"/>
+<node text="A.__init__(self) (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>
-  <node text="invoke2(main.py)">
-    <node text="A.method2(main.py)"/>
+  <node text="invoke2(p) (hierarchy.call.Static.Constructor.main)">
+    <node text="A.method2(self) (hierarchy.call.Static.Constructor.main)"/>
   </node>
 </node>

python/testData/hierarchy/call/Static/Constructor/Constructor_caller_verification.xml

@@ -1,6 +1,6 @@
-<node text="A.__init__(main.py)" base="true">
-  <node text="invokeA(main.py)">
-    <node text="C.bar(main.py)"/>
+<node text="A.__init__(self) (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>
-  <node text="C.bar(main.py)"/>
+  <node text="C.bar(self) (hierarchy.call.Static.Constructor.main)"/>
 </node>

python/testData/hierarchy/call/Static/DefaultValue/DefaultValue_callee_verification.xml

@@ -1 +1 @@
-<node text="target_func(main.py)" base="true"/>
+<node text="target_func() (hierarchy.call.Static.DefaultValue.main)" base="true"/>

python/testData/hierarchy/call/Static/DefaultValue/DefaultValue_caller_verification.xml

@@ -1,4 +1,4 @@
-<node text="target_func(main.py)" base="true">
-  <node text="func2(main.py)"/>
-  <node text="func4(main.py)"/>
+<node text="target_func() (hierarchy.call.Static.DefaultValue.main)" base="true">
+  <node text="func2() (hierarchy.call.Static.DefaultValue.main)"/>
+  <node text="func4() (hierarchy.call.Static.DefaultValue.main)"/>
 </node>

python/testData/hierarchy/call/Static/Inheritance/Inheritance_callee_verification.xml

@@ -1 +1 @@
-<node text="A.target_func(main.py)" base="true"/>
+<node text="A.target_func(self) (hierarchy.call.Static.Inheritance.main)" base="true"/>

python/testData/hierarchy/call/Static/Inheritance/Inheritance_caller_verification.xml

@@ -1,4 +1,4 @@
-<node text="A.target_func(main.py)" base="true">
-  <node text="C.func(main.py)"/>
-  <node text="foo2(main.py)"/>
+<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="foo2(b) (hierarchy.call.Static.Inheritance.main)"/>
 </node>

python/testData/hierarchy/call/Static/InnerFunction/InnerFunction_callee_verification.xml

@@ -1,5 +1,5 @@
-<node text="target_func(main.py)" base="true">
-  <node text="foo(main.py)">
-    <node text="bar(main.py)"/>
+<node text="target_func() (hierarchy.call.Static.InnerFunction.main)" base="true">
+  <node text="foo() (hierarchy.call.Static.InnerFunction.main)">
+    <node text="bar() (hierarchy.call.Static.InnerFunction.main)"/>
   </node>
 </node>

python/testData/hierarchy/call/Static/InnerFunction/InnerFunction_caller_verification.xml

@@ -1 +1 @@
-<node text="target_func(main.py)" base="true"/>
+<node text="target_func() (hierarchy.call.Static.InnerFunction.main)" base="true"/>

python/testData/hierarchy/call/Static/Lambda/Lambda_callee_verification.xml

@@ -1,8 +1,8 @@
-<node text="target_func(main.py)" base="true">
-  <node text="func8(file_1.py)"/>
-  <node text="func13(file_1.py)"/>
-  <node text="func15(file_1.py)"/>
-  <node text="inner(main.py)">
-    <node text="func11(file_1.py)"/>
+<node text="target_func(x=func1, y=func2(), z=lambda: func3, w=lambda: func4()) (hierarchy.call.Static.Lambda.main)" base="true">
+  <node text="func8() (hierarchy.call.Static.Lambda.file_1)"/>
+  <node text="func13() (hierarchy.call.Static.Lambda.file_1)"/>
+  <node text="func15() (hierarchy.call.Static.Lambda.file_1)"/>
+  <node text="inner(ix=func7, iy=func8(), iz=lambda: func9, iw=lambda: func10()) (hierarchy.call.Static.Lambda.main)">
+    <node text="func11() (hierarchy.call.Static.Lambda.file_1)"/>
   </node>
 </node>

python/testData/hierarchy/call/Static/Lambda/Lambda_caller_verification.xml

@@ -1 +1 @@
-<node text="target_func(main.py)" base="true"/>
+<node text="target_func(x=func1, y=func2(), z=lambda: func3, w=lambda: func4()) (hierarchy.call.Static.Lambda.main)" base="true"/>

python/testData/hierarchy/call/Static/NestedCall/NestedCall_callee_verification.xml

@@ -1,12 +1,12 @@
-<node text="target_func(main.py)" base="true">
-  <node text="func5(file_1.py)"/>
-  <node text="func3(file_1.py)"/>
-  <node text="func6(file_1.py)"/>
-  <node text="func7(file_1.py)"/>
-  <node text="func2(file_1.py)"/>
-  <node text="func1(file_1.py)"/>
-  <node text="func10(file_1.py)"/>
-  <node text="inner(main.py)">
-    <node text="func1(file_1.py)"/>
+<node text="target_func() (hierarchy.call.Static.NestedCall.main)" base="true">
+  <node text="func5(*args) (hierarchy.call.Static.NestedCall.file_1)"/>
+  <node text="func3(*args) (hierarchy.call.Static.NestedCall.file_1)"/>
+  <node text="func6(*args) (hierarchy.call.Static.NestedCall.file_1)"/>
+  <node text="func7(*args) (hierarchy.call.Static.NestedCall.file_1)"/>
+  <node text="func2(*args) (hierarchy.call.Static.NestedCall.file_1)"/>
+  <node text="func1(*args) (hierarchy.call.Static.NestedCall.file_1)"/>
+  <node text="func10(*args) (hierarchy.call.Static.NestedCall.file_1)"/>
+  <node text="inner(*args) (hierarchy.call.Static.NestedCall.main)">
+    <node text="func1(*args) (hierarchy.call.Static.NestedCall.file_1)"/>
   </node>
 </node>

python/testData/hierarchy/call/Static/NestedCall/NestedCall_caller_verification.xml

@@ -1 +1 @@
-<node text="target_func(main.py)" base="true"/>
+<node text="target_func() (hierarchy.call.Static.NestedCall.main)" base="true"/>

python/testData/hierarchy/call/Static/OverriddenMethod/OverriddenMethod_callee_verification.xml

@@ -1,3 +1,3 @@
-<node text="B.target_func(main.py)" base="true">
-  <node text="A.another_func(file_1.py)"/>
+<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>

python/testData/hierarchy/call/Static/OverriddenMethod/OverriddenMethod_caller_verification.xml

@@ -1,5 +1,5 @@
-<node text="B.target_func(main.py)" base="true">
-  <node text="C.func1(main.py)"/>
-  <node text="bar1(main.py)"/>
-  <node text="C.func2(main.py)"/>
+<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="bar1(a) (hierarchy.call.Static.OverriddenMethod.main)"/>
+  <node text="C.func2(self) (hierarchy.call.Static.OverriddenMethod.main)"/>
 </node>

python/testData/hierarchy/call/Static/Parentheses/Parentheses_callee_verification.xml

@@ -1,3 +1,3 @@
-<node text="target_func(file_1.py)" base="true">
-  <node text="nothing(main.py)"/>
+<node text="target_func() (hierarchy.call.Static.Parentheses.file_1)" base="true">
+  <node text="nothing(x) (hierarchy.call.Static.Parentheses.main)"/>
 </node>

python/testData/hierarchy/call/Static/Parentheses/Parentheses_caller_verification.xml

@@ -1,3 +1,3 @@
-<node text="target_func(file_1.py)" base="true">
-  <node text="foo(file_1.py)"/>
+<node text="target_func() (hierarchy.call.Static.Parentheses.file_1)" base="true">
+  <node text="foo(x=bar()) (hierarchy.call.Static.Parentheses.file_1)"/>
 </node>

python/testData/hierarchy/call/Static/Simple/Simple_callee_verification.xml

@@ -1,3 +1,3 @@
-<node text="target_func(main.py)" base="true">
-  <node text="func1(main.py)"/>
+<node text="target_func() (hierarchy.call.Static.Simple.main)" base="true">
+  <node text="func1() (hierarchy.call.Static.Simple.main)"/>
 </node>

python/testData/hierarchy/call/Static/Simple/Simple_caller_verification.xml

@@ -1,3 +1,3 @@
-<node text="target_func(main.py)" base="true">
-  <node text="func2(main.py)"/>
+<node text="target_func() (hierarchy.call.Static.Simple.main)" base="true">
+  <node text="func2() (hierarchy.call.Static.Simple.main)"/>
 </node>