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

Simplified code

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-07-22 18:56:28 +04:00
parent 67df7de7b1
commit ca25a3feaa
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt
+3 -8
View File
@@ -147,13 +147,8 @@ class ExpectedInfos(val bindingContext: BindingContext, val moduleDescriptor: Mo
if (!Visibilities.isVisible(descriptor, resolutionScope.getContainingDeclaration())) continue if (!Visibilities.isVisible(descriptor, resolutionScope.getContainingDeclaration())) continue
val parameters = descriptor.getValueParameters() val parameters = descriptor.getValueParameters()
if (isFunctionLiteralArgument) { if (isFunctionLiteralArgument && argumentIndex != parameters.lastIndex) continue
if (argumentIndex != parameters.lastIndex) continue
}
else {
if (parameters.size <= argumentIndex) continue
}
val parameterDescriptor = parameters[argumentIndex]
val tail = if (isFunctionLiteralArgument) val tail = if (isFunctionLiteralArgument)
null null
else if (argumentIndex == parameters.lastIndex) else if (argumentIndex == parameters.lastIndex)
@@ -163,7 +158,7 @@ class ExpectedInfos(val bindingContext: BindingContext, val moduleDescriptor: Mo
else else
Tail.COMMA Tail.COMMA
expectedInfos.add(ExpectedInfo(parameterDescriptor.getType(), tail)) expectedInfos.add(ExpectedInfo(parameters[argumentIndex].getType(), tail))
} }
} }
return expectedInfos return expectedInfos