Corrections on code review

Author: valentinkip

idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.kt

@@ -95,7 +95,7 @@ class ChangeFunctionLiteralReturnTypeFix(
             val parentFunctionReturnTypeRef = parentFunction.typeReference
             val parentFunctionReturnType = context.get(BindingContext.TYPE, parentFunctionReturnTypeRef)
             return if (parentFunctionReturnType != null && !KotlinTypeChecker.DEFAULT.isSubtypeOf(eventualFunctionLiteralType, parentFunctionReturnType))
-                ChangeFunctionReturnTypeFix.ForCurrent(parentFunction, eventualFunctionLiteralType)
+                ChangeFunctionReturnTypeFix.ForEnclosing(parentFunction, eventualFunctionLiteralType)
             else
                 null
         }

idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.kt

@@ -83,24 +83,24 @@ abstract class ChangeFunctionReturnTypeFix(element: KtFunction, type: KotlinType
         override fun functionPresentation() = null
     }
 
-    class ForCurrent(element: KtFunction, type: KotlinType) : ChangeFunctionReturnTypeFix(element, type), HighPriorityAction {
+    class ForEnclosing(element: KtFunction, type: KotlinType) : ChangeFunctionReturnTypeFix(element, type), HighPriorityAction {
         override fun functionPresentation(): String? {
-            val presentation = super.functionPresentation() ?: return "current function"
-            return "current $presentation"
+            val presentation = super.functionPresentation() ?: return "enclosing function"
+            return "enclosing $presentation"
         }
     }
 
-    class ForInvoked(element: KtFunction, type: KotlinType) : ChangeFunctionReturnTypeFix(element, type) {
+    class ForCalled(element: KtFunction, type: KotlinType) : ChangeFunctionReturnTypeFix(element, type) {
         override fun functionPresentation(): String? {
-            val presentation = super.functionPresentation() ?: return "invoked function"
-            return "invoked $presentation"
+            val presentation = super.functionPresentation() ?: return "called function"
+            return "called $presentation"
         }
     }
 
     class ForOverridden(element: KtFunction, type: KotlinType) : ChangeFunctionReturnTypeFix(element, type) {
         override fun functionPresentation(): String? {
             val presentation = super.functionPresentation() ?: return null
-            return "overridden $presentation"
+            return "base $presentation"
         }
     }
 
@@ -155,7 +155,7 @@ abstract class ChangeFunctionReturnTypeFix(element: KtFunction, type: KotlinType
             val resolvedCall = context.get(BindingContext.COMPONENT_RESOLVED_CALL, entry) ?: return null
             val componentFunction = DescriptorToSourceUtils.descriptorToDeclaration(resolvedCall.candidateDescriptor) as KtFunction? ?: return null
             val expectedType = context[BindingContext.TYPE, entry.typeReference!!] ?: return null
-            return ChangeFunctionReturnTypeFix.ForInvoked(componentFunction, expectedType)
+            return ChangeFunctionReturnTypeFix.ForCalled(componentFunction, expectedType)
         }
     }
 
@@ -167,7 +167,7 @@ abstract class ChangeFunctionReturnTypeFix(element: KtFunction, type: KotlinType
             val resolvedCall = context[BindingContext.LOOP_RANGE_HAS_NEXT_RESOLVED_CALL, expression] ?: return null
             val hasNextDescriptor = resolvedCall.candidateDescriptor
             val hasNextFunction = DescriptorToSourceUtils.descriptorToDeclaration(hasNextDescriptor) as KtFunction? ?: return null
-            return ChangeFunctionReturnTypeFix.ForInvoked(hasNextFunction, hasNextDescriptor.builtIns.booleanType)
+            return ChangeFunctionReturnTypeFix.ForCalled(hasNextFunction, hasNextDescriptor.builtIns.booleanType)
         }
     }
 
@@ -178,7 +178,7 @@ abstract class ChangeFunctionReturnTypeFix(element: KtFunction, type: KotlinType
             val resolvedCall = expression.getResolvedCall(context) ?: return null
             val compareToDescriptor = resolvedCall.candidateDescriptor
             val compareTo = DescriptorToSourceUtils.descriptorToDeclaration(compareToDescriptor) as? KtFunction ?: return null
-            return ChangeFunctionReturnTypeFix.ForInvoked(compareTo, compareToDescriptor.builtIns.intType)
+            return ChangeFunctionReturnTypeFix.ForCalled(compareTo, compareToDescriptor.builtIns.intType)
         }
     }
 
@@ -219,14 +219,14 @@ abstract class ChangeFunctionReturnTypeFix(element: KtFunction, type: KotlinType
     object ChangingReturnTypeToUnitFactory : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             val function = QuickFixUtil.getParentElementOfType(diagnostic, KtFunction::class.java) ?: return null
-            return ChangeFunctionReturnTypeFix.ForCurrent(function, function.builtIns.unitType)
+            return ChangeFunctionReturnTypeFix.ForEnclosing(function, function.builtIns.unitType)
         }
     }
 
     object ChangingReturnTypeToNothingFactory : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             val function = QuickFixUtil.getParentElementOfType(diagnostic, KtFunction::class.java) ?: return null
-            return ChangeFunctionReturnTypeFix.ForCurrent(function, function.builtIns.nothingType)
+            return ChangeFunctionReturnTypeFix.ForEnclosing(function, function.builtIns.nothingType)
         }
     }
 

idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.kt

@@ -73,7 +73,7 @@ open class ChangeVariableTypeFix(element: KtVariableDeclaration, type: KotlinTyp
     class ForOverridden(element: KtVariableDeclaration, type: KotlinType) : ChangeVariableTypeFix(element, type) {
         override fun variablePresentation(): String? {
             val presentation = super.variablePresentation() ?: return null
-            return "overridden property $presentation"
+            return "base property $presentation"
         }
     }
 

idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.kt

@@ -141,7 +141,7 @@ class QuickFixFactoryForTypeMismatchError : KotlinIntentionActionsFactory() {
         if (function is KtFunction && QuickFixUtil.canFunctionOrGetterReturnExpression(function, diagnosticElement)) {
             val scope = function.getResolutionScope(context, function.getResolutionFacade())
             val typeToInsert = expressionType.approximateWithResolvableType(scope, false)
-            actions.add(ChangeFunctionReturnTypeFix.ForCurrent(function, typeToInsert))
+            actions.add(ChangeFunctionReturnTypeFix.ForEnclosing(function, typeToInsert))
         }
 
         // Fixing overloaded operators:
@@ -150,7 +150,7 @@ class QuickFixFactoryForTypeMismatchError : KotlinIntentionActionsFactory() {
             if (resolvedCall != null) {
                 val declaration = getFunctionDeclaration(resolvedCall)
                 if (declaration != null) {
-                    actions.add(ChangeFunctionReturnTypeFix.ForInvoked(declaration, expectedType))
+                    actions.add(ChangeFunctionReturnTypeFix.ForCalled(declaration, expectedType))
                 }
             }
         }
@@ -161,7 +161,7 @@ class QuickFixFactoryForTypeMismatchError : KotlinIntentionActionsFactory() {
             if (resolvedCall != null) {
                 val declaration = getFunctionDeclaration(resolvedCall)
                 if (declaration != null) {
-                    actions.add(ChangeFunctionReturnTypeFix.ForInvoked(declaration, expectedType))
+                    actions.add(ChangeFunctionReturnTypeFix.ForCalled(declaration, expectedType))
                 }
             }
         }

idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt

@@ -1,4 +1,4 @@
-// "Change type of overridden property 'B.x' to '(Int) -> Int'" "true"
+// "Change type of base property 'B.x' to '(Int) -> Int'" "true"
 interface A {
     val x: (Int) -> Int
 }

idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt.after

@@ -1,4 +1,4 @@
-// "Change type of overridden property 'B.x' to '(Int) -> Int'" "true"
+// "Change type of base property 'B.x' to '(Int) -> Int'" "true"
 interface A {
     val x: (Int) -> Int
 }

idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt

@@ -1,4 +1,4 @@
-// "Change type of overridden property 'A.x' to 'String'" "true"
+// "Change type of base property 'A.x' to 'String'" "true"
 interface A {
     var x: Int
 }

idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt.after

@@ -1,4 +1,4 @@
-// "Change type of overridden property 'A.x' to 'String'" "true"
+// "Change type of base property 'A.x' to 'String'" "true"
 interface A {
     var x: String
 }

idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt

@@ -1,4 +1,4 @@
-// "Change return type of overridden function 'A.foo' to 'Long'" "true"
+// "Change return type of base function 'A.foo' to 'Long'" "true"
 interface A {
     fun foo(): Int
 }

idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt.after

@@ -1,4 +1,4 @@
-// "Change return type of overridden function 'A.foo' to 'Long'" "true"
+// "Change return type of base function 'A.foo' to 'Long'" "true"
 interface A {
     fun foo(): Long
 }

idea/testData/quickfix/typeMismatch/accessibleLocalClassInReturn.kt

@@ -1,4 +1,4 @@
-// "Change return type of current function 'bar' to 'A'" "true"
+// "Change return type of enclosing function 'bar' to 'A'" "true"
 fun foo() {
     open class A
 

idea/testData/quickfix/typeMismatch/accessibleLocalClassInReturn.kt.after

@@ -1,4 +1,4 @@
-// "Change return type of current function 'bar' to 'A'" "true"
+// "Change return type of enclosing function 'bar' to 'A'" "true"
 fun foo() {
     open class A
 

idea/testData/quickfix/typeMismatch/anonymousObjectInReturn.kt

@@ -1,4 +1,4 @@
-// "Change return type of current function 'foo' to 'T'" "true"
+// "Change return type of enclosing function 'foo' to 'T'" "true"
 interface T
 
 fun foo() {

idea/testData/quickfix/typeMismatch/anonymousObjectInReturn.kt.after

@@ -1,4 +1,4 @@
-// "Change return type of current function 'foo' to 'T'" "true"
+// "Change return type of enclosing function 'foo' to 'T'" "true"
 interface T
 
 fun foo(): T {

idea/testData/quickfix/typeMismatch/anyInReturn.kt

@@ -1,4 +1,4 @@
-// "Change return type of current function 'foo' to 'Any'" "true"
+// "Change return type of enclosing function 'foo' to 'Any'" "true"
 fun foo() {
     class A
 

idea/testData/quickfix/typeMismatch/anyInReturn.kt.after

@@ -1,4 +1,4 @@
-// "Change return type of current function 'foo' to 'Any'" "true"
+// "Change return type of enclosing function 'foo' to 'Any'" "true"
 fun foo(): Any {
     class A
 

idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt

@@ -1,3 +1,3 @@
-// "Change return type of invoked function 'bar' to 'String'" "true"
+// "Change return type of called function 'bar' to 'String'" "true"
 fun bar(): Any = ""
 fun foo(): String = bar(<caret>)

idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt.after

@@ -1,3 +1,3 @@
-// "Change return type of invoked function 'bar' to 'String'" "true"
+// "Change return type of called function 'bar' to 'String'" "true"
 fun bar(): String = ""
 fun foo(): String = bar(<caret>)

idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt

@@ -1,4 +1,4 @@
-// "Change return type of invoked function 'bar' to 'HashSet<Int>'" "true"
+// "Change return type of called function 'bar' to 'HashSet<Int>'" "true"
 
 fun bar(): Any = java.util.LinkedHashSet<Int>()
 fun foo(): java.util.HashSet<Int> = bar(<caret>)

idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt.after

@@ -1,6 +1,6 @@
 import java.util.HashSet
 
-// "Change return type of invoked function 'bar' to 'HashSet<Int>'" "true"
+// "Change return type of called function 'bar' to 'HashSet<Int>'" "true"
 
 fun bar(): HashSet<Int> = java.util.LinkedHashSet<Int>()
 fun foo(): java.util.HashSet<Int> = bar()

idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForAnonymousObject.kt

@@ -1,4 +1,4 @@
-// "Change return type of current function 'foo' to 'Int'" "true"
+// "Change return type of enclosing function 'foo' to 'Int'" "true"
 package foo.bar
 
 fun test() {

idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForAnonymousObject.kt.after

@@ -1,4 +1,4 @@
-// "Change return type of current function 'foo' to 'Int'" "true"
+// "Change return type of enclosing function 'foo' to 'Int'" "true"
 package foo.bar
 
 fun test() {

idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForCompanionObject.kt

@@ -1,4 +1,4 @@
-// "Change return type of current function 'Companion.foo' to 'Int'" "true"
+// "Change return type of enclosing function 'Companion.foo' to 'Int'" "true"
 package foo.bar
 
 class A {

idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForCompanionObject.kt.after

@@ -1,4 +1,4 @@
-// "Change return type of current function 'Companion.foo' to 'Int'" "true"
+// "Change return type of enclosing function 'Companion.foo' to 'Int'" "true"
 package foo.bar
 
 class A {

idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForLocalClass.kt

@@ -1,4 +1,4 @@
-// "Change return type of current function 'A.foo' to 'Int'" "true"
+// "Change return type of enclosing function 'A.foo' to 'Int'" "true"
 package foo.bar
 
 fun test() {

idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForLocalClass.kt.after

@@ -1,4 +1,4 @@
-// "Change return type of current function 'A.foo' to 'Int'" "true"
+// "Change return type of enclosing function 'A.foo' to 'Int'" "true"
 package foo.bar
 
 fun test() {

idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForNestedClass.kt

@@ -1,4 +1,4 @@
-// "Change return type of current function 'B.foo' to 'Int'" "true"
+// "Change return type of enclosing function 'B.foo' to 'Int'" "true"
 package foo.bar
 
 class A {

idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForNestedClass.kt.after

@@ -1,4 +1,4 @@
-// "Change return type of current function 'B.foo' to 'Int'" "true"
+// "Change return type of enclosing function 'B.foo' to 'Int'" "true"
 package foo.bar
 
 class A {

idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForTopLevelClass.kt

@@ -1,4 +1,4 @@
-// "Change return type of current function 'A.foo' to 'Int'" "true"
+// "Change return type of enclosing function 'A.foo' to 'Int'" "true"
 package foo.bar
 
 class A {

idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForTopLevelClass.kt.after

@@ -1,4 +1,4 @@
-// "Change return type of current function 'A.foo' to 'Int'" "true"
+// "Change return type of enclosing function 'A.foo' to 'Int'" "true"
 package foo.bar
 
 class A {

idea/testData/quickfix/typeMismatch/changeReturnTypeToSpecificNullable.kt

@@ -1,4 +1,4 @@
-// "Change return type of current function 'foo' to 'Int?'" "true"
+// "Change return type of enclosing function 'foo' to 'Int?'" "true"
 
 fun foo(): String {
     val n: Int? = 1

idea/testData/quickfix/typeMismatch/changeReturnTypeToSpecificNullable.kt.after

@@ -1,4 +1,4 @@
-// "Change return type of current function 'foo' to 'Int?'" "true"
+// "Change return type of enclosing function 'foo' to 'Int?'" "true"
 
 fun foo(): Int? {
     val n: Int? = 1

idea/testData/quickfix/typeMismatch/changeReturnTypeWhenFunctionNameIsMissing.kt

@@ -1,4 +1,4 @@
-// "Remove explicitly specified return type of current function" "true"
+// "Remove explicitly specified return type of enclosing function" "true"
 // ERROR: Function declaration must have a name
 fun (): Int {
     return<caret>

idea/testData/quickfix/typeMismatch/changeReturnTypeWhenFunctionNameIsMissing.kt.after

@@ -1,4 +1,4 @@
-// "Remove explicitly specified return type of current function" "true"
+// "Remove explicitly specified return type of enclosing function" "true"
 // ERROR: Function declaration must have a name
 fun () {
     return<caret>

idea/testData/quickfix/typeMismatch/changeReturnTypeWhenValueParameterListIsAbsent.kt

@@ -1,4 +1,4 @@
-// "Change return type of invoked function 'A.hasNext' to 'Boolean'" "true"
+// "Change return type of called function 'A.hasNext' to 'Boolean'" "true"
 abstract class A {
     abstract operator fun hasNext
     abstract operator fun next(): Int

idea/testData/quickfix/typeMismatch/changeReturnTypeWhenValueParameterListIsAbsent.kt.after

@@ -1,4 +1,4 @@
-// "Change return type of invoked function 'A.hasNext' to 'Boolean'" "true"
+// "Change return type of called function 'A.hasNext' to 'Boolean'" "true"
 abstract class A {
     abstract operator fun hasNext: Boolean
     abstract operator fun next(): Int

idea/testData/quickfix/typeMismatch/compareToTypeMismatch.kt

@@ -1,4 +1,4 @@
-// "Change return type of invoked function 'A.compareTo' to 'Int'" "true"
+// "Change return type of called function 'A.compareTo' to 'Int'" "true"
 interface A {
     operator fun compareTo(other: Any): String
 }

idea/testData/quickfix/typeMismatch/compareToTypeMismatch.kt.after

@@ -1,4 +1,4 @@
-// "Change return type of invoked function 'A.compareTo' to 'Int'" "true"
+// "Change return type of called function 'A.compareTo' to 'Int'" "true"
 interface A {
     operator fun compareTo(other: Any): Int
 }

idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch1.kt

@@ -1,4 +1,4 @@
-// "Change return type of invoked function 'A.component1' to 'Int'" "true"
+// "Change return type of called function 'A.component1' to 'Int'" "true"
 abstract class A {
     abstract operator fun component1()
     abstract operator fun component2(): Int

idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch1.kt.after

@@ -1,4 +1,4 @@
-// "Change return type of invoked function 'A.component1' to 'Int'" "true"
+// "Change return type of called function 'A.component1' to 'Int'" "true"
 abstract class A {
     abstract operator fun component1(): Int
     abstract operator fun component2(): Int

idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch2.kt

@@ -1,4 +1,4 @@
-// "Change return type of invoked function 'A.component2' to 'Int'" "true"
+// "Change return type of called function 'A.component2' to 'Int'" "true"
 abstract class A {
     abstract operator fun component1(): Int
     abstract operator fun component2(): String

idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch2.kt.after

@@ -1,4 +1,4 @@
-// "Change return type of invoked function 'A.component2' to 'Int'" "true"
+// "Change return type of called function 'A.component2' to 'Int'" "true"
 abstract class A {
     abstract operator fun component1(): Int
     abstract operator fun component2(): Int

idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch3.kt

@@ -1,4 +1,4 @@
-// "Remove explicitly specified return type of invoked function 'A.component2'" "true"
+// "Remove explicitly specified return type of called function 'A.component2'" "true"
 abstract class A {
     abstract operator fun component1(): Int
     abstract operator fun component2(): Int

idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch3.kt.after

@@ -1,4 +1,4 @@
-// "Remove explicitly specified return type of invoked function 'A.component2'" "true"
+// "Remove explicitly specified return type of called function 'A.component2'" "true"
 abstract class A {
     abstract operator fun component1(): Int
     abstract operator fun component2()

idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt

@@ -1,4 +1,4 @@
-// "Change return type of invoked function 'A.component2' to 'Unit'" "true"
+// "Change return type of called function 'A.component2' to 'Unit'" "true"
 // ERROR: The integer literal does not conform to the expected type Unit
 abstract class A {
     abstract operator fun component1(): Int

idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt.after

@@ -1,4 +1,4 @@
-// "Change return type of invoked function 'A.component2' to 'Unit'" "true"
+// "Change return type of called function 'A.component2' to 'Unit'" "true"
 // ERROR: The integer literal does not conform to the expected type Unit
 abstract class A {
     abstract operator fun component1(): Int

idea/testData/quickfix/typeMismatch/constantTypeMismatch.kt

@@ -1,4 +1,4 @@
-// "Change return type of current function 'foo' to 'Int'" "true"
+// "Change return type of enclosing function 'foo' to 'Int'" "true"
 
 fun foo(): String {
     return <caret>1

idea/testData/quickfix/typeMismatch/constantTypeMismatch.kt.after

@@ -1,4 +1,4 @@
-// "Change return type of current function 'foo' to 'Int'" "true"
+// "Change return type of enclosing function 'foo' to 'Int'" "true"
 
 fun foo(): Int {
     return <caret>1

idea/testData/quickfix/typeMismatch/dontChangeOverriddenPropertyTypeToErrorType.kt

@@ -1,5 +1,5 @@
 // "Change type to '(String) -> [ERROR : Ay]'" "false"
-// ACTION: Change type of overridden property 'A.x' to '(Int) -> Int'
+// ACTION: Change type of base property 'A.x' to '(Int) -> Int'
 // ERROR: Type of 'x' is not a subtype of the overridden property 'public abstract val x: (String) -> [ERROR : Ay] defined in A'
 // ERROR: Unresolved reference: Ay
 interface A {