KT-10004 Java to Kotlin: array.length is converted to array.size() instead of array.size

#KT-10004 Fixed
This commit is contained in:
Valentin Kipyatkov
2015-11-16 21:51:52 +03:00
parent 4905275a30
commit d78390e489
5 changed files with 5 additions and 5 deletions
@@ -419,7 +419,7 @@ class DefaultExpressionConverter : JavaElementVisitor(), ExpressionConverter {
var identifier = Identifier(referenceName, isNullable).assignNoPrototype() var identifier = Identifier(referenceName, isNullable).assignNoPrototype()
if (qualifier != null && qualifier.getType() is PsiArrayType && referenceName == "length") { if (qualifier != null && qualifier.getType() is PsiArrayType && referenceName == "length") {
identifier = Identifier("size()", isNullable).assignNoPrototype() identifier = Identifier("size", isNullable).assignNoPrototype()
} }
else if (qualifier != null) { else if (qualifier != null) {
if (target is KtLightField && target.getOrigin() is KtObjectDeclaration) { if (target is KtLightField && target.getOrigin() is KtObjectDeclaration) {
@@ -1,6 +1,6 @@
class A { class A {
internal fun foo(array: Array<String>) { internal fun foo(array: Array<String>) {
for (i in array.size() downTo 0) { for (i in array.size downTo 0) {
println(i) println(i)
} }
} }
@@ -1,6 +1,6 @@
class A { class A {
internal fun foo(array: Array<String>) { internal fun foo(array: Array<String>) {
for (i in array.size() - 2 downTo 0) { for (i in array.size - 2 downTo 0) {
println(i) println(i)
} }
} }
+1 -1
View File
@@ -1,5 +1,5 @@
internal object Test { internal object Test {
fun foo(args: Array<String>): Int { fun foo(args: Array<String>): Int {
return args.size() return args.size
} }
} }
+1 -1
View File
@@ -1,6 +1,6 @@
object C { object C {
@JvmStatic fun main(args: Array<String>) { @JvmStatic fun main(args: Array<String>) {
when (args.size()) { when (args.size) {
1 -> { 1 -> {
run { run {
val a = 1 val a = 1