changed resolution candidates order

for foo()
first try 'this.foo()', then 'foo()'

compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.java

@@ -181,11 +181,11 @@ public class TaskPrioritizer {
             TaskPrioritizer.<D>splitLexicallyLocalDescriptors(functions, scope.getContainingDeclaration(), locals, nonlocals);
 
             result.addLocalExtensions(locals);
-            result.addNonLocalExtensions(nonlocals);
 
             for (ReceiverValue implicitReceiver : implicitReceivers) {
                 doComputeTasks(scope, implicitReceiver, name, result, context, callableDescriptorCollector);
             }
+            result.addNonLocalExtensions(nonlocals);
         }
     }
 

compiler/testData/resolve/candidatesPriority/preferImplicitThisToNoReceiver.resolve

@@ -0,0 +1,6 @@
+fun ~A.foo~A.foo() = 1
+fun foo() = 2
+
+class A {
+    fun test() = `A.foo`foo()
+}