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

DeprecatedSymbolUsageFix: can drop more arguments when function literal argument exist

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-22 17:13:33 +03:00
parent 2e2701aa61
commit a9e00a3264
7 changed files with 73 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/OptionalParametersHelper.kt
+4 -4
View File
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.psi.psiUtil.copied
import org.jetbrains.kotlin.psi.psiUtil.forEachDescendantOfType
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.calls.callUtil.getParameterForArgument
import org.jetbrains.kotlin.resolve.calls.callUtil.getValueArgumentsInParentheses
import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
import java.util.ArrayList
@@ -50,11 +51,10 @@ public object OptionalParametersHelper {
.toMap()
if (parameterToDefaultValue.isEmpty()) return emptyList()
val arguments = resolvedCall.getCall().getValueArguments()
//TODO: drop functional literal out of parenthesis too
val arguments = resolvedCall.getCall().getValueArgumentsInParentheses()
val argumentsToDrop = ArrayList<ValueArgument>()
//TODO: can drop arguments leaving last functional literal one (outside of parenthesis)
for (argument in arguments.reverse()) {
if (!canDrop(argument) || !argument.matchesDefault(resolvedCall, parameterToDefaultValue)) {
if (!argument.isNamed()) break else continue // for a named argument we can try to drop arguments before it as well