diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeInliner.kt b/idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeInliner.kt index 6338e2eb7a5..057f2ea8093 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeInliner.kt +++ b/idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeInliner.kt @@ -305,7 +305,7 @@ class CodeInliner( val call = dotQualified.selectorExpression as? KtCallExpression ?: return val nameExpression = call.calleeExpression as? KtSimpleNameExpression ?: return val argument = call.valueArguments.singleOrNull() ?: return - if (argument.getArgumentName() != null) return + if (argument.isNamed()) return val argumentExpression = argument.getArgumentExpression() ?: return codeToInline.mainExpression = psiFactory.createExpressionByPattern("$0 ${nameExpression.text} $1", receiver, argumentExpression) } diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertLambdaToReferenceIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertLambdaToReferenceIntention.kt index 217481a0bfb..ed9f2c02e25 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertLambdaToReferenceIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertLambdaToReferenceIntention.kt @@ -193,7 +193,7 @@ open class ConvertLambdaToReferenceIntention(text: String) : val arguments = outerCallExpression.valueArguments.filter { it !is KtLambdaArgument } val hadDefaultValues = valueParameters.size - 1 > arguments.size val useNamedArguments = valueParameters.any { it.hasDefaultValue() } && hadDefaultValues - || arguments.any { it.getArgumentName() != null } + || arguments.any { it.isNamed() } val newArgumentList = factory.buildValueArgumentList { appendFixedText("(") diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallerUsages.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallerUsages.kt index 23a459fd733..241fa5f15ec 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallerUsages.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallerUsages.kt @@ -52,7 +52,7 @@ class KotlinCallerCallUsage(element: KtCallElement): KotlinUsageInfo): Boolean { val argumentList = element.valueArgumentList ?: return true val psiFactory = KtPsiFactory(project) - val isNamedCall = argumentList.arguments.any { it.getArgumentName() != null } + val isNamedCall = argumentList.arguments.any { it.isNamed() } changeInfo.getNonReceiverParameters() .filter { it.isNewParameter } .forEach {