Rename: this object, receiver argument -> dispatch receiver, extension receiver

compiler/tests/org/jetbrains/jet/resolve/ResolveTestGenerated.java

@@ -245,6 +245,18 @@ public class ResolveTestGenerated extends AbstractResolveTest {
             doTest(fileName);
         }
         
+        @TestMetadata("dispatchReceiverVsExtensionReceiver.resolve")
+        public void testDispatchReceiverVsExtensionReceiver() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/dispatchReceiverVsExtensionReceiver.resolve");
+            doTest(fileName);
+        }
+        
+        @TestMetadata("dispatchReceiverVsExtensionReceiver2.resolve")
+        public void testDispatchReceiverVsExtensionReceiver2() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/dispatchReceiverVsExtensionReceiver2.resolve");
+            doTest(fileName);
+        }
+        
         @TestMetadata("extensionToCloserReceiverVsMember.resolve")
         public void testExtensionToCloserReceiverVsMember() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/extensionToCloserReceiverVsMember.resolve");
@@ -299,18 +311,6 @@ public class ResolveTestGenerated extends AbstractResolveTest {
             doTest(fileName);
         }
         
-        @TestMetadata("receiverVsThisObject.resolve")
-        public void testReceiverVsThisObject() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/receiverVsThisObject.resolve");
-            doTest(fileName);
-        }
-        
-        @TestMetadata("receiverVsThisObject2.resolve")
-        public void testReceiverVsThisObject2() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/receiverVsThisObject2.resolve");
-            doTest(fileName);
-        }
-        
         @TestMetadata("wrongReceiverVsOtherError.resolve")
         public void testWrongReceiverVsOtherError() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/wrongReceiverVsOtherError.resolve");

compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt

@@ -98,8 +98,8 @@ private fun ResolvedCall<*>.renderToText(): String {
         appendln()
 
         appendln("Explicit receiver kind = ${getExplicitReceiverKind()}")
-        appendln("This object = ${getThisObject().getText()}")
-        appendln("Receiver argument = ${getReceiverArgument().getText()}")
+        appendln("Dispatch receiver = ${getDispatchReceiver().getText()}")
+        appendln("Extension receiver = ${getExtensionReceiver().getText()}")
 
         val valueArguments = getCall().getValueArguments()
         if (!valueArguments.isEmpty()) {

compiler/tests/org/jetbrains/jet/resolve/calls/ResolvedCallsTestGenerated.java

@@ -39,39 +39,39 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls"), Pattern.compile("^(.+)\\.kt$"), true);
     }
     
-    @TestMetadata("explicitReceiverIsReceiverArgument.kt")
-    public void testExplicitReceiverIsReceiverArgument() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/explicitReceiverIsReceiverArgument.kt");
+    @TestMetadata("explicitReceiverIsDispatchReceiver.kt")
+    public void testExplicitReceiverIsDispatchReceiver() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/explicitReceiverIsDispatchReceiver.kt");
         doTest(fileName);
     }
     
-    @TestMetadata("explicitReceiverIsThisObject.kt")
-    public void testExplicitReceiverIsThisObject() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/explicitReceiverIsThisObject.kt");
+    @TestMetadata("explicitReceiverIsExtensionReceiver.kt")
+    public void testExplicitReceiverIsExtensionReceiver() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/explicitReceiverIsExtensionReceiver.kt");
         doTest(fileName);
     }
     
-    @TestMetadata("hasBothThisObjectAndReceiverArgument.kt")
-    public void testHasBothThisObjectAndReceiverArgument() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgument.kt");
+    @TestMetadata("hasBothDispatchAndExtensionReceivers.kt")
+    public void testHasBothDispatchAndExtensionReceivers() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceivers.kt");
         doTest(fileName);
     }
     
-    @TestMetadata("hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.kt")
-    public void testHasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.kt");
+    @TestMetadata("hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.kt")
+    public void testHasBothDispatchAndExtensionReceiversWithoutExplicitReceiver() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.kt");
         doTest(fileName);
     }
     
-    @TestMetadata("implicitReceiverIsReceiverArgument.kt")
-    public void testImplicitReceiverIsReceiverArgument() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/implicitReceiverIsReceiverArgument.kt");
+    @TestMetadata("implicitReceiverIsDispatchReceiver.kt")
+    public void testImplicitReceiverIsDispatchReceiver() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/implicitReceiverIsDispatchReceiver.kt");
         doTest(fileName);
     }
     
-    @TestMetadata("implicitReceiverIsThisObject.kt")
-    public void testImplicitReceiverIsThisObject() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/implicitReceiverIsThisObject.kt");
+    @TestMetadata("implicitReceiverIsExtensionReceiver.kt")
+    public void testImplicitReceiverIsExtensionReceiver() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/implicitReceiverIsExtensionReceiver.kt");
         doTest(fileName);
     }
     
@@ -360,6 +360,18 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
             doTest(fileName);
         }
         
+        @TestMetadata("dispatchReceiverAsReceiverForInvoke.kt")
+        public void testDispatchReceiverAsReceiverForInvoke() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/dispatchReceiverAsReceiverForInvoke.kt");
+            doTest(fileName);
+        }
+        
+        @TestMetadata("extensionReceiverAsReceiverForInvoke.kt")
+        public void testExtensionReceiverAsReceiverForInvoke() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/extensionReceiverAsReceiverForInvoke.kt");
+            doTest(fileName);
+        }
+        
         @TestMetadata("implicitReceiverForInvoke.kt")
         public void testImplicitReceiverForInvoke() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.kt");
@@ -402,18 +414,6 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
             doTest(fileName);
         }
         
-        @TestMetadata("receiverArgumentAsReceiverForInvoke.kt")
-        public void testReceiverArgumentAsReceiverForInvoke() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/receiverArgumentAsReceiverForInvoke.kt");
-            doTest(fileName);
-        }
-        
-        @TestMetadata("thisObjectAsReceiverForInvoke.kt")
-        public void testThisObjectAsReceiverForInvoke() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/thisObjectAsReceiverForInvoke.kt");
-            doTest(fileName);
-        }
-        
     }
     
     @TestMetadata("compiler/testData/resolvedCalls/objectsAndClassObjects")

compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java

@@ -61,7 +61,7 @@ public class RecursiveDescriptorProcessor {
         private boolean processCallable(CallableDescriptor descriptor, D data) {
             return applyWorker(descriptor, data)
                    && visitChildren(descriptor.getTypeParameters(), data)
-                   && visitChildren(descriptor.getReceiverParameter(), data)
+                   && visitChildren(descriptor.getExtensionReceiverParameter(), data)
                    && visitChildren(descriptor.getValueParameters(), data);
         }