diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties index 820788d1db6..c5024f4604e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties @@ -20,10 +20,6 @@ imports.chooser.title=Imports rename.kotlin.package.class.error=Can't rename Kotlin package facade class add.semicolon.after.invocation=Add semicolon after invocation of ''{0}'' add.semicolon.family=Add Semicolon -change.function.return.type=Change ''{0}'' function return type to ''{1}'' -change.no.name.function.return.type=Change function return type to ''{0}'' -remove.function.return.type=Remove explicitly specified return type in ''{0}'' function -remove.no.name.function.return.type=Remove explicitly specified function return type change.type=Change type from ''{0}'' to ''{1}'' change.type.family=Change type change.function.signature=Change the signature of function ''{0}'' diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.kt index ee497cc463b..8c17bf2af44 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.kt @@ -24,10 +24,10 @@ import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult +import org.jetbrains.kotlin.idea.core.ShortenReferences import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil import org.jetbrains.kotlin.idea.project.builtIns import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers -import org.jetbrains.kotlin.idea.core.ShortenReferences import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.callUtil.getParentResolvedCall @@ -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(parentFunction, eventualFunctionLiteralType) + ChangeFunctionReturnTypeFix.ForCurrent(parentFunction, eventualFunctionLiteralType) else null } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.kt index b336714f711..4d6b06288d9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.idea.quickfix +import com.intellij.codeInsight.intention.HighPriorityAction import com.intellij.codeInsight.intention.IntentionAction import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project @@ -44,9 +45,11 @@ import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.checker.KotlinTypeChecker import org.jetbrains.kotlin.types.typeUtil.isUnit +import org.jetbrains.kotlin.utils.addToStdlib.check import java.util.* -class ChangeFunctionReturnTypeFix(element: KtFunction, type: KotlinType) : KotlinQuickFixAction(element) { +abstract class ChangeFunctionReturnTypeFix(element: KtFunction, type: KotlinType) : KotlinQuickFixAction(element) { + private val changeFunctionLiteralReturnTypeFix: ChangeFunctionLiteralReturnTypeFix? private val typeContainsError = ErrorUtils.containsErrorType(type) @@ -64,30 +67,61 @@ class ChangeFunctionReturnTypeFix(element: KtFunction, type: KotlinType) : Kotli } } + open fun functionPresentation(): String? { + val name = element.name + if (name != null) { + val container = element.resolveToDescriptor().containingDeclaration as? ClassDescriptor + val containerName = container?.name?.check { !it.isSpecial }?.asString() + return "function " + (if (containerName != null) "'$containerName.$name'" else "'$name'") + } + else { + return null + } + } + + class OnType(element: KtFunction, type: KotlinType) : ChangeFunctionReturnTypeFix(element, type), HighPriorityAction { + override fun functionPresentation() = null + } + + class ForCurrent(element: KtFunction, type: KotlinType) : ChangeFunctionReturnTypeFix(element, type), HighPriorityAction { + override fun functionPresentation(): String? { + val presentation = super.functionPresentation() ?: return "current function" + return "current $presentation" + } + } + + class ForInvoked(element: KtFunction, type: KotlinType) : ChangeFunctionReturnTypeFix(element, type) { + override fun functionPresentation(): String? { + val presentation = super.functionPresentation() ?: return "invoked function" + return "invoked $presentation" + } + } + + class ForOverridden(element: KtFunction, type: KotlinType) : ChangeFunctionReturnTypeFix(element, type) { + override fun functionPresentation(): String? { + val presentation = super.functionPresentation() ?: return null + return "overridden $presentation" + } + } + override fun getText(): String { if (changeFunctionLiteralReturnTypeFix != null) { return changeFunctionLiteralReturnTypeFix.text } - val shortName = element.name - val functionName = if (shortName != null) { - val containingDescriptor = element.resolveToDescriptor().containingDeclaration as? ClassDescriptor - val containerName = containingDescriptor?.name - if (containerName != null && !containerName.isSpecial) "${containerName.asString()}.$shortName" else shortName - } - else null + val functionPresentation = functionPresentation() if (isUnitType && element.hasBlockBody()) { - return if (functionName == null) - KotlinBundle.message("remove.no.name.function.return.type") + return if (functionPresentation == null) + "Remove explicitly specified return type" else - KotlinBundle.message("remove.function.return.type", functionName) + "Remove explicitly specified return type of $functionPresentation" } - return if (functionName == null) - KotlinBundle.message("change.no.name.function.return.type", typePresentation) + return if (functionPresentation == null) + "Change return type to '$typePresentation'" else - KotlinBundle.message("change.function.return.type", functionName, typePresentation) + "Change return type of $functionPresentation to '$typePresentation'" } override fun getFamilyName() = KotlinBundle.message("change.type.family") @@ -121,7 +155,7 @@ class ChangeFunctionReturnTypeFix(element: KtFunction, type: KotlinType) : Kotli 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(componentFunction, expectedType) + return ChangeFunctionReturnTypeFix.ForInvoked(componentFunction, expectedType) } } @@ -133,7 +167,7 @@ class ChangeFunctionReturnTypeFix(element: KtFunction, type: KotlinType) : Kotli 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(hasNextFunction, hasNextDescriptor.builtIns.booleanType) + return ChangeFunctionReturnTypeFix.ForInvoked(hasNextFunction, hasNextDescriptor.builtIns.booleanType) } } @@ -144,7 +178,7 @@ class ChangeFunctionReturnTypeFix(element: KtFunction, type: KotlinType) : Kotli val resolvedCall = expression.getResolvedCall(context) ?: return null val compareToDescriptor = resolvedCall.candidateDescriptor val compareTo = DescriptorToSourceUtils.descriptorToDeclaration(compareToDescriptor) as? KtFunction ?: return null - return ChangeFunctionReturnTypeFix(compareTo, compareToDescriptor.builtIns.intType) + return ChangeFunctionReturnTypeFix.ForInvoked(compareTo, compareToDescriptor.builtIns.intType) } } @@ -158,7 +192,7 @@ class ChangeFunctionReturnTypeFix(element: KtFunction, type: KotlinType) : Kotli val matchingReturnType = QuickFixUtil.findLowerBoundOfOverriddenCallablesReturnTypes(descriptor) if (matchingReturnType != null) { - actions.add(ChangeFunctionReturnTypeFix(function, matchingReturnType)) + actions.add(ChangeFunctionReturnTypeFix.OnType(function, matchingReturnType)) } val functionType = descriptor.returnType ?: return actions @@ -174,7 +208,7 @@ class ChangeFunctionReturnTypeFix(element: KtFunction, type: KotlinType) : Kotli if (overriddenMismatchingFunctions.size == 1) { val overriddenFunction = DescriptorToSourceUtils.descriptorToDeclaration(overriddenMismatchingFunctions[0]) if (overriddenFunction is KtFunction) { - actions.add(ChangeFunctionReturnTypeFix(overriddenFunction, functionType)) + actions.add(ChangeFunctionReturnTypeFix.ForOverridden(overriddenFunction, functionType)) } } @@ -185,14 +219,14 @@ class ChangeFunctionReturnTypeFix(element: KtFunction, type: KotlinType) : Kotli object ChangingReturnTypeToUnitFactory : KotlinSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { val function = QuickFixUtil.getParentElementOfType(diagnostic, KtFunction::class.java) ?: return null - return ChangeFunctionReturnTypeFix(function, function.builtIns.unitType) + return ChangeFunctionReturnTypeFix.ForCurrent(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(function, function.builtIns.nothingType) + return ChangeFunctionReturnTypeFix.ForCurrent(function, function.builtIns.nothingType) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.kt index 6e05fb3f95b..3bb874d900c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.kt +++ b/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(function, typeToInsert)) + actions.add(ChangeFunctionReturnTypeFix.ForCurrent(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(declaration, expectedType)) + actions.add(ChangeFunctionReturnTypeFix.ForInvoked(declaration, expectedType)) } } } @@ -161,7 +161,7 @@ class QuickFixFactoryForTypeMismatchError : KotlinIntentionActionsFactory() { if (resolvedCall != null) { val declaration = getFunctionDeclaration(resolvedCall) if (declaration != null) { - actions.add(ChangeFunctionReturnTypeFix(declaration, expectedType)) + actions.add(ChangeFunctionReturnTypeFix.ForInvoked(declaration, expectedType)) } } } diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt index 8be6208a63b..d3b1c858519 100644 --- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt +++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt @@ -1,4 +1,4 @@ -// "Change 'A.foo' function return type to 'Long'" "true" +// "Change return type of overridden function 'A.foo' to 'Long'" "true" interface A { fun foo(): Int } diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt.after index b07877239c6..af03c5f92e0 100644 --- a/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt.after +++ b/idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt.after @@ -1,4 +1,4 @@ -// "Change 'A.foo' function return type to 'Long'" "true" +// "Change return type of overridden function 'A.foo' to 'Long'" "true" interface A { fun foo(): Long } diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt index 00bbe2d3e52..3cecf7dc09d 100644 --- a/idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt +++ b/idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'Boolean'" "true" +// "Change return type to 'Boolean'" "true" interface A { fun foo(): Boolean diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt.after index e3782028e24..1f87a4af752 100644 --- a/idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt.after +++ b/idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt.after @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'Boolean'" "true" +// "Change return type to 'Boolean'" "true" interface A { fun foo(): Boolean diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt index c13510b4c33..7a54f43ac80 100644 --- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt +++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt @@ -1,4 +1,4 @@ -// "Change 'B.foo' function return type to 'T'" "true" +// "Change return type to 'T'" "true" open class S {} open class T : S() {} diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt.after index 21b5fdebe33..61fe7a054fe 100644 --- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt.after +++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt.after @@ -1,4 +1,4 @@ -// "Change 'B.foo' function return type to 'T'" "true" +// "Change return type to 'T'" "true" open class S {} open class T : S() {} diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt index 84e867c0e20..fb7d4e8964e 100644 --- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt +++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt @@ -1,4 +1,4 @@ -// "Change 'B.foo' function return type to 'Int'" "true" +// "Change return type to 'Int'" "true" abstract class A { abstract fun foo() : Int; } diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt.after index e310ec83c86..2abf8dbbd4a 100644 --- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt.after +++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt.after @@ -1,4 +1,4 @@ -// "Change 'B.foo' function return type to 'Int'" "true" +// "Change return type to 'Int'" "true" abstract class A { abstract fun foo() : Int; } diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt index 7c2dabae0ab..de628e696b0 100644 --- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt +++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt @@ -1,4 +1,4 @@ -// "Change 'B.foo' function return type to 'Int'" "true" +// "Change return type to 'Int'" "true" abstract class A { abstract fun foo() : Int; } diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt.after index 1993fa45e50..3c636fe0b08 100644 --- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt.after +++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt.after @@ -1,4 +1,4 @@ -// "Change 'B.foo' function return type to 'Int'" "true" +// "Change return type to 'Int'" "true" abstract class A { abstract fun foo() : Int; } diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt index fa00806769e..9c038ebaa52 100644 --- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt +++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt @@ -1,4 +1,4 @@ -// "Remove explicitly specified return type in 'A.remove' function" "true" +// "Remove explicitly specified return type" "true" abstract class A : java.util.Iterator { public abstract override fun remove() : Int; } diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt.after b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt.after index 9a7ac2bfd0e..ffd4cf48bca 100644 --- a/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt.after +++ b/idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt.after @@ -1,4 +1,4 @@ -// "Remove explicitly specified return type in 'A.remove' function" "true" +// "Remove explicitly specified return type" "true" abstract class A : java.util.Iterator { public abstract override fun remove(); } diff --git a/idea/testData/quickfix/typeMismatch/accessibleLocalClassInReturn.kt b/idea/testData/quickfix/typeMismatch/accessibleLocalClassInReturn.kt index 4fa799e4cd2..9e230cb3961 100644 --- a/idea/testData/quickfix/typeMismatch/accessibleLocalClassInReturn.kt +++ b/idea/testData/quickfix/typeMismatch/accessibleLocalClassInReturn.kt @@ -1,4 +1,4 @@ -// "Change 'bar' function return type to 'A'" "true" +// "Change return type of current function 'bar' to 'A'" "true" fun foo() { open class A diff --git a/idea/testData/quickfix/typeMismatch/accessibleLocalClassInReturn.kt.after b/idea/testData/quickfix/typeMismatch/accessibleLocalClassInReturn.kt.after index e9002022d5e..32b3fe9fbc5 100644 --- a/idea/testData/quickfix/typeMismatch/accessibleLocalClassInReturn.kt.after +++ b/idea/testData/quickfix/typeMismatch/accessibleLocalClassInReturn.kt.after @@ -1,4 +1,4 @@ -// "Change 'bar' function return type to 'A'" "true" +// "Change return type of current function 'bar' to 'A'" "true" fun foo() { open class A diff --git a/idea/testData/quickfix/typeMismatch/anonymousObjectInReturn.kt b/idea/testData/quickfix/typeMismatch/anonymousObjectInReturn.kt index 16757ff6e38..98a831ee8bc 100644 --- a/idea/testData/quickfix/typeMismatch/anonymousObjectInReturn.kt +++ b/idea/testData/quickfix/typeMismatch/anonymousObjectInReturn.kt @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'T'" "true" +// "Change return type of current function 'foo' to 'T'" "true" interface T fun foo() { diff --git a/idea/testData/quickfix/typeMismatch/anonymousObjectInReturn.kt.after b/idea/testData/quickfix/typeMismatch/anonymousObjectInReturn.kt.after index eadfa2004d6..b037c2ce42e 100644 --- a/idea/testData/quickfix/typeMismatch/anonymousObjectInReturn.kt.after +++ b/idea/testData/quickfix/typeMismatch/anonymousObjectInReturn.kt.after @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'T'" "true" +// "Change return type of current function 'foo' to 'T'" "true" interface T fun foo(): T { diff --git a/idea/testData/quickfix/typeMismatch/anyInReturn.kt b/idea/testData/quickfix/typeMismatch/anyInReturn.kt index 8ec04dc3940..10865af8d3c 100644 --- a/idea/testData/quickfix/typeMismatch/anyInReturn.kt +++ b/idea/testData/quickfix/typeMismatch/anyInReturn.kt @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'Any'" "true" +// "Change return type of current function 'foo' to 'Any'" "true" fun foo() { class A diff --git a/idea/testData/quickfix/typeMismatch/anyInReturn.kt.after b/idea/testData/quickfix/typeMismatch/anyInReturn.kt.after index 17cb32305f7..3b97d1320cb 100644 --- a/idea/testData/quickfix/typeMismatch/anyInReturn.kt.after +++ b/idea/testData/quickfix/typeMismatch/anyInReturn.kt.after @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'Any'" "true" +// "Change return type of current function 'foo' to 'Any'" "true" fun foo(): Any { class A diff --git a/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt b/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt index dcd7a090c5b..b3e5d576ff4 100644 --- a/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt +++ b/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt @@ -1,3 +1,3 @@ -// "Change 'bar' function return type to 'String'" "true" +// "Change return type of invoked function 'bar' to 'String'" "true" fun bar(): Any = "" fun foo(): String = bar() \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt.after b/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt.after index e043c28dd7b..98af29d1886 100644 --- a/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt.after +++ b/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt.after @@ -1,3 +1,3 @@ -// "Change 'bar' function return type to 'String'" "true" +// "Change return type of invoked function 'bar' to 'String'" "true" fun bar(): String = "" fun foo(): String = bar() \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt index ccd870121b5..709d964a5d6 100644 --- a/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt +++ b/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt @@ -1,4 +1,4 @@ -// "Change 'bar' function return type to 'HashSet'" "true" +// "Change return type of invoked function 'bar' to 'HashSet'" "true" fun bar(): Any = java.util.LinkedHashSet() fun foo(): java.util.HashSet = bar() \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt.after b/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt.after index 08aed72f2e7..306b94f7cd3 100644 --- a/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt.after +++ b/idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt.after @@ -1,6 +1,6 @@ import java.util.HashSet -// "Change 'bar' function return type to 'HashSet'" "true" +// "Change return type of invoked function 'bar' to 'HashSet'" "true" fun bar(): HashSet = java.util.LinkedHashSet() fun foo(): java.util.HashSet = bar() \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForAnonymousObject.kt b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForAnonymousObject.kt index ce60b937c9b..69a8b3aa1fb 100644 --- a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForAnonymousObject.kt +++ b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForAnonymousObject.kt @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'Int'" "true" +// "Change return type of current function 'foo' to 'Int'" "true" package foo.bar fun test() { diff --git a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForAnonymousObject.kt.after b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForAnonymousObject.kt.after index 76de5e1d1c2..75f3e5ffaeb 100644 --- a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForAnonymousObject.kt.after +++ b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForAnonymousObject.kt.after @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'Int'" "true" +// "Change return type of current function 'foo' to 'Int'" "true" package foo.bar fun test() { diff --git a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForCompanionObject.kt b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForCompanionObject.kt index 0b7135ed0b6..bbd7795e776 100644 --- a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForCompanionObject.kt +++ b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForCompanionObject.kt @@ -1,4 +1,4 @@ -// "Change 'Companion.foo' function return type to 'Int'" "true" +// "Change return type of current function 'Companion.foo' to 'Int'" "true" package foo.bar class A { diff --git a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForCompanionObject.kt.after b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForCompanionObject.kt.after index 01cce5d7657..93022145c11 100644 --- a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForCompanionObject.kt.after +++ b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForCompanionObject.kt.after @@ -1,4 +1,4 @@ -// "Change 'Companion.foo' function return type to 'Int'" "true" +// "Change return type of current function 'Companion.foo' to 'Int'" "true" package foo.bar class A { diff --git a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForLocalClass.kt b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForLocalClass.kt index 698ba6df23d..71a065b5cca 100644 --- a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForLocalClass.kt +++ b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForLocalClass.kt @@ -1,4 +1,4 @@ -// "Change 'A.foo' function return type to 'Int'" "true" +// "Change return type of current function 'A.foo' to 'Int'" "true" package foo.bar fun test() { diff --git a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForLocalClass.kt.after b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForLocalClass.kt.after index 0ffeb1ad7ff..3a8c8aef4f9 100644 --- a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForLocalClass.kt.after +++ b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForLocalClass.kt.after @@ -1,4 +1,4 @@ -// "Change 'A.foo' function return type to 'Int'" "true" +// "Change return type of current function 'A.foo' to 'Int'" "true" package foo.bar fun test() { diff --git a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForNestedClass.kt b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForNestedClass.kt index 73953c0cbb7..2f1fc784701 100644 --- a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForNestedClass.kt +++ b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForNestedClass.kt @@ -1,4 +1,4 @@ -// "Change 'B.foo' function return type to 'Int'" "true" +// "Change return type of current function 'B.foo' to 'Int'" "true" package foo.bar class A { diff --git a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForNestedClass.kt.after b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForNestedClass.kt.after index a83db80ae18..744e9cfbf8a 100644 --- a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForNestedClass.kt.after +++ b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForNestedClass.kt.after @@ -1,4 +1,4 @@ -// "Change 'B.foo' function return type to 'Int'" "true" +// "Change return type of current function 'B.foo' to 'Int'" "true" package foo.bar class A { diff --git a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForTopLevelClass.kt b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForTopLevelClass.kt index bb45ed012d8..53698e1512f 100644 --- a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForTopLevelClass.kt +++ b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForTopLevelClass.kt @@ -1,4 +1,4 @@ -// "Change 'A.foo' function return type to 'Int'" "true" +// "Change return type of current function 'A.foo' to 'Int'" "true" package foo.bar class A { diff --git a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForTopLevelClass.kt.after b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForTopLevelClass.kt.after index 5afae86df5e..cd4f720d48b 100644 --- a/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForTopLevelClass.kt.after +++ b/idea/testData/quickfix/typeMismatch/changeReturnTypeNoFqNameForTopLevelClass.kt.after @@ -1,4 +1,4 @@ -// "Change 'A.foo' function return type to 'Int'" "true" +// "Change return type of current function 'A.foo' to 'Int'" "true" package foo.bar class A { diff --git a/idea/testData/quickfix/typeMismatch/changeReturnTypeToSpecificNullable.kt b/idea/testData/quickfix/typeMismatch/changeReturnTypeToSpecificNullable.kt index 43ed76c018b..dd424e32357 100644 --- a/idea/testData/quickfix/typeMismatch/changeReturnTypeToSpecificNullable.kt +++ b/idea/testData/quickfix/typeMismatch/changeReturnTypeToSpecificNullable.kt @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'Int?'" "true" +// "Change return type of current function 'foo' to 'Int?'" "true" fun foo(): String { val n: Int? = 1 diff --git a/idea/testData/quickfix/typeMismatch/changeReturnTypeToSpecificNullable.kt.after b/idea/testData/quickfix/typeMismatch/changeReturnTypeToSpecificNullable.kt.after index ba5576c92c8..60a3f28f458 100644 --- a/idea/testData/quickfix/typeMismatch/changeReturnTypeToSpecificNullable.kt.after +++ b/idea/testData/quickfix/typeMismatch/changeReturnTypeToSpecificNullable.kt.after @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'Int?'" "true" +// "Change return type of current function 'foo' to 'Int?'" "true" fun foo(): Int? { val n: Int? = 1 diff --git a/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenFunctionNameIsMissing.kt b/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenFunctionNameIsMissing.kt index ecc9eb38684..6e45b2567dc 100644 --- a/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenFunctionNameIsMissing.kt +++ b/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenFunctionNameIsMissing.kt @@ -1,4 +1,4 @@ -// "Remove explicitly specified function return type" "true" +// "Remove explicitly specified return type of current function" "true" // ERROR: Function declaration must have a name fun (): Int { return diff --git a/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenFunctionNameIsMissing.kt.after b/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenFunctionNameIsMissing.kt.after index ca584ac90f3..3f6bb305e45 100644 --- a/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenFunctionNameIsMissing.kt.after +++ b/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenFunctionNameIsMissing.kt.after @@ -1,4 +1,4 @@ -// "Remove explicitly specified function return type" "true" +// "Remove explicitly specified return type of current function" "true" // ERROR: Function declaration must have a name fun () { return diff --git a/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenValueParameterListIsAbsent.kt b/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenValueParameterListIsAbsent.kt index fc311c4a57e..4da585ba8e4 100644 --- a/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenValueParameterListIsAbsent.kt +++ b/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenValueParameterListIsAbsent.kt @@ -1,4 +1,4 @@ -// "Change 'A.hasNext' function return type to 'Boolean'" "true" +// "Change return type of invoked function 'A.hasNext' to 'Boolean'" "true" abstract class A { abstract operator fun hasNext abstract operator fun next(): Int diff --git a/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenValueParameterListIsAbsent.kt.after b/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenValueParameterListIsAbsent.kt.after index 66a361bacc2..446c4766c8d 100644 --- a/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenValueParameterListIsAbsent.kt.after +++ b/idea/testData/quickfix/typeMismatch/changeReturnTypeWhenValueParameterListIsAbsent.kt.after @@ -1,4 +1,4 @@ -// "Change 'A.hasNext' function return type to 'Boolean'" "true" +// "Change return type of invoked function 'A.hasNext' to 'Boolean'" "true" abstract class A { abstract operator fun hasNext: Boolean abstract operator fun next(): Int diff --git a/idea/testData/quickfix/typeMismatch/compareToTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/compareToTypeMismatch.kt index 132f6a4be8b..5b81e448dd7 100644 --- a/idea/testData/quickfix/typeMismatch/compareToTypeMismatch.kt +++ b/idea/testData/quickfix/typeMismatch/compareToTypeMismatch.kt @@ -1,4 +1,4 @@ -// "Change 'A.compareTo' function return type to 'Int'" "true" +// "Change return type of invoked function 'A.compareTo' to 'Int'" "true" interface A { operator fun compareTo(other: Any): String } diff --git a/idea/testData/quickfix/typeMismatch/compareToTypeMismatch.kt.after b/idea/testData/quickfix/typeMismatch/compareToTypeMismatch.kt.after index 1cccdee3d6b..01615ec97ba 100644 --- a/idea/testData/quickfix/typeMismatch/compareToTypeMismatch.kt.after +++ b/idea/testData/quickfix/typeMismatch/compareToTypeMismatch.kt.after @@ -1,4 +1,4 @@ -// "Change 'A.compareTo' function return type to 'Int'" "true" +// "Change return type of invoked function 'A.compareTo' to 'Int'" "true" interface A { operator fun compareTo(other: Any): Int } diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch1.kt b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch1.kt index 2ae9beb442f..b9bb3e3193b 100644 --- a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch1.kt +++ b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch1.kt @@ -1,4 +1,4 @@ -// "Change 'A.component1' function return type to 'Int'" "true" +// "Change return type of invoked function 'A.component1' to 'Int'" "true" abstract class A { abstract operator fun component1() abstract operator fun component2(): Int diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch1.kt.after b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch1.kt.after index 2397a242778..6a406843c2b 100644 --- a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch1.kt.after +++ b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch1.kt.after @@ -1,4 +1,4 @@ -// "Change 'A.component1' function return type to 'Int'" "true" +// "Change return type of invoked function 'A.component1' to 'Int'" "true" abstract class A { abstract operator fun component1(): Int abstract operator fun component2(): Int diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch2.kt b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch2.kt index d6938e1ce65..ebea5c90ca3 100644 --- a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch2.kt +++ b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch2.kt @@ -1,4 +1,4 @@ -// "Change 'A.component2' function return type to 'Int'" "true" +// "Change return type of invoked function 'A.component2' to 'Int'" "true" abstract class A { abstract operator fun component1(): Int abstract operator fun component2(): String diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch2.kt.after b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch2.kt.after index d71e0c760e6..c629cb12b6d 100644 --- a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch2.kt.after +++ b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch2.kt.after @@ -1,4 +1,4 @@ -// "Change 'A.component2' function return type to 'Int'" "true" +// "Change return type of invoked function 'A.component2' to 'Int'" "true" abstract class A { abstract operator fun component1(): Int abstract operator fun component2(): Int diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch3.kt b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch3.kt index 89b7b25c5d3..86bfa4d1de6 100644 --- a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch3.kt +++ b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch3.kt @@ -1,4 +1,4 @@ -// "Remove explicitly specified return type in 'A.component2' function" "true" +// "Remove explicitly specified return type of invoked function 'A.component2'" "true" abstract class A { abstract operator fun component1(): Int abstract operator fun component2(): Int diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch3.kt.after b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch3.kt.after index 9afa29bf382..66682838e6d 100644 --- a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch3.kt.after +++ b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch3.kt.after @@ -1,4 +1,4 @@ -// "Remove explicitly specified return type in 'A.component2' function" "true" +// "Remove explicitly specified return type of invoked function 'A.component2'" "true" abstract class A { abstract operator fun component1(): Int abstract operator fun component2() diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt index 2ef055dffd3..b62c196e9e3 100644 --- a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt +++ b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt @@ -1,4 +1,4 @@ -// "Change 'A.component2' function return type to 'Unit'" "true" +// "Change return type of invoked 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 diff --git a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt.after b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt.after index 1ed8adb056a..2c21fbce3b8 100644 --- a/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt.after +++ b/idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt.after @@ -1,4 +1,4 @@ -// "Change 'A.component2' function return type to 'Unit'" "true" +// "Change return type of invoked 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 diff --git a/idea/testData/quickfix/typeMismatch/constantTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/constantTypeMismatch.kt index 34e7c7225bb..8fbed7e2b7f 100644 --- a/idea/testData/quickfix/typeMismatch/constantTypeMismatch.kt +++ b/idea/testData/quickfix/typeMismatch/constantTypeMismatch.kt @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'Int'" "true" +// "Change return type of current function 'foo' to 'Int'" "true" fun foo(): String { return 1 diff --git a/idea/testData/quickfix/typeMismatch/constantTypeMismatch.kt.after b/idea/testData/quickfix/typeMismatch/constantTypeMismatch.kt.after index ab872a3848b..a3ed6fd0ef8 100644 --- a/idea/testData/quickfix/typeMismatch/constantTypeMismatch.kt.after +++ b/idea/testData/quickfix/typeMismatch/constantTypeMismatch.kt.after @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'Int'" "true" +// "Change return type of current function 'foo' to 'Int'" "true" fun foo(): Int { return 1 diff --git a/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeNotFunctionReturnType.kt b/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeNotFunctionReturnType.kt index f2dcf7f7f72..3bdba248376 100644 --- a/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeNotFunctionReturnType.kt +++ b/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeNotFunctionReturnType.kt @@ -1,4 +1,4 @@ -// "Change 'A.not' function return type to 'A'" "true" +// "Change return type of invoked function 'A.not' to 'A'" "true" interface A { operator fun not(): String operator fun times(a: A): A diff --git a/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeNotFunctionReturnType.kt.after b/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeNotFunctionReturnType.kt.after index d71164d274c..7333c79ab83 100644 --- a/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeNotFunctionReturnType.kt.after +++ b/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeNotFunctionReturnType.kt.after @@ -1,4 +1,4 @@ -// "Change 'A.not' function return type to 'A'" "true" +// "Change return type of invoked function 'A.not' to 'A'" "true" interface A { operator fun not(): A operator fun times(a: A): A diff --git a/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changePlusFunctionReturnType.kt b/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changePlusFunctionReturnType.kt index fdd335c4799..f774a4230fc 100644 --- a/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changePlusFunctionReturnType.kt +++ b/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changePlusFunctionReturnType.kt @@ -1,4 +1,4 @@ -// "Change 'A.plus' function return type to '() -> Int'" "true" +// "Change return type of invoked function 'A.plus' to '() -> Int'" "true" interface A { operator fun plus(a: A): String } diff --git a/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changePlusFunctionReturnType.kt.after b/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changePlusFunctionReturnType.kt.after index ddea04b0eb8..bc008ac046e 100644 --- a/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changePlusFunctionReturnType.kt.after +++ b/idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changePlusFunctionReturnType.kt.after @@ -1,4 +1,4 @@ -// "Change 'A.plus' function return type to '() -> Int'" "true" +// "Change return type of invoked function 'A.plus' to '() -> Int'" "true" interface A { operator fun plus(a: A): () -> Int } diff --git a/idea/testData/quickfix/typeMismatch/hasNextFunctionReturnTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/hasNextFunctionReturnTypeMismatch.kt index 76bc2b5b3f9..dcb024ac0a3 100644 --- a/idea/testData/quickfix/typeMismatch/hasNextFunctionReturnTypeMismatch.kt +++ b/idea/testData/quickfix/typeMismatch/hasNextFunctionReturnTypeMismatch.kt @@ -1,4 +1,4 @@ -// "Change 'A.hasNext' function return type to 'Boolean'" "true" +// "Change return type of invoked function 'A.hasNext' to 'Boolean'" "true" abstract class A { abstract operator fun hasNext(): Int abstract operator fun next(): Int diff --git a/idea/testData/quickfix/typeMismatch/hasNextFunctionReturnTypeMismatch.kt.after b/idea/testData/quickfix/typeMismatch/hasNextFunctionReturnTypeMismatch.kt.after index 7ad68800624..12fe26ee1cf 100644 --- a/idea/testData/quickfix/typeMismatch/hasNextFunctionReturnTypeMismatch.kt.after +++ b/idea/testData/quickfix/typeMismatch/hasNextFunctionReturnTypeMismatch.kt.after @@ -1,4 +1,4 @@ -// "Change 'A.hasNext' function return type to 'Boolean'" "true" +// "Change return type of invoked function 'A.hasNext' to 'Boolean'" "true" abstract class A { abstract operator fun hasNext(): Boolean abstract operator fun next(): Int diff --git a/idea/testData/quickfix/typeMismatch/localClassInReturn1.kt b/idea/testData/quickfix/typeMismatch/localClassInReturn1.kt index 020113b5f6f..cb95a87a549 100644 --- a/idea/testData/quickfix/typeMismatch/localClassInReturn1.kt +++ b/idea/testData/quickfix/typeMismatch/localClassInReturn1.kt @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'U'" "true" +// "Change return type of current function 'foo' to 'U'" "true" interface T interface U diff --git a/idea/testData/quickfix/typeMismatch/localClassInReturn1.kt.after b/idea/testData/quickfix/typeMismatch/localClassInReturn1.kt.after index 11edf6b5a20..d698f341f86 100644 --- a/idea/testData/quickfix/typeMismatch/localClassInReturn1.kt.after +++ b/idea/testData/quickfix/typeMismatch/localClassInReturn1.kt.after @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'U'" "true" +// "Change return type of current function 'foo' to 'U'" "true" interface T interface U diff --git a/idea/testData/quickfix/typeMismatch/localClassInReturn2.kt b/idea/testData/quickfix/typeMismatch/localClassInReturn2.kt index 16957285cc1..3f3aacdfff6 100644 --- a/idea/testData/quickfix/typeMismatch/localClassInReturn2.kt +++ b/idea/testData/quickfix/typeMismatch/localClassInReturn2.kt @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'T'" "true" +// "Change return type of current function 'foo' to 'T'" "true" interface T fun foo() { diff --git a/idea/testData/quickfix/typeMismatch/localClassInReturn2.kt.after b/idea/testData/quickfix/typeMismatch/localClassInReturn2.kt.after index 24e9d12c771..6a20ce44094 100644 --- a/idea/testData/quickfix/typeMismatch/localClassInReturn2.kt.after +++ b/idea/testData/quickfix/typeMismatch/localClassInReturn2.kt.after @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'T'" "true" +// "Change return type of current function 'foo' to 'T'" "true" interface T fun foo(): T { diff --git a/idea/testData/quickfix/typeMismatch/makeReturnTypeNullable.kt b/idea/testData/quickfix/typeMismatch/makeReturnTypeNullable.kt index 5090cef639f..0ce3cc2932f 100644 --- a/idea/testData/quickfix/typeMismatch/makeReturnTypeNullable.kt +++ b/idea/testData/quickfix/typeMismatch/makeReturnTypeNullable.kt @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'String?'" "true" +// "Change return type of current function 'foo' to 'String?'" "true" fun foo(): String { return null diff --git a/idea/testData/quickfix/typeMismatch/makeReturnTypeNullable.kt.after b/idea/testData/quickfix/typeMismatch/makeReturnTypeNullable.kt.after index 4b4abaad2c8..9b265e6696e 100644 --- a/idea/testData/quickfix/typeMismatch/makeReturnTypeNullable.kt.after +++ b/idea/testData/quickfix/typeMismatch/makeReturnTypeNullable.kt.after @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'String?'" "true" +// "Change return type of current function 'foo' to 'String?'" "true" fun foo(): String? { return null diff --git a/idea/testData/quickfix/typeMismatch/noReturnInFunctionWithBlockBody.kt b/idea/testData/quickfix/typeMismatch/noReturnInFunctionWithBlockBody.kt index e254b4f61ed..f0ed19a4f65 100644 --- a/idea/testData/quickfix/typeMismatch/noReturnInFunctionWithBlockBody.kt +++ b/idea/testData/quickfix/typeMismatch/noReturnInFunctionWithBlockBody.kt @@ -1,3 +1,3 @@ -// "Remove explicitly specified return type in 'foo' function" "true" +// "Remove explicitly specified return type of current function 'foo'" "true" fun foo(): Int { } \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/noReturnInFunctionWithBlockBody.kt.after b/idea/testData/quickfix/typeMismatch/noReturnInFunctionWithBlockBody.kt.after index e8876c8bdeb..32b0748d88c 100644 --- a/idea/testData/quickfix/typeMismatch/noReturnInFunctionWithBlockBody.kt.after +++ b/idea/testData/quickfix/typeMismatch/noReturnInFunctionWithBlockBody.kt.after @@ -1,3 +1,3 @@ -// "Remove explicitly specified return type in 'foo' function" "true" +// "Remove explicitly specified return type of current function 'foo'" "true" fun foo() { } \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/returnTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/returnTypeMismatch.kt index 7995f7a3e67..ad581abbb8b 100644 --- a/idea/testData/quickfix/typeMismatch/returnTypeMismatch.kt +++ b/idea/testData/quickfix/typeMismatch/returnTypeMismatch.kt @@ -1,4 +1,4 @@ -// "Remove explicitly specified return type in 'foo' function" "true" +// "Remove explicitly specified return type of current function 'foo'" "true" fun foo(): Int { return } \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/returnTypeMismatch.kt.after b/idea/testData/quickfix/typeMismatch/returnTypeMismatch.kt.after index d0cc2249cb8..b681974ff12 100644 --- a/idea/testData/quickfix/typeMismatch/returnTypeMismatch.kt.after +++ b/idea/testData/quickfix/typeMismatch/returnTypeMismatch.kt.after @@ -1,4 +1,4 @@ -// "Remove explicitly specified return type in 'foo' function" "true" +// "Remove explicitly specified return type of current function 'foo'" "true" fun foo() { return } \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt index 3e830bc517a..1fbcc8466a5 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to '(Long) -> Int'" "true" +// "Change return type of current function 'foo' to '(Long) -> Int'" "true" fun foo(x: Any): Int { return {x: Long -> 42} } \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt.after b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt.after index 16b3d57bdc7..9e70d0a958a 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt.after +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt.after @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to '(Long) -> Int'" "true" +// "Change return type of current function 'foo' to '(Long) -> Int'" "true" fun foo(x: Any): (Long) -> Int { return {x: Long -> 42} } \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt index 44c4c565685..00da1362b65 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to '() -> Any'" "true" +// "Change return type of current function 'foo' to '() -> Any'" "true" fun foo(x: Any): () -> Int { return {x} } \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt.after b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt.after index 5c7182093c5..618bc0ffeee 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt.after +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt.after @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to '() -> Any'" "true" +// "Change return type of current function 'foo' to '() -> Any'" "true" fun foo(x: Any): () -> Any { return {x} } \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverride.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverride.kt index 94e9588321a..f31e4c64961 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverride.kt +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverride.kt @@ -1,5 +1,5 @@ -// "Change 'AA.f' function return type to 'Boolean'" "false" -// ACTION: Change 'AAA.g' function return type to 'Int' +// "Change return type of invoked function 'AA.f' to 'Boolean'" "false" +// ACTION: Change return type of current function 'AAA.g' to 'Int' // ACTION: Convert to expression body // ERROR: Type mismatch: inferred type is Int but Boolean was expected interface A { diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverrideForOperatorConvention.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverrideForOperatorConvention.kt index 580f21c92e8..7597a559b9c 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverrideForOperatorConvention.kt +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverrideForOperatorConvention.kt @@ -1,5 +1,5 @@ -// "Change 'AA.contains' function return type to 'Int'" "false" -// ACTION: Change 'AAA.g' function return type to 'Boolean' +// "Change return type of invoked function 'AA.contains' to 'Int'" "false" +// ACTION: Change return type of current function 'AAA.g' to 'Boolean' // ACTION: Convert to expression body // ACTION: Replace overloaded operator with function call // ERROR: Type mismatch: inferred type is Boolean but Int was expected diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnRuntime.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnRuntime.kt index 97ac5aa516b..dbdb9b8d88e 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnRuntime.kt +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnRuntime.kt @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'Int'" "true" +// "Change return type of current function 'foo' to 'Int'" "true" fun foo(n: Int): Boolean { n.let { return 1 diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnRuntime.kt.after b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnRuntime.kt.after index 6c4e4ed7c3e..0d7421ea7b7 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnRuntime.kt.after +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnRuntime.kt.after @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'Int'" "true" +// "Change return type of current function 'foo' to 'Int'" "true" fun foo(n: Int): Int { n.let { return 1 diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnWithLabelRuntime.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnWithLabelRuntime.kt index 8f6b4581fb1..0384f158eb4 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnWithLabelRuntime.kt +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnWithLabelRuntime.kt @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'Int'" "true" +// "Change return type of current function 'foo' to 'Int'" "true" fun foo(n: Int): Boolean { n.let { return@foo 1 diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnWithLabelRuntime.kt.after b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnWithLabelRuntime.kt.after index c8d76ef4e0d..66a3314c65d 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnWithLabelRuntime.kt.after +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnWithLabelRuntime.kt.after @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'Int'" "true" +// "Change return type of current function 'foo' to 'Int'" "true" fun foo(n: Int): Int { n.let { return@foo 1 diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByFunction.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByFunction.kt index 8a4869a7439..db4c7395bc1 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByFunction.kt +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByFunction.kt @@ -1,4 +1,4 @@ -// "Change 'boo' function return type to 'String'" "true" +// "Change return type of current function 'boo' to 'String'" "true" fun boo(): Int { return ((if (true) { val a = "" diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByFunction.kt.after b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByFunction.kt.after index 031dded208b..b87b8adefbf 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByFunction.kt.after +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByFunction.kt.after @@ -1,4 +1,4 @@ -// "Change 'boo' function return type to 'String'" "true" +// "Change return type of current function 'boo' to 'String'" "true" fun boo(): String { return ((if (true) { val a = "" diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInInitializer.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInInitializer.kt index 7fc2c617bd9..dc9fc572e4d 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInInitializer.kt +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInInitializer.kt @@ -1,2 +1,2 @@ -// "Change 'foo' function return type to 'String'" "true" +// "Change return type of current function 'foo' to 'String'" "true" fun foo(): Int = "" \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInInitializer.kt.after b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInInitializer.kt.after index 4528d211219..46d488f3271 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInInitializer.kt.after +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInInitializer.kt.after @@ -1,2 +1,2 @@ -// "Change 'foo' function return type to 'String'" "true" -fun foo(): String = "" \ No newline at end of file +// "Change return type of current function 'foo' to 'String'" "true" +fun foo(): String = "" \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInReturnStatement.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInReturnStatement.kt index 71a0a7aa945..5c6cc17a729 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInReturnStatement.kt +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInReturnStatement.kt @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'String'" "true" +// "Change return type of current function 'foo' to 'String'" "true" fun foo() { return "" } \ No newline at end of file diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInReturnStatement.kt.after b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInReturnStatement.kt.after index eb37598a97b..e411292d400 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInReturnStatement.kt.after +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInReturnStatement.kt.after @@ -1,4 +1,4 @@ -// "Change 'foo' function return type to 'String'" "true" +// "Change return type of current function 'foo' to 'String'" "true" fun foo(): String { return "" } \ No newline at end of file