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

J2K: minor code improvements

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-07-10 15:04:20 +04:00
parent 46d6ba3340
commit 69a5b79342
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt
+3 -8
View File
@@ -109,15 +109,10 @@ class ConstructorConverter(private val psiClass: PsiClass, private val converter
val targetParameter = targetParameters[i] val targetParameter = targetParameters[i]
if (parameter.getName() != targetParameter.getName() || parameter.getType() != targetParameter.getType()) return null if (parameter.getName() != targetParameter.getName() || parameter.getType() != targetParameter.getType()) return null
val arg = args[i] val arg = args[i]
if (arg !is PsiReferenceExpression || arg.getQualifier() != null) return null if (arg !is PsiReferenceExpression || arg.resolve() != parameter) return null
if (arg.resolve() != parameter) return null
} }
val result = ArrayList<PsiExpression>(args.size - parameters.size) return args.drop(parameters.size)
for (i in (parameters.size..args.size-1)) {
result.add(args[i])
}
return result
} }
private fun dropConstructorsForDefaultValues(primary: PsiMethod, toTargetConstructorMap: Map<PsiMethod, TargetConstructorInfo>) { private fun dropConstructorsForDefaultValues(primary: PsiMethod, toTargetConstructorMap: Map<PsiMethod, TargetConstructorInfo>) {
@@ -136,7 +131,7 @@ class ConstructorConverter(private val psiClass: PsiClass, private val converter
val defaults = toTargetConstructorMap[constructor]!!.parameterDefaults!! val defaults = toTargetConstructorMap[constructor]!!.parameterDefaults!!
assert(defaults.size == primaryParamCount - paramCount) assert(defaults.size == primaryParamCount - paramCount)
for (i in (0..defaults.size-1)) { for (i in defaults.indices) {
val default = defaults[defaults.size - i - 1] val default = defaults[defaults.size - i - 1]
if (i < lastParamDefaults.size) { // default for this parameter has already been assigned if (i < lastParamDefaults.size) { // default for this parameter has already been assigned
if (lastParamDefaults[i].getText() != default.getText()) continue@DropCandidatesLoop if (lastParamDefaults[i].getText() != default.getText()) continue@DropCandidatesLoop