azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More refactoring

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-09-04 19:20:36 +03:00
parent 720dad5207
commit 86830563b0
1 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.kt
+24 -25
View File
@@ -27,7 +27,6 @@ import com.intellij.psi.PsiDocumentManager
import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.idea.JetIcons import org.jetbrains.kotlin.idea.JetIcons
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.core.mapArgumentsToParameters
import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.JetCallElement import org.jetbrains.kotlin.psi.JetCallElement
@@ -36,11 +35,10 @@ import org.jetbrains.kotlin.psi.JetPsiFactory
import org.jetbrains.kotlin.psi.JetValueArgument import org.jetbrains.kotlin.psi.JetValueArgument
import org.jetbrains.kotlin.psi.psiUtil.getParentOfType import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.types.checker.JetTypeChecker
import java.util.*
public class AddNameToArgumentFix(argument: JetValueArgument, private val possibleNames: List<String>) : JetIntentionAction<JetValueArgument>(argument) { public class AddNameToArgumentFix(argument: JetValueArgument, private val possibleNames: List<Name>) : JetIntentionAction<JetValueArgument>(argument) {
override fun invoke(project: Project, editor: Editor?, file: JetFile) { override fun invoke(project: Project, editor: Editor?, file: JetFile) {
if (possibleNames.size() == 1 || editor == null || !editor.component.isShowing) { if (possibleNames.size() == 1 || editor == null || !editor.component.isShowing) {
@@ -55,18 +53,18 @@ public class AddNameToArgumentFix(argument: JetValueArgument, private val possib
JBPopupFactory.getInstance().createListPopup(getNamePopup(project)).showInBestPositionFor(editor) JBPopupFactory.getInstance().createListPopup(getNamePopup(project)).showInBestPositionFor(editor)
} }
private fun getNamePopup(project: Project): ListPopupStep<String> { private fun getNamePopup(project: Project): ListPopupStep<Name> {
return object : BaseListPopupStep<String>("Choose parameter name", possibleNames) { return object : BaseListPopupStep<Name>("Choose parameter name", possibleNames) {
override fun onChosen(selectedName: String, finalChoice: Boolean): PopupStep<Any> { override fun onChosen(selectedValue: Name, finalChoice: Boolean): PopupStep<*>? {
if (finalChoice) { if (finalChoice) {
addName(project, element, selectedName) addName(project, element, selectedValue)
} }
return PopupStep.FINAL_CHOICE return PopupStep.FINAL_CHOICE
} }
override fun getIconFor(name: String) = JetIcons.PARAMETER override fun getIconFor(name: Name) = JetIcons.PARAMETER
override fun getTextFor(name: String) = getParsedArgumentWithName(name, element).text override fun getTextFor(name: Name) = getParsedArgumentWithName(name, element).text
} }
} }
@@ -87,26 +85,27 @@ public class AddNameToArgumentFix(argument: JetValueArgument, private val possib
return AddNameToArgumentFix(argument, possibleNames) return AddNameToArgumentFix(argument, possibleNames)
} }
private fun generatePossibleNames(argument: JetValueArgument): List<String> { private fun generatePossibleNames(argument: JetValueArgument): List<Name> {
val callElement = argument.getParentOfType<JetCallElement>(true) ?: return emptyList() val callElement = argument.getParentOfType<JetCallElement>(true) ?: return emptyList()
val context = argument.analyze(BodyResolveMode.PARTIAL) val context = argument.analyze(BodyResolveMode.PARTIAL)
val resolvedCall = callElement.getResolvedCall(context) ?: return emptyList() val resolvedCall = callElement.getResolvedCall(context) ?: return emptyList()
val callableDescriptor = resolvedCall.resultingDescriptor val argumentType = argument.getArgumentExpression()?.let { context.getType(it) }
val argumentExpression = argument.getArgumentExpression()
val argumentType = argumentExpression?.let { context.getType(it) } val usedParameters = resolvedCall.call.valueArguments
val usedParameters = resolvedCall.call.mapArgumentsToParameters(callableDescriptor).values().toSet() .map { resolvedCall.getArgumentMapping(it) }
val names = ArrayList<String>() .filterIsInstance<ArgumentMatch>()
for (parameter in callableDescriptor.valueParameters) { .filter { argumentMatch -> argumentType == null || argumentType.isError || !argumentMatch.isError() }
if (parameter !in usedParameters && (argumentType == null || JetTypeChecker.DEFAULT.isSubtypeOf(argumentType, parameter.type))) { .map { it.valueParameter }
names.add(parameter.name.asString()) .toSet()
}
} return resolvedCall.resultingDescriptor.valueParameters
return names .filter { it !in usedParameters }
.map { it.name }
} }
private fun addName(project: Project, argument: JetValueArgument, name: String) { private fun addName(project: Project, argument: JetValueArgument, name: Name) {
PsiDocumentManager.getInstance(project).commitAllDocuments() PsiDocumentManager.getInstance(project).commitAllDocuments()
project.executeWriteCommand("Add name to argument...") { project.executeWriteCommand("Add name to argument...") {
@@ -115,10 +114,10 @@ public class AddNameToArgumentFix(argument: JetValueArgument, private val possib
} }
} }
private fun getParsedArgumentWithName(name: String, argument: JetValueArgument): JetValueArgument { private fun getParsedArgumentWithName(name: Name, argument: JetValueArgument): JetValueArgument {
val argumentExpression = argument.getArgumentExpression() val argumentExpression = argument.getArgumentExpression()
?: error("Argument should be already parsed.") ?: error("Argument should be already parsed.")
return JetPsiFactory(argument).createArgument(argumentExpression, Name.identifier(name), argument.getSpreadElement() != null) return JetPsiFactory(argument).createArgument(argumentExpression, name, argument.getSpreadElement() != null)
} }
} }
} }