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

KT-35648 RemoveArgumentNameIntention: Support MixedNamedArgumentsInTheirOwnPosition

Browse Source 
- ^KT-35648 Fixed
This commit is contained in:
Toshiaki Kameyama
2019-12-28 15:38:05 +09:00
committed by Roman Golyshev
parent 401baa35ab
commit 2daedc98b5
10 changed files with 102 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/NamedArgumentCompletion.kt
+16 -10
View File
@@ -34,17 +34,11 @@ import java.util.*
object NamedArgumentCompletion {
fun isOnlyNamedArgumentExpected(nameExpression: KtSimpleNameExpression, resolutionFacade: ResolutionFacade): Boolean {
val thisArgument = nameExpression.parent as? KtValueArgument ?: return false
if (thisArgument.isNamed()) return false
val resolvedCall = thisArgument.getStrictParentOfType<KtCallElement>()?.resolveToCall(resolutionFacade) ?: return false
val callElement = thisArgument.getStrictParentOfType<KtCallElement>() ?: return false
val argumentsBeforeThis = callElement.valueArguments.takeWhile { it != thisArgument }
if (!nameExpression.languageVersionSettings.supportsFeature(LanguageFeature.MixedNamedArgumentsInTheirOwnPosition)) {
return argumentsBeforeThis.any { it.isNamed() }
}
val resolvedCall = callElement.resolveToCall(resolutionFacade) ?: return false
return argumentsBeforeThis.any { it.isNamed() && !it.placedOnItsOwnPositionInCall(resolvedCall) }
return !thisArgument.canBeUsedWithoutNameInCall(resolvedCall)
}
fun complete(collector: LookupElementsCollector, expectedInfos: Collection<ExpectedInfo>, callType: CallType<*>) {
@@ -83,6 +77,18 @@ object NamedArgumentCompletion {
}
}
/**
* Checks whether argument in the [resolvedCall] can be used without its name (as positional argument).
*/
fun KtValueArgument.canBeUsedWithoutNameInCall(resolvedCall: ResolvedCall<out CallableDescriptor>): Boolean {
val argumentsBeforeThis = resolvedCall.call.valueArguments.takeWhile { it != this }
return if (languageVersionSettings.supportsFeature(LanguageFeature.MixedNamedArgumentsInTheirOwnPosition)) {
argumentsBeforeThis.none { it.isNamed() && !it.placedOnItsOwnPositionInCall(resolvedCall) }
} else {
argumentsBeforeThis.none { it.isNamed() }
}
}
/**
* Checks whether argument in the [resolvedCall] is on the same position as it listed in the callable definition.
*
@@ -99,6 +105,6 @@ object NamedArgumentCompletion {
* )
* ```
*/
private fun ValueArgument.placedOnItsOwnPositionInCall(resolvedCall: ResolvedCall<out CallableDescriptor>): Boolean {
fun ValueArgument.placedOnItsOwnPositionInCall(resolvedCall: ResolvedCall<out CallableDescriptor>): Boolean {
return resolvedCall.getParameterForArgument(this)?.index == resolvedCall.call.valueArguments.indexOf(this)
}