diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidConst.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidConst.kt index d0357ac9cce..ab36673021d 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidConst.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidConst.kt @@ -38,7 +38,7 @@ public object AndroidConst { val CLEAR_FUNCTION_NAME = "clearFindViewByIdCache" - val IGNORED_XML_WIDGET_TYPES = setOf("requestFocus", "merge", "tag", "check") + val IGNORED_XML_WIDGET_TYPES = setOf("requestFocus", "merge", "tag", "check", "fragment") val ESCAPED_IDENTIFIERS = (JetTokens.KEYWORDS.getTypes() + JetTokens.SOFT_KEYWORDS.getTypes()) .map { it as? JetKeywordToken }.filterNotNull().map { it.getValue() }.toSet() @@ -64,10 +64,7 @@ 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" -> "View" - else -> xmlType -} +public fun getRealWidgetType(xmlType: String): String = if (xmlType == "include") "View" else xmlType fun escapeAndroidIdentifier(id: String): String { return if (id in AndroidConst.ESCAPED_IDENTIFIERS) "`$id`" else id diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_LAYOUT.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_LAYOUT.kt index e77afc2871d..2c3cf719911 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_LAYOUT.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_LAYOUT.kt @@ -18,12 +18,6 @@ val android.app.Activity.includeTag: ft val android.app.Fragment.includeTag: ft get() = getView().findViewById(0) -val android.app.Activity.fragmentTag: ft - get() = findViewById(0) - -val android.app.Fragment.fragmentTag: ft - get() = getView().findViewById(0) - val android.app.Activity.`fun`: ft get() = findViewById(0) as? TextView diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_VIEW.kt index a89210ab802..ad39c2729c5 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_VIEW.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_VIEW.kt @@ -15,9 +15,6 @@ import kotlin.internal.flexible.ft val android.view.View.includeTag: ft get() = findViewById(0) -val android.view.View.fragmentTag: ft - get() = findViewById(0) - val android.view.View.`fun`: ft get() = findViewById(0) as? TextView