From d78390e4891670fa5170fc132fff7dfb19ff8a80 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Mon, 16 Nov 2015 21:51:52 +0300
Subject: [PATCH] KT-10004 Java to Kotlin: array.length is converted to
 array.size() instead of array.size

 #KT-10004 Fixed
---
 j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt      | 2 +-
 j2k/testData/fileOrElement/for/falseArrayIndicesReversed.kt  | 2 +-
 j2k/testData/fileOrElement/for/falseArrayIndicesReversed2.kt | 2 +-
 j2k/testData/fileOrElement/issues/arrayLength.kt             | 2 +-
 j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt
index ca97ab0ab1a..b7238ed2ac0 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt
@@ -419,7 +419,7 @@ class DefaultExpressionConverter : JavaElementVisitor(), ExpressionConverter {
 
         var identifier = Identifier(referenceName, isNullable).assignNoPrototype()
         if (qualifier != null && qualifier.getType() is PsiArrayType && referenceName == "length") {
-            identifier = Identifier("size()", isNullable).assignNoPrototype()
+            identifier = Identifier("size", isNullable).assignNoPrototype()
         }
         else if (qualifier != null) {
             if (target is KtLightField && target.getOrigin() is KtObjectDeclaration) {
diff --git a/j2k/testData/fileOrElement/for/falseArrayIndicesReversed.kt b/j2k/testData/fileOrElement/for/falseArrayIndicesReversed.kt
index 12fa54f9c7c..b94849f327e 100644
--- a/j2k/testData/fileOrElement/for/falseArrayIndicesReversed.kt
+++ b/j2k/testData/fileOrElement/for/falseArrayIndicesReversed.kt
@@ -1,6 +1,6 @@
 class A {
     internal fun foo(array: Array<String>) {
-        for (i in array.size() downTo 0) {
+        for (i in array.size downTo 0) {
             println(i)
         }
     }
diff --git a/j2k/testData/fileOrElement/for/falseArrayIndicesReversed2.kt b/j2k/testData/fileOrElement/for/falseArrayIndicesReversed2.kt
index 34f33c7b096..d1cb835a8f1 100644
--- a/j2k/testData/fileOrElement/for/falseArrayIndicesReversed2.kt
+++ b/j2k/testData/fileOrElement/for/falseArrayIndicesReversed2.kt
@@ -1,6 +1,6 @@
 class A {
     internal fun foo(array: Array<String>) {
-        for (i in array.size() - 2 downTo 0) {
+        for (i in array.size - 2 downTo 0) {
             println(i)
         }
     }
diff --git a/j2k/testData/fileOrElement/issues/arrayLength.kt b/j2k/testData/fileOrElement/issues/arrayLength.kt
index db928458047..4e2c87f3c43 100644
--- a/j2k/testData/fileOrElement/issues/arrayLength.kt
+++ b/j2k/testData/fileOrElement/issues/arrayLength.kt
@@ -1,5 +1,5 @@
 internal object Test {
     fun foo(args: Array<String>): Int {
-        return args.size()
+        return args.size
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt b/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt
index 2a7f6bc40f0..d2d144de89b 100644
--- a/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt
+++ b/j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt
@@ -1,6 +1,6 @@
 object C {
     @JvmStatic fun main(args: Array<String>) {
-        when (args.size()) {
+        when (args.size) {
             1 -> {
                 run {
                     val a = 1