Ignore some XML tags

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidConst.kt

@@ -33,6 +33,8 @@ public object AndroidConst {
     val ID_USAGE_PREFIX = "@id/"
 
     val CLEAR_FUNCTION_NAME = "clearFindViewByIdCache"
+
+    val IGNORED_XML_WIDGET_TYPES = setOf("requestFocus", "merge", "tag", "check")
 }
 
 public fun nameToIdDeclaration(name: String): String = AndroidConst.ID_DECLARATION_PREFIX + name
@@ -49,7 +51,11 @@ public fun isResourceIdUsage(str: String?): Boolean = str?.startsWith(AndroidCon
 
 public fun isResourceDeclarationOrUsage(id: String?): Boolean = isResourceIdDeclaration(id) || isResourceIdUsage(id)
 
+public fun isWidgetTypeIgnored(xmlType: String): Boolean {
+    return (xmlType.isEmpty() || xmlType in AndroidConst.IGNORED_XML_WIDGET_TYPES)
+}
+
 public fun getRealWidgetType(xmlType: String): String = when (xmlType) {
-    "fragment", "include", "merge" -> "View"
+    "fragment", "include" -> "View"
     else -> xmlType
 }

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidXmlHandler.kt

@@ -31,6 +31,7 @@ class AndroidXmlHandler(private val elementCallback: (String, String) -> Unit) :
     }
 
     override fun startElement(uri: String, localName: String, qName: String, attributes: Attributes) {
+        if (isWidgetTypeIgnored(localName)) return
         val attributesMap = attributes.toMap()
         val idAttribute = attributesMap[AndroidConst.ID_ATTRIBUTE_NO_NAMESPACE]
         val widgetType = getRealWidgetType(attributesMap[AndroidConst.CLASS_ATTRIBUTE_NO_NAMESPACE] ?: localName)

plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/layout.kt

@@ -12,12 +12,6 @@ val Activity.includeTag: ft<View, View?>
 val Fragment.includeTag: ft<View, View?>
     get() = getView().findViewById(0) : View
 
-val Activity.mergeTag: ft<View, View?>
-    get() = findViewById(0) : View
-
-val Fragment.mergeTag: ft<View, View?>
-    get() = getView().findViewById(0) : View
-
 val Activity.fragmentTag: ft<View, View?>
     get() = findViewById(0) : View
 

plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/layout1.kt

@@ -9,9 +9,6 @@ import kotlin.internal.flexible.ft
 val View.includeTag: ft<View, View?>
     get() = findViewById(0) : View
 
-val View.mergeTag: ft<View, View?>
-    get() = findViewById(0) : View
-
 val View.fragmentTag: ft<View, View?>
     get() = findViewById(0) : View
 

plugins/android-compiler-plugin/testData/codegen/android/FakeAppwidgetPackage.kt

@@ -0,0 +1 @@
+package android.appwidget

plugins/android-compiler-plugin/testData/codegen/android/FakeInputMethodServicePackage.kt

@@ -0,0 +1 @@
+package android.inputmethodservice

plugins/android-compiler-plugin/testData/codegen/android/FakeOpenglPackage.kt

@@ -0,0 +1 @@
+package android.opengl

plugins/android-compiler-plugin/testData/codegen/android/FakeWebkitPackage.kt

@@ -0,0 +1 @@
+package android.webkit

plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidXmlVisitor.kt

@@ -35,14 +35,17 @@ class AndroidXmlVisitor(val elementCallback: (String, String, XmlAttribute) -> U
     }
 
     override fun visitXmlTag(tag: XmlTag?) {
+        val localName = tag?.getLocalName() ?: ""
+        if (isWidgetTypeIgnored(localName)) return
+
         val idAttribute = tag?.getAttribute(AndroidConst.ID_ATTRIBUTE)
         if (idAttribute != null) {
             val idAttributeValue = idAttribute.getValue()
             if (idAttributeValue != null) {
                 val classAttributeValue = tag?.getAttribute(AndroidConst.CLASS_ATTRIBUTE_NO_NAMESPACE)?.getValue()
-                val xmlType = classAttributeValue ?: tag?.getLocalName()
-                val widgetType = xmlType?.let { getRealWidgetType(it) }
-                if (widgetType != null && isResourceDeclarationOrUsage(idAttributeValue)) {
+                val xmlType = classAttributeValue ?: localName
+                val widgetType = xmlType.let { getRealWidgetType(it) }
+                if (isResourceDeclarationOrUsage(idAttributeValue)) {
                     val name = idToName(idAttributeValue)
                     if (name != null) elementCallback(name, widgetType, idAttribute)
                 }