azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore fragment tag (it requires a different implementation)

Browse Source
This commit is contained in:
Yan Zhulanow
2015-04-02 21:34:02 +03:00
parent b4cfacbac7
commit df12331173
3 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidConst.kt
+2 -5
View File
@@ -38,7 +38,7 @@ public object AndroidConst {
val CLEAR_FUNCTION_NAME = "clearFindViewByIdCache" 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()) val ESCAPED_IDENTIFIERS = (JetTokens.KEYWORDS.getTypes() + JetTokens.SOFT_KEYWORDS.getTypes())
.map { it as? JetKeywordToken }.filterNotNull().map { it.getValue() }.toSet() .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) return (xmlType.isEmpty() || xmlType in AndroidConst.IGNORED_XML_WIDGET_TYPES)
} }
public fun getRealWidgetType(xmlType: String): String = when (xmlType) { public fun getRealWidgetType(xmlType: String): String = if (xmlType == "include") "View" else xmlType
"fragment", "include" -> "View"
else -> xmlType
}
fun escapeAndroidIdentifier(id: String): String { fun escapeAndroidIdentifier(id: String): String {
return if (id in AndroidConst.ESCAPED_IDENTIFIERS) "`$id`" else id return if (id in AndroidConst.ESCAPED_IDENTIFIERS) "`$id`" else id
plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_LAYOUT.kt
-6
View File
@@ -18,12 +18,6 @@ val android.app.Activity.includeTag: ft<View, View?>
val android.app.Fragment.includeTag: ft<View, View?> val android.app.Fragment.includeTag: ft<View, View?>
get() = getView().findViewById(0) get() = getView().findViewById(0)
val android.app.Activity.fragmentTag: ft<View, View?>
get() = findViewById(0)
val android.app.Fragment.fragmentTag: ft<View, View?>
get() = getView().findViewById(0)
val android.app.Activity.`fun`: ft<TextView, TextView?> val android.app.Activity.`fun`: ft<TextView, TextView?>
get() = findViewById(0) as? TextView get() = findViewById(0) as? TextView
plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/test_VIEW.kt
-3
View File
@@ -15,9 +15,6 @@ import kotlin.internal.flexible.ft
val android.view.View.includeTag: ft<View, View?> val android.view.View.includeTag: ft<View, View?>
get() = findViewById(0) get() = findViewById(0)
val android.view.View.fragmentTag: ft<View, View?>
get() = findViewById(0)
val android.view.View.`fun`: ft<TextView, TextView?> val android.view.View.`fun`: ft<TextView, TextView?>
get() = findViewById(0) as? TextView get() = findViewById(0) as? TextView