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

Add/remove argument name intentions to work for super class constructor call

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-01-14 14:30:30 +03:00
parent c44340a351
commit bec16efbd7
7 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/AddNameToArgumentIntention.kt
+1 -1
View File
@@ -63,7 +63,7 @@ class AddNameToArgumentIntention
val argumentList = argument.parent as? KtValueArgumentList ?: return null
if (argument != argumentList.arguments.last { !it.isNamed() }) return null
val callExpr = argumentList.parent as? KtExpression ?: return null
val callExpr = argumentList.parent as? KtCallElement ?: return null
val resolvedCall = callExpr.getResolvedCall(callExpr.analyze(BodyResolveMode.PARTIAL)) ?: return null
val argumentMatch = resolvedCall.getArgumentMapping(argument) as? ArgumentMatch ?: return null
if (argumentMatch.status != ArgumentMatchStatus.SUCCESS) return null
idea/src/org/jetbrains/kotlin/idea/intentions/RemoveArgumentNameIntention.kt
+2 -2
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.intentions
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.util.TextRange
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtCallElement
import org.jetbrains.kotlin.psi.KtPsiFactory
import org.jetbrains.kotlin.psi.KtValueArgument
import org.jetbrains.kotlin.psi.KtValueArgumentList
@@ -38,7 +38,7 @@ class RemoveArgumentNameIntention
val arguments = argumentList.arguments
if (arguments.takeWhile { it != element }.any { it.isNamed() }) return null
val callExpr = argumentList.parent as? KtExpression ?: return null
val callExpr = argumentList.parent as? KtCallElement ?: return null
val resolvedCall = callExpr.getResolvedCall(callExpr.analyze(BodyResolveMode.PARTIAL)) ?: return null
val argumentMatch = resolvedCall.getArgumentMapping(element) as? ArgumentMatch ?: return null
if (argumentMatch.valueParameter.index != arguments.indexOf(element)) return null