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

Code simplification

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-06-08 15:24:09 +03:00
parent 8243d27fb2
commit 7dddd6c718
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ExpectedInfos.kt
+10 -17
View File
@@ -209,24 +209,17 @@ class ExpectedInfos(
if (varargElementType != null) {
if (isFunctionLiteralArgument) continue
val varargTail = if (argumentName == null && tail == Tail.RPARENTH)
null /* even if it's the last parameter, there can be more arguments for the same parameter */
else
tail
if (!alreadyHasStar) {
expectedInfos.add(ArgumentExpectedInfo(varargElementType, expectedName?.unpluralize(), varargTail, descriptor, argumentPosition))
}
val starOptions = if (!alreadyHasStar) ItemOptions.STAR_PREFIX else ItemOptions.DEFAULT
if (argumentName == null) {
// even if it's the last parameter, there can be more arguments for the same parameter
val varargTail = if (tail == Tail.RPARENTH) null else tail
if (!alreadyHasStar) {
expectedInfos.add(ArgumentExpectedInfo(varargElementType, expectedName?.unpluralize(), varargTail, descriptor, argumentPosition))
}
expectedInfos.add(ArgumentExpectedInfo(parameter.getType(), expectedName, varargTail, descriptor, argumentPosition, starOptions))
}
else {
if (!alreadyHasStar) {
expectedInfos.add(ArgumentExpectedInfo(varargElementType, expectedName?.unpluralize(), tail, descriptor, argumentPosition))
}
expectedInfos.add(ArgumentExpectedInfo(parameter.getType(), expectedName, tail, descriptor, argumentPosition, starOptions))
}
expectedInfos.add(ArgumentExpectedInfo(parameter.getType(), expectedName, varargTail, descriptor, argumentPosition, starOptions))
}
else {
if (alreadyHasStar) continue