New J2K: rearrange and optimize some post-processings

nj2k/testData/newJ2k/arrayInitializerExpression/objectArrayWithLength.kt

@@ -1 +1 @@
-val a: Array<Any?> = arrayOfNulls(10)
+val a = arrayOfNulls<Any>(10)

nj2k/testData/newJ2k/arrayType/arrayInitializationStatement.kt

@@ -1 +1 @@
-val d2: Array<IntArray> = arrayOf()
+val d2 = arrayOf<IntArray>()

nj2k/testData/newJ2k/arrayType/arrayInitializationStatementWithDimension.kt

@@ -1 +1 @@
-val d2: Array<IntArray?> = arrayOfNulls(5)
+val d2 = arrayOfNulls<IntArray>(5)

nj2k/testData/newJ2k/arrayType/arrayInitializationStatementWithDimension3d.kt

@@ -1 +1 @@
-val d3: Array<Array<IntArray>> = Array(5) { arrayOfNulls(5) }
+val d3 = Array<Array<IntArray>>(5) { arrayOfNulls(5) }

nj2k/testData/newJ2k/arrayType/d2StringEmptyArray.kt

@@ -1 +1 @@
-val ss: Array<Array<String>> = Array(5) { arrayOfNulls(5) }
+val ss = Array<Array<String>>(5) { arrayOfNulls(5) }

nj2k/testData/newJ2k/arrayType/d3StringEmptyArray.kt

@@ -1 +1 @@
-val sss: Array<Array<Array<String>>> = Array(5) { Array(5) { arrayOfNulls(5) } }
+val sss = Array(5) { Array<Array<String>>(5) { arrayOfNulls(5) } }

nj2k/testData/newJ2k/classExpression/complexExample.kt

@@ -1 +1 @@
-val constrArgTypes: Array<Class<*>> = arrayOf(Array<String>::class.java, String::class.java, Int::class.java, Double::class.java)
+val constrArgTypes = arrayOf<Class<*>>(Array<String>::class.java, String::class.java, Int::class.java, Double::class.java)

nj2k/testData/newJ2k/detectProperties/PropertyType.kt

@@ -1,7 +1,7 @@
 import java.util.ArrayList
 
 internal class A {
-    private val list1: ArrayList<String> = ArrayList()
+    private val list1 = ArrayList<String>()
     private val list2: MutableList<String> = ArrayList()
     private val myList3: MutableList<String> = ArrayList()
     fun getList1(): List<String> {

nj2k/testData/newJ2k/function/java8MRSamConstructor.kt

@@ -122,10 +122,10 @@ internal class Java8Class {
     }
 
     fun testGenericFunctions() {
-        val emptyList: JFunction1<List<String>> = JFunction1 { emptyList() }
+        val emptyList = JFunction1<List<String>> { emptyList() }
         emptyList.foo()
-        MethodReferenceHelperClass.staticFun1(JFunction1<List<String>> { emptyList() })
-        h.memberFun1(JFunction1<List<String>> { emptyList() })
+        MethodReferenceHelperClass.staticFun1<List<String>> { emptyList() }
+        h.memberFun1<List<String>> { emptyList() }
     }
 
     fun memberFun(): Int {

nj2k/testData/newJ2k/issues/kt-19336.kt

@@ -1,6 +1,6 @@
 class TestReturnsArray {
     fun strings(n: Int): Array<String?> {
-        val result: Array<String?> = arrayOfNulls(n)
+        val result = arrayOfNulls<String>(n)
         for (i in 0 until n) {
             result[i] = Integer.toString(i)
         }

nj2k/testData/newJ2k/issues/kt-19604.kt

@@ -1,7 +1,7 @@
 import java.util.HashMap
 
 class TestMethodReference {
-    private val hashMap: HashMap<String, String> = HashMap()
+    private val hashMap = HashMap<String, String>()
     fun update(key: String, msg: String) {
         hashMap.merge(key, msg) { obj: String, s: String -> obj + s }
     }

nj2k/testData/newJ2k/issues/kt-19606.kt

@@ -1,7 +1,7 @@
 import java.util.HashMap
 
 class TestMethodReference {
-    private val hashMap: HashMap<String, String> = HashMap()
+    private val hashMap = HashMap<String, String>()
     fun update(key: String, msg: String) {
         hashMap.merge(key, msg) { obj: String, s: String -> obj + s }
     }

nj2k/testData/newJ2k/issues/kt-8170.kt

@@ -2,12 +2,12 @@ object ArrayNullable {
     @JvmStatic
     fun main(args: Array<String>) {
         val notNull = 0
-        val a1: Array<Int?> = arrayOfNulls(2)
+        val a1 = arrayOfNulls<Int>(2)
         a1[0] = null
         a1[1] = notNull
         println(a1[0])
         println(a1[1])
-        val a2: Array<Int?> = arrayOfNulls(2)
+        val a2 = arrayOfNulls<Int>(2)
         a2[0] = nullable()
         a2[1] = notNull
         println(a2[0])

nj2k/testData/newJ2k/list/ForEach.kt

@@ -3,7 +3,7 @@ import java.util.ArrayList
 
 class ForEach {
     fun test() {
-        val xs: ArrayList<Any> = ArrayList()
+        val xs = ArrayList<Any>()
         val ys: MutableList<Any> = LinkedList<Any>()
         for (x in xs) {
             ys.add(x)

nj2k/testData/newJ2k/list/Lists.kt

@@ -5,7 +5,7 @@ class Lists {
     fun test() {
         val xs: MutableList<Any?> = ArrayList()
         val ys: MutableList<Any?> = LinkedList<Any>()
-        val zs: ArrayList<Any?> = ArrayList()
+        val zs = ArrayList<Any?>()
         xs.add(null)
         ys.add(null)
         xs.clear()

nj2k/testData/newJ2k/methodCallExpression/collectionsMethods.kt

@@ -1,8 +1,8 @@
 internal class A {
     fun foo(): Map<String, String> {
-        val list1: List<String> = emptyList()
+        val list1 = emptyList<String>()
         val list2 = listOf(1)
-        val set1: Set<String> = emptySet()
+        val set1 = emptySet<String>()
         val set2 = setOf("a")
         return emptyMap()
     }

nj2k/testData/newJ2k/methodCallExpression/collectionsMethods2.kt

@@ -1,6 +1,6 @@
 internal class A {
     fun foo() {
-        val list: List<String?> = listOf(null)
-        val set: Set<String?> = setOf(null)
+        val list = listOf<String?>(null)
+        val set = setOf<String?>(null)
     }
 }

nj2k/testData/newJ2k/rawGenerics/kt-540-map.kt

@@ -4,7 +4,7 @@ import java.util.HashMap
 
 internal class Test {
     fun main() {
-        val commonMap: HashMap<String, Int> = HashMap()
+        val commonMap = HashMap<String, Int>()
         val rawMap: HashMap<*, *> = HashMap<String?, Int?>()
         val superRawMap: HashMap<*, *> = HashMap<Any?, Any?>()
     }

nj2k/testData/newJ2k/typeParameters/needTypeArgs.kt

@@ -2,7 +2,7 @@ import java.util.HashMap
 
 internal class A {
     fun foo() {
-        val map1: Map<String, Int> = getMap1()
+        val map1 = getMap1<String, Int>()
         val map2 = getMap2("a", 1)
     }
 
@@ -11,7 +11,7 @@ internal class A {
     }
 
     fun <K, V> getMap2(k: K, v: V): Map<K, V> {
-        val map: HashMap<K, V> = HashMap()
+        val map = HashMap<K, V>()
         map[k] = v
         return map
     }