Introduce intention to name anonymous parameter #KT-17191 Fixed
This commit is contained in:
committed by
Mikhail Glukhikh
parent
bc071bf543
commit
9dd217eee3
@@ -1265,6 +1265,11 @@
|
||||
<category>Kotlin</category>
|
||||
</intentionAction>
|
||||
|
||||
<intentionAction>
|
||||
<className>org.jetbrains.kotlin.idea.intentions.ReplaceUnderscoreWithParameterNameIntention</className>
|
||||
<category>Kotlin</category>
|
||||
</intentionAction>
|
||||
|
||||
<intentionAction>
|
||||
<className>org.jetbrains.kotlin.idea.intentions.AddJvmOverloadsIntention</className>
|
||||
<category>Kotlin</category>
|
||||
|
||||
+96
@@ -0,0 +1,96 @@
|
||||
/*
|
||||
* Copyright 2010-2017 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.kotlin.idea.intentions
|
||||
|
||||
import com.intellij.openapi.editor.Editor
|
||||
import org.jetbrains.kotlin.builtins.extractParameterNameFromFunctionTypeArgument
|
||||
import org.jetbrains.kotlin.descriptors.CallableDescriptor
|
||||
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
||||
import org.jetbrains.kotlin.idea.caches.resolve.analyze
|
||||
import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
|
||||
import org.jetbrains.kotlin.idea.core.CollectingNameValidator
|
||||
import org.jetbrains.kotlin.idea.core.KotlinNameSuggester
|
||||
import org.jetbrains.kotlin.idea.core.NewDeclarationNameValidator
|
||||
import org.jetbrains.kotlin.psi.*
|
||||
import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType
|
||||
import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
|
||||
import org.jetbrains.kotlin.resolve.BindingContext
|
||||
import org.jetbrains.kotlin.resolve.DescriptorUtils
|
||||
import org.jetbrains.kotlin.resolve.calls.callUtil.getParameterForArgument
|
||||
import org.jetbrains.kotlin.resolve.calls.callUtil.getParentResolvedCall
|
||||
import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
|
||||
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
|
||||
|
||||
class ReplaceUnderscoreWithParameterNameIntention : SelfTargetingOffsetIndependentIntention<KtCallableDeclaration>(
|
||||
KtCallableDeclaration::class.java,
|
||||
"Replace '_' with parameter name"
|
||||
) {
|
||||
override fun isApplicableTo(element: KtCallableDeclaration) =
|
||||
element.name == "_" && (element is KtDestructuringDeclarationEntry || element is KtParameter)
|
||||
|
||||
override fun applyTo(element: KtCallableDeclaration, editor: Editor?) {
|
||||
val suggestedParameterName = suggestedParameterName(element)
|
||||
val validator = CollectingNameValidator(
|
||||
filter = NewDeclarationNameValidator(element.parent.parent, null, NewDeclarationNameValidator.Target.VARIABLES)
|
||||
)
|
||||
val name = suggestedParameterName?.let {
|
||||
KotlinNameSuggester.suggestNameByName(it, validator)
|
||||
} ?: run {
|
||||
val elementDescriptor = element.resolveToDescriptorIfAny() as? CallableDescriptor
|
||||
elementDescriptor?.returnType?.let { KotlinNameSuggester.suggestNamesByType(it, validator).firstOrNull() }
|
||||
} ?: return
|
||||
element.setName(name)
|
||||
}
|
||||
|
||||
private fun suggestedParameterName(element: KtCallableDeclaration) =
|
||||
when (element) {
|
||||
is KtDestructuringDeclarationEntry -> dataClassParameterName(element)
|
||||
is KtParameter -> lambdaParameterName(element)
|
||||
else -> null
|
||||
}
|
||||
|
||||
private fun lambdaParameterName(element: KtParameter): String? {
|
||||
val functionLiteral = element.getParentOfType<KtFunctionLiteral>(strict = true) ?: return null
|
||||
val idx = functionLiteral.valueParameters.indexOf(element)
|
||||
if (idx == -1) return null
|
||||
val context = functionLiteral.analyze(BodyResolveMode.PARTIAL)
|
||||
val resolvedCall = element.getParentResolvedCall(context)
|
||||
val lambdaArgument = functionLiteral.getParentOfType<KtLambdaArgument>(strict = true) ?: return null
|
||||
val lambdaParam = resolvedCall?.getParameterForArgument(lambdaArgument) ?: return null
|
||||
return lambdaParam.type.arguments.getOrNull(idx)?.type?.extractParameterNameFromFunctionTypeArgument()?.asString()
|
||||
}
|
||||
|
||||
private fun dataClassParameterName(declarationEntry: KtDestructuringDeclarationEntry): String? {
|
||||
val context = declarationEntry.analyze()
|
||||
val componentResolvedCall = context[BindingContext.COMPONENT_RESOLVED_CALL, declarationEntry] ?: return null
|
||||
val receiver = componentResolvedCall.dispatchReceiver ?: componentResolvedCall.extensionReceiver ?: return null
|
||||
val classDescriptor = receiver.type.constructor.declarationDescriptor as? ClassDescriptor ?: return null
|
||||
return when {
|
||||
classDescriptor.isData -> {
|
||||
val primaryParameters = classDescriptor.unsubstitutedPrimaryConstructor?.valueParameters
|
||||
primaryParameters?.getOrNull(declarationEntry.entryIndex())?.name?.asString()
|
||||
}
|
||||
DescriptorUtils.isSubclass(classDescriptor, classDescriptor.builtIns.mapEntry) -> {
|
||||
listOf("key", "value").getOrNull(declarationEntry.entryIndex())
|
||||
}
|
||||
else -> null
|
||||
}
|
||||
}
|
||||
|
||||
private fun KtDestructuringDeclarationEntry.entryIndex() =
|
||||
parent.getChildrenOfType<KtDestructuringDeclarationEntry>().indexOf(this)
|
||||
}
|
||||
Reference in New Issue
Block a user