Forbidden old invokeExtension convention.

compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.kt

@@ -1,5 +1,5 @@
 fun foo(a: (String) -> Unit) {
-    "".<!FREE_FUNCTION_CALLED_AS_EXTENSION!>a<!>()
+    "".<!INVOKE_EXTENSION_ON_NOT_EXTENSION_FUNCTION!>a<!>()
 }
 
 
@@ -9,5 +9,5 @@ interface A : (String) -> Unit {}
 fun foo(a: @Extension A) {
     // @Extension annotation on an unrelated type shouldn't have any effect on this diagnostic.
     // Only kotlin.Function{n} type annotated with @Extension should
-    "".<!FREE_FUNCTION_CALLED_AS_EXTENSION!>a<!>()
-}
+    "".<!INVOKE_EXTENSION_ON_NOT_EXTENSION_FUNCTION!>a<!>()
+}

compiler/testData/diagnostics/tests/generics/nullability/functionalBound.kt

@@ -1,13 +1,13 @@
 fun <E : String?, T : ((CharSequence).() -> Unit)?> foo(x: E, y: T) {
     if (x != null) {
-        <!DEBUG_INFO_SMARTCAST!>x<!>.<!UNSAFE_CALL!>y<!>()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.<!UNSAFE_CALL, INVOKE_EXTENSION_ON_NOT_EXTENSION_FUNCTION!>y<!>()
     }
 
     if (y != null) {
-        x<!UNSAFE_CALL!>.<!><!DEBUG_INFO_SMARTCAST!>y<!>()
+        x<!UNSAFE_CALL!>.<!><!INVOKE_EXTENSION_ON_NOT_EXTENSION_FUNCTION, DEBUG_INFO_SMARTCAST!>y<!>()
     }
 
     if (x != null && y != null) {
-        <!DEBUG_INFO_SMARTCAST!>x<!>.<!DEBUG_INFO_SMARTCAST!>y<!>()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.<!INVOKE_EXTENSION_ON_NOT_EXTENSION_FUNCTION, DEBUG_INFO_SMARTCAST!>y<!>()
     }
-}
+}

compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.kt

@@ -5,7 +5,7 @@ fun test1(f: String.() -> Unit) {
 }
 
 fun test2(f: (Int) -> Int) {
-    1.<!FREE_FUNCTION_CALLED_AS_EXTENSION!>f<!>(<!TOO_MANY_ARGUMENTS!>2<!>)
+    1.<!INVOKE_EXTENSION_ON_NOT_EXTENSION_FUNCTION!>f<!>(<!TOO_MANY_ARGUMENTS!>2<!>)
 
-    2.<!FREE_FUNCTION_CALLED_AS_EXTENSION!>(f)<!>(<!TOO_MANY_ARGUMENTS!>2<!>)
-}
+    2.<!INVOKE_EXTENSION_ON_NOT_EXTENSION_FUNCTION!>(f)<!>(<!TOO_MANY_ARGUMENTS!>2<!>)
+}

compiler/testData/diagnostics/tests/resolve/invoke/implicitInvoke.kt

@@ -0,0 +1,35 @@
+class B
+
+class A {
+    operator fun B.invoke() = 4
+}
+
+class X {
+    operator fun invoke() = 3
+}
+
+fun test(a: A, b: B) {
+    with (a) {
+        b()
+        (b)()
+    }
+
+    X()()
+    val x = X()
+    x()
+    (x)()
+}
+
+fun test(c: () -> String, e: Int.() -> String) {
+    c()
+    (c)()
+
+    3.e()
+    3.(e)()
+    with(3) {
+        e()
+        (e)()
+    }
+}
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()

compiler/testData/diagnostics/tests/resolve/invoke/implicitInvoke.txt

@@ -0,0 +1,28 @@
+package
+
+public fun test(/*0*/ c: () -> kotlin.String, /*1*/ e: kotlin.Int.() -> kotlin.String): kotlin.Unit
+public fun test(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
+public fun </*0*/ T, /*1*/ R> with(/*0*/ receiver: T, /*1*/ f: T.() -> R): R
+
+public final class A {
+    public constructor A()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    public final operator fun B.invoke(): kotlin.Int
+}
+
+public final class B {
+    public constructor B()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class X {
+    public constructor X()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final operator fun invoke(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtensionToExplicitReceiver.kt

@@ -4,7 +4,7 @@ interface Foo {
 }
 
 fun test(a: A, foo: Foo) {
-    a.foo()
+    a.<!INVOKE_EXTENSION_ON_NOT_EXTENSION_FUNCTION!>foo<!>()
 }
 
 fun test(a: Int, foo: Int.()->Unit) {

compiler/testData/diagnostics/tests/resolve/invoke/wrongInvokeExtension.kt

@@ -0,0 +1,20 @@
+class B
+
+class A {
+    operator fun B.invoke() {}
+}
+
+val B.a: () -> Int  get() = { 5 }
+
+fun test(a: A, b: B) {
+    val <!UNUSED_VARIABLE!>x<!>: Int = b.a()
+
+    b.<!INVOKE_EXTENSION_ON_NOT_EXTENSION_FUNCTION!>(a)<!>()
+
+    with(b) {
+        val <!UNUSED_VARIABLE!>y<!>: Int = a()
+        <!MISSING_RECEIVER!>(a)<!>()
+    }
+}
+
+fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()

compiler/testData/diagnostics/tests/resolve/invoke/wrongInvokeExtension.txt

@@ -0,0 +1,20 @@
+package
+
+public val B.a: () -> kotlin.Int
+public fun test(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
+public fun </*0*/ T, /*1*/ R> with(/*0*/ receiver: T, /*1*/ f: T.() -> R): R
+
+public final class A {
+    public constructor A()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    public final operator fun B.invoke(): kotlin.Unit
+}
+
+public final class B {
+    public constructor B()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}