From de59b79deb388f3b2c3a3a2847a6b5fac4ef140e Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Thu, 20 Aug 2015 15:14:10 +0300
Subject: [PATCH] Remove default imports for synthetic XML files

---
 .../kotlin/android/synthetic/AndroidConst.kt  |  2 +-
 .../synthetic/res/SyntheticFileGenerator.kt   | 26 ++-----------------
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/AndroidConst.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/AndroidConst.kt
index 81d7204478d..667f0ffc7a1 100644
--- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/AndroidConst.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/AndroidConst.kt
@@ -51,7 +51,7 @@ public object AndroidConst {
     val SUPPORT_FRAGMENT_FQNAME = "$SUPPORT_V4_PACKAGE.app.Fragment"
     val SUPPORT_FRAGMENT_ACTIVITY_FQNAME = "$SUPPORT_V4_PACKAGE.app.FragmentActivity"
 
-    val IGNORED_XML_WIDGET_TYPES = setOf("requestFocus", "merge", "tag", "check")
+    val IGNORED_XML_WIDGET_TYPES = setOf("requestFocus", "merge", "tag", "check", "blink")
 
     val ESCAPED_IDENTIFIERS = (JetTokens.KEYWORDS.getTypes() + JetTokens.SOFT_KEYWORDS.getTypes())
             .map { it as? JetKeywordToken }.filterNotNull().map { it.getValue() }.toSet()
diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/SyntheticFileGenerator.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/SyntheticFileGenerator.kt
index c57f629eea4..90131f1cd56 100644
--- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/SyntheticFileGenerator.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/SyntheticFileGenerator.kt
@@ -69,12 +69,7 @@ public abstract class SyntheticFileGenerator(protected val project: Project) {
         }
         val clearCacheFile = renderSyntheticFile
 
-        return listOf(
-               clearCacheFile,
-               FLEXIBLE_TYPE_FILE,
-               FAKE_SUPPORT_V4_APP_FILE,
-               FAKE_SUPPORT_V4_VIEW_FILE,
-               FAKE_SUPPORT_V4_WIDGET_FILE)
+        return listOf(clearCacheFile, FLEXIBLE_TYPE_FILE)
     }
 
     protected abstract fun extractLayoutResources(files: List<PsiFile>, scope: GlobalSearchScope): List<AndroidResource>
@@ -200,27 +195,10 @@ public abstract class SyntheticFileGenerator(protected val project: Project) {
         private val EXPLICIT_FLEXIBLE_PACKAGE = Flexibility.FLEXIBLE_TYPE_CLASSIFIER.packageFqName.asString()
         private val EXPLICIT_FLEXIBLE_CLASS_NAME = Flexibility.FLEXIBLE_TYPE_CLASSIFIER.relativeClassName.asString()
 
-        private val ANDROID_IMPORTS = listOf(
-                "android.app.*",
-                "android.view.*",
-                "android.widget.*",
-                "android.webkit.*",
-                "android.inputmethodservice.*",
-                "android.opengl.*",
-                "android.appwidget.*",
-                "android.support.v4.app.*",
-                "android.support.v4.view.*",
-                "android.support.v4.widget.*",
-                Flexibility.FLEXIBLE_TYPE_CLASSIFIER.asSingleFqName().asString())
+        private val ANDROID_IMPORTS = listOf(Flexibility.FLEXIBLE_TYPE_CLASSIFIER.asSingleFqName().asString())
 
         private val FLEXIBLE_TYPE_FILE =
                 AndroidSyntheticFile("ft", "package $EXPLICIT_FLEXIBLE_PACKAGE\n\nclass $EXPLICIT_FLEXIBLE_CLASS_NAME<L, U>")
-
-        private val FAKE_SUPPORT_V4_WIDGET_FILE = AndroidSyntheticFile("supportv4_widget", "package android.support.v4.widget")
-
-        private val FAKE_SUPPORT_V4_VIEW_FILE = AndroidSyntheticFile("supportv4_view", "package android.support.v4.view")
-
-        private val FAKE_SUPPORT_V4_APP_FILE = AndroidSyntheticFile("supportv4_app", "package android.support.v4.app")
     }
 
 }
\ No newline at end of file