From 1dbb3d7c0f97818d7a9206f467b0e00a647c8782 Mon Sep 17 00:00:00 2001
From: Roman Golyshev <anstreth@gmail.com>
Date: Thu, 20 Feb 2020 17:33:39 +0300
Subject: [PATCH] Revert "New J2K: fix testdata"

This reverts commit 285aa123
---
 nj2k/testData/newJ2k/issues/kt-19604.kt | 2 +-
 nj2k/testData/newJ2k/issues/kt-19606.kt | 2 +-
 nj2k/testData/newJ2k/issues/kt-32702.kt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nj2k/testData/newJ2k/issues/kt-19604.kt b/nj2k/testData/newJ2k/issues/kt-19604.kt
index c593dcca8c4..0408a4bab8c 100644
--- a/nj2k/testData/newJ2k/issues/kt-19604.kt
+++ b/nj2k/testData/newJ2k/issues/kt-19604.kt
@@ -3,6 +3,6 @@ import java.util.HashMap
 class TestMethodReference {
     private val hashMap = HashMap<String, String>()
     fun update(key: String, msg: String) {
-        hashMap.merge(key, msg) { obj: String, str: String -> obj + str }
+        hashMap.merge(key, msg) { obj: String, s: String -> obj + s }
     }
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/issues/kt-19606.kt b/nj2k/testData/newJ2k/issues/kt-19606.kt
index c593dcca8c4..0408a4bab8c 100644
--- a/nj2k/testData/newJ2k/issues/kt-19606.kt
+++ b/nj2k/testData/newJ2k/issues/kt-19606.kt
@@ -3,6 +3,6 @@ import java.util.HashMap
 class TestMethodReference {
     private val hashMap = HashMap<String, String>()
     fun update(key: String, msg: String) {
-        hashMap.merge(key, msg) { obj: String, str: String -> obj + str }
+        hashMap.merge(key, msg) { obj: String, s: String -> obj + s }
     }
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/issues/kt-32702.kt b/nj2k/testData/newJ2k/issues/kt-32702.kt
index 6fd9400b0b1..f510cf598e0 100644
--- a/nj2k/testData/newJ2k/issues/kt-32702.kt
+++ b/nj2k/testData/newJ2k/issues/kt-32702.kt
@@ -5,6 +5,6 @@ internal class Test {
     fun context() {
         val items: MutableList<Double> = ArrayList()
         items.add(1.0)
-        items.forEach(Consumer { x: Double? -> println(x) })
+        items.forEach(Consumer { o: Double? -> println(o) })
     }
 }
\ No newline at end of file