From 1a1db5a6f13bc02cecaa8e962a67088257888c92 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <Yan.Zhulanow@jetbrains.com>
Date: Fri, 2 Jun 2017 22:26:01 +0300
Subject: [PATCH] Android Extensions: Support cache in custom Views

---
 .../synthetic/codegen/AndroidClassType.kt     |  2 +-
 .../bytecodeShape/simpleView/simpleView.kt    |  1 +
 .../viewWithCache/res/layout/layout.xml       | 17 ++++++++++++++
 .../viewWithCache/viewWithCache.kt            | 22 +++++++++++++++++++
 .../AndroidBytecodeShapeTestGenerated.java    |  6 +++++
 5 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewWithCache/res/layout/layout.xml
 create mode 100644 plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewWithCache/viewWithCache.kt

diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidClassType.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidClassType.kt
index e54eec260f8..e4c27ca0e82 100644
--- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidClassType.kt
+++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/codegen/AndroidClassType.kt
@@ -28,7 +28,7 @@ enum class AndroidClassType(className: String, val supportsCache: Boolean = fals
     DIALOG(AndroidConst.DIALOG_FQNAME, supportsCache = false),
     SUPPORT_FRAGMENT_ACTIVITY(AndroidConst.SUPPORT_FRAGMENT_ACTIVITY_FQNAME, supportsCache = true),
     SUPPORT_FRAGMENT(AndroidConst.SUPPORT_FRAGMENT_FQNAME, supportsCache = true, fragment = true),
-    VIEW(AndroidConst.VIEW_FQNAME),
+    VIEW(AndroidConst.VIEW_FQNAME, supportsCache = true),
     UNKNOWN("");
 
     val internalClassName: String = className.replace('.', '/')
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleView/simpleView.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleView/simpleView.kt
index 04f5c525f0d..a192d8cacc0 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleView/simpleView.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/simpleView/simpleView.kt
@@ -14,4 +14,5 @@ public class MyActivity : Activity() {
 // 1 GETSTATIC test/R\$id\.login
 // 1 INVOKEVIRTUAL android/view/View\.findViewById
 // 0 INVOKEVIRTUAL test/MyActivity\._\$_findCachedViewById
+// 0 INVOKEVIRTUAL android/view/View\._\$_findCachedViewById
 // 1 CHECKCAST android/widget/Button
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewWithCache/res/layout/layout.xml b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewWithCache/res/layout/layout.xml
new file mode 100644
index 00000000000..4d73173b521
--- /dev/null
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewWithCache/res/layout/layout.xml
@@ -0,0 +1,17 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:tools="http://schemas.android.com/tools"
+             android:id="@+id/item_detail_container"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             tools:context=".ItemDetailActivity"
+             tools:ignore="MergeRootFrame" >
+
+
+
+    <Button
+        android:id="@+id/login"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Sign in" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewWithCache/viewWithCache.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewWithCache/viewWithCache.kt
new file mode 100644
index 00000000000..3fce6040a40
--- /dev/null
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewWithCache/viewWithCache.kt
@@ -0,0 +1,22 @@
+package test
+
+import android.view.View
+import android.app.Activity
+import android.content.Context
+import kotlinx.android.synthetic.main.layout.view.*
+
+class MyView(context: Context) : View(context)
+
+class MyActivity : Activity() {
+    init { MyView(this).login }
+}
+
+// 2 public _\$_findCachedViewById
+// 1 INVOKEVIRTUAL test/MyActivity\.findViewById
+// 2 public _\$_clearFindViewByIdCache
+// 1 GETSTATIC test/R\$id\.login
+// 0 INVOKEVIRTUAL android/view/View\.findViewById
+// 1 INVOKEVIRTUAL test/MyView\.findViewById
+// 0 INVOKEVIRTUAL test/MyActivity\._\$_findCachedViewById
+// 0 INVOKEVIRTUAL android/view/View\._\$_findCachedViewById
+// 1 CHECKCAST android/widget/Button
diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidBytecodeShapeTestGenerated.java b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidBytecodeShapeTestGenerated.java
index 627fb720840..b4991cf7e3b 100644
--- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidBytecodeShapeTestGenerated.java
+++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidBytecodeShapeTestGenerated.java
@@ -173,4 +173,10 @@ public class AndroidBytecodeShapeTestGenerated extends AbstractAndroidBytecodeSh
         String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewStub/");
         doTest(fileName);
     }
+
+    @TestMetadata("viewWithCache")
+    public void testViewWithCache() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("plugins/android-extensions/android-extensions-compiler/testData/codegen/bytecodeShape/viewWithCache/");
+        doTest(fileName);
+    }
 }