diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/CliSyntheticFileGenerator.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/CliSyntheticFileGenerator.kt index 202228a9a35..fb2ec408607 100644 --- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/CliSyntheticFileGenerator.kt +++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/android/synthetic/res/CliSyntheticFileGenerator.kt @@ -25,6 +25,7 @@ import com.intellij.psi.impl.PsiElementFinderImpl import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.android.synthetic.AndroidXmlHandler import org.jetbrains.kotlin.android.synthetic.parseAndroidResource +import org.jetbrains.kotlin.load.java.JavaClassFinder import org.jetbrains.kotlin.psi.JetFile public open class CliSyntheticFileGenerator( 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 92c3b609801..a1f07661b80 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 @@ -45,7 +45,7 @@ public abstract class SyntheticFileGenerator(protected val project: Project) { public abstract fun getSyntheticFiles(): List - protected fun generateSyntheticFiles(generateCommonFiles: Boolean, supportV4: Boolean): List { + protected open fun generateSyntheticFiles(generateCommonFiles: Boolean, supportV4: Boolean): List { val commonFiles = if (generateCommonFiles) generateCommonFiles(supportV4) else listOf() return layoutXmlFileManager.getLayoutXmlFiles().flatMap { entry -> diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/AndroidManifest.xml new file mode 100644 index 00000000000..431126adee4 --- /dev/null +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/AndroidManifest.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/AndroidManifest.xml deleted file mode 100644 index 580c474f5de..00000000000 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/AndroidManifest.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/get_LAYOUT.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/get_LAYOUT.kt index 38939afe031..d69ac8cd111 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/get_LAYOUT.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/get_LAYOUT.kt @@ -1,38 +1,28 @@ package kotlinx.android.synthetic.`get` -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.app.Activity.item_detail_container: ft - get() = findViewById(0) as? FrameLayout +val android.app.Activity.item_detail_container: ft + get() = findViewById(0) as? android.widget.FrameLayout -val android.app.Fragment.item_detail_container: ft - get() = getView().findViewById(0) as? FrameLayout +val android.app.Fragment.item_detail_container: ft + get() = getView().findViewById(0) as? android.widget.FrameLayout -val android.app.Activity.textView1: ft - get() = findViewById(0) as? TextView +val android.app.Activity.textView1: ft + get() = findViewById(0) as? android.widget.TextView -val android.app.Fragment.textView1: ft - get() = getView().findViewById(0) as? TextView +val android.app.Fragment.textView1: ft + get() = getView().findViewById(0) as? android.widget.TextView -val android.app.Activity.password: ft - get() = findViewById(0) as? EditText +val android.app.Activity.password: ft + get() = findViewById(0) as? android.widget.EditText -val android.app.Fragment.password: ft - get() = getView().findViewById(0) as? EditText +val android.app.Fragment.password: ft + get() = getView().findViewById(0) as? android.widget.EditText -val android.app.Activity.login: ft - get() = findViewById(0) as? Button +val android.app.Activity.login: ft + get() = findViewById(0) as? android.widget.Button -val android.app.Fragment.login: ft - get() = getView().findViewById(0) as? Button +val android.app.Fragment.login: ft + get() = getView().findViewById(0) as? android.widget.Button diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/get_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/get_VIEW.kt index 795ffc2bb26..7bf143b3923 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/get_VIEW.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/get_VIEW.kt @@ -1,26 +1,16 @@ package kotlinx.android.synthetic.`get`.view -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.view.View.item_detail_container: ft - get() = findViewById(0) as? FrameLayout +val android.view.View.item_detail_container: ft + get() = findViewById(0) as? android.widget.FrameLayout -val android.view.View.textView1: ft - get() = findViewById(0) as? TextView +val android.view.View.textView1: ft + get() = findViewById(0) as? android.widget.TextView -val android.view.View.password: ft - get() = findViewById(0) as? EditText +val android.view.View.password: ft + get() = findViewById(0) as? android.widget.EditText -val android.view.View.login: ft - get() = findViewById(0) as? Button +val android.view.View.login: ft + get() = findViewById(0) as? android.widget.Button diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/AndroidManifest.xml deleted file mode 100644 index 580c474f5de..00000000000 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/AndroidManifest.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/res/layout/test.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/res/layout/test.xml index a0ef9f3a1ed..173921b2994 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/res/layout/test.xml +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/res/layout/test.xml @@ -6,10 +6,9 @@ tools:ignore="MergeRootFrame" > + android:layout_height="wrap_content"/> diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/test_LAYOUT.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/test_LAYOUT.kt index 3a772f244f2..f20b57107f5 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/test_LAYOUT.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/test_LAYOUT.kt @@ -1,20 +1,10 @@ package kotlinx.android.synthetic.test -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.app.Activity.MyButton: ft - get() = findViewById(0) as? org.my.cool.Button +val android.app.Activity.MyKeyboardView: ft + get() = findViewById(0) as? android.inputmethodservice.KeyboardView -val android.app.Fragment.MyButton: ft - get() = getView().findViewById(0) as? org.my.cool.Button +val android.app.Fragment.MyKeyboardView: ft + get() = getView().findViewById(0) as? android.inputmethodservice.KeyboardView diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/test_VIEW.kt index 3cd3b9a794f..13f26ddc97c 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/test_VIEW.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/test_VIEW.kt @@ -1,17 +1,7 @@ package kotlinx.android.synthetic.test.view -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.view.View.MyButton: ft - get() = findViewById(0) as? org.my.cool.Button +val android.view.View.MyKeyboardView: ft + get() = findViewById(0) as? android.inputmethodservice.KeyboardView diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/AndroidManifest.xml deleted file mode 100644 index 580c474f5de..00000000000 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/AndroidManifest.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/res/layout/test.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/res/layout/test.xml index 2ec85364e74..3516b551b9b 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/res/layout/test.xml +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/res/layout/test.xml @@ -5,10 +5,9 @@ tools:context=".ItemDetailActivity" tools:ignore="MergeRootFrame" > - + android:layout_height="wrap_content"/> diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/test_LAYOUT.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/test_LAYOUT.kt index 3a772f244f2..f20b57107f5 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/test_LAYOUT.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/test_LAYOUT.kt @@ -1,20 +1,10 @@ package kotlinx.android.synthetic.test -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.app.Activity.MyButton: ft - get() = findViewById(0) as? org.my.cool.Button +val android.app.Activity.MyKeyboardView: ft + get() = findViewById(0) as? android.inputmethodservice.KeyboardView -val android.app.Fragment.MyButton: ft - get() = getView().findViewById(0) as? org.my.cool.Button +val android.app.Fragment.MyKeyboardView: ft + get() = getView().findViewById(0) as? android.inputmethodservice.KeyboardView diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/test_VIEW.kt index 3cd3b9a794f..13f26ddc97c 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/test_VIEW.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/test_VIEW.kt @@ -1,17 +1,7 @@ package kotlinx.android.synthetic.test.view -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.view.View.MyButton: ft - get() = findViewById(0) as? org.my.cool.Button +val android.view.View.MyKeyboardView: ft + get() = findViewById(0) as? android.inputmethodservice.KeyboardView diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/AndroidManifest.xml deleted file mode 100644 index 580c474f5de..00000000000 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/AndroidManifest.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/test_LAYOUT.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/test_LAYOUT.kt index b8e93fa4a47..b48ab9a1ac6 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/test_LAYOUT.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/test_LAYOUT.kt @@ -1,20 +1,10 @@ package kotlinx.android.synthetic.test -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.app.Activity.button: ft - get() = findViewById(0) +val android.app.Activity.button: ft + get() = findViewById(0) as? android.view.View -val android.app.Fragment.button: ft - get() = getView().findViewById(0) +val android.app.Fragment.button: ft + get() = getView().findViewById(0) as? android.view.View diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/test_VIEW.kt index 46fdede50ea..ef8b92f5c12 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/test_VIEW.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/test_VIEW.kt @@ -1,17 +1,7 @@ package kotlinx.android.synthetic.test.view -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.view.View.button: ft - get() = findViewById(0) +val android.view.View.button: ft + get() = findViewById(0) as? android.view.View diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/AndroidManifest.xml deleted file mode 100644 index 580c474f5de..00000000000 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/AndroidManifest.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test1_LAYOUT.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test1_LAYOUT.kt index cb58bd1bc3a..b5b154cde40 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test1_LAYOUT.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test1_LAYOUT.kt @@ -1,38 +1,28 @@ package kotlinx.android.synthetic.test1 -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.app.Activity.frameLayout: ft - get() = findViewById(0) as? FrameLayout +val android.app.Activity.frameLayout: ft + get() = findViewById(0) as? android.widget.FrameLayout -val android.app.Fragment.frameLayout: ft - get() = getView().findViewById(0) as? FrameLayout +val android.app.Fragment.frameLayout: ft + get() = getView().findViewById(0) as? android.widget.FrameLayout -val android.app.Activity.passwordField: ft - get() = findViewById(0) as? TextView +val android.app.Activity.passwordField: ft + get() = findViewById(0) as? android.widget.TextView -val android.app.Fragment.passwordField: ft - get() = getView().findViewById(0) as? TextView +val android.app.Fragment.passwordField: ft + get() = getView().findViewById(0) as? android.widget.TextView -val android.app.Activity.passwordCaption: ft - get() = findViewById(0) as? EditText +val android.app.Activity.passwordCaption: ft + get() = findViewById(0) as? android.widget.EditText -val android.app.Fragment.passwordCaption: ft - get() = getView().findViewById(0) as? EditText +val android.app.Fragment.passwordCaption: ft + get() = getView().findViewById(0) as? android.widget.EditText -val android.app.Activity.loginButton: ft - get() = findViewById(0) as? Button +val android.app.Activity.loginButton: ft + get() = findViewById(0) as? android.widget.Button -val android.app.Fragment.loginButton: ft - get() = getView().findViewById(0) as? Button +val android.app.Fragment.loginButton: ft + get() = getView().findViewById(0) as? android.widget.Button diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test1_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test1_VIEW.kt index 8bbf0f1bd9a..9df93aececa 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test1_VIEW.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test1_VIEW.kt @@ -1,26 +1,16 @@ package kotlinx.android.synthetic.test1.view -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.view.View.frameLayout: ft - get() = findViewById(0) as? FrameLayout +val android.view.View.frameLayout: ft + get() = findViewById(0) as? android.widget.FrameLayout -val android.view.View.passwordField: ft - get() = findViewById(0) as? TextView +val android.view.View.passwordField: ft + get() = findViewById(0) as? android.widget.TextView -val android.view.View.passwordCaption: ft - get() = findViewById(0) as? EditText +val android.view.View.passwordCaption: ft + get() = findViewById(0) as? android.widget.EditText -val android.view.View.loginButton: ft - get() = findViewById(0) as? Button +val android.view.View.loginButton: ft + get() = findViewById(0) as? android.widget.Button diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test_LAYOUT.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test_LAYOUT.kt index 61ac05d05e8..7039f391193 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test_LAYOUT.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test_LAYOUT.kt @@ -1,38 +1,28 @@ package kotlinx.android.synthetic.test -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.app.Activity.item_detail_container: ft - get() = findViewById(0) as? FrameLayout +val android.app.Activity.item_detail_container: ft + get() = findViewById(0) as? android.widget.FrameLayout -val android.app.Fragment.item_detail_container: ft - get() = getView().findViewById(0) as? FrameLayout +val android.app.Fragment.item_detail_container: ft + get() = getView().findViewById(0) as? android.widget.FrameLayout -val android.app.Activity.textView1: ft - get() = findViewById(0) as? TextView +val android.app.Activity.textView1: ft + get() = findViewById(0) as? android.widget.TextView -val android.app.Fragment.textView1: ft - get() = getView().findViewById(0) as? TextView +val android.app.Fragment.textView1: ft + get() = getView().findViewById(0) as? android.widget.TextView -val android.app.Activity.password: ft - get() = findViewById(0) as? EditText +val android.app.Activity.password: ft + get() = findViewById(0) as? android.widget.EditText -val android.app.Fragment.password: ft - get() = getView().findViewById(0) as? EditText +val android.app.Fragment.password: ft + get() = getView().findViewById(0) as? android.widget.EditText -val android.app.Activity.login: ft - get() = findViewById(0) as? Button +val android.app.Activity.login: ft + get() = findViewById(0) as? android.widget.Button -val android.app.Fragment.login: ft - get() = getView().findViewById(0) as? Button +val android.app.Fragment.login: ft + get() = getView().findViewById(0) as? android.widget.Button diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test_VIEW.kt index 71398780f15..ef8008030e2 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test_VIEW.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/test_VIEW.kt @@ -1,26 +1,16 @@ package kotlinx.android.synthetic.test.view -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.view.View.item_detail_container: ft - get() = findViewById(0) as? FrameLayout +val android.view.View.item_detail_container: ft + get() = findViewById(0) as? android.widget.FrameLayout -val android.view.View.textView1: ft - get() = findViewById(0) as? TextView +val android.view.View.textView1: ft + get() = findViewById(0) as? android.widget.TextView -val android.view.View.password: ft - get() = findViewById(0) as? EditText +val android.view.View.password: ft + get() = findViewById(0) as? android.widget.EditText -val android.view.View.login: ft - get() = findViewById(0) as? Button +val android.view.View.login: ft + get() = findViewById(0) as? android.widget.Button diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/AndroidManifest.xml deleted file mode 100644 index 580c474f5de..00000000000 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/AndroidManifest.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/test_LAYOUT.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/test_LAYOUT.kt index fa21af4da2c..541cfd2d4ca 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/test_LAYOUT.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/test_LAYOUT.kt @@ -1,14 +1,4 @@ package kotlinx.android.synthetic.test -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/test_VIEW.kt index 5d6feaa6b35..91ed188df49 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/test_VIEW.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/noIds/test_VIEW.kt @@ -1,14 +1,4 @@ package kotlinx.android.synthetic.test.view -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/AndroidManifest.xml deleted file mode 100644 index 580c474f5de..00000000000 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/AndroidManifest.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/test_LAYOUT.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/test_LAYOUT.kt index 288d8570617..a02756962bb 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/test_LAYOUT.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/test_LAYOUT.kt @@ -1,26 +1,16 @@ package kotlinx.android.synthetic.test -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.app.Activity.textView1: ft - get() = findViewById(0) +val android.app.Activity.textView1: ft + get() = findViewById(0) as? android.view.View -val android.app.Fragment.textView1: ft - get() = getView().findViewById(0) +val android.app.Fragment.textView1: ft + get() = getView().findViewById(0) as? android.view.View -val android.app.Activity.textView2: ft - get() = findViewById(0) as? TextView +val android.app.Activity.textView2: ft + get() = findViewById(0) as? android.widget.TextView -val android.app.Fragment.textView2: ft - get() = getView().findViewById(0) as? TextView +val android.app.Fragment.textView2: ft + get() = getView().findViewById(0) as? android.widget.TextView diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/test_VIEW.kt index 4625d7aab38..dfb42132f71 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/test_VIEW.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/test_VIEW.kt @@ -1,20 +1,10 @@ package kotlinx.android.synthetic.test.view -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.view.View.textView1: ft - get() = findViewById(0) +val android.view.View.textView1: ft + get() = findViewById(0) as? android.view.View -val android.view.View.textView2: ft - get() = findViewById(0) as? TextView +val android.view.View.textView2: ft + get() = findViewById(0) as? android.widget.TextView diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/AndroidManifest.xml deleted file mode 100644 index 580c474f5de..00000000000 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/AndroidManifest.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_LAYOUT.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_LAYOUT.kt index 29a9b39f74e..3e3ae0f8488 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_LAYOUT.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_LAYOUT.kt @@ -1,32 +1,22 @@ package kotlinx.android.synthetic.test -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.app.Activity.button: ft - get() = findViewById(0) +val android.app.Activity.button: ft + get() = findViewById(0) as? android.view.View -val android.app.Fragment.button: ft - get() = getView().findViewById(0) +val android.app.Fragment.button: ft + get() = getView().findViewById(0) as? android.view.View -val android.app.Activity.button2: ft - get() = findViewById(0) as? Button +val android.app.Activity.button2: ft + get() = findViewById(0) as? android.widget.Button -val android.app.Fragment.button2: ft - get() = getView().findViewById(0) as? Button +val android.app.Fragment.button2: ft + get() = getView().findViewById(0) as? android.widget.Button -val android.app.Activity.button3: ft - get() = findViewById(0) as? Button +val android.app.Activity.button3: ft + get() = findViewById(0) as? android.widget.Button -val android.app.Fragment.button3: ft - get() = getView().findViewById(0) as? Button +val android.app.Fragment.button3: ft + get() = getView().findViewById(0) as? android.widget.Button diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_VIEW.kt index ef488b44291..06a090da2c6 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_VIEW.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/test_VIEW.kt @@ -1,23 +1,13 @@ package kotlinx.android.synthetic.test.view -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.view.View.button: ft - get() = findViewById(0) +val android.view.View.button: ft + get() = findViewById(0) as? android.view.View -val android.view.View.button2: ft - get() = findViewById(0) as? Button +val android.view.View.button2: ft + get() = findViewById(0) as? android.widget.Button -val android.view.View.button3: ft - get() = findViewById(0) as? Button +val android.view.View.button3: ft + get() = findViewById(0) as? android.widget.Button diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/AndroidManifest.xml deleted file mode 100644 index 580c474f5de..00000000000 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/AndroidManifest.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/test_LAYOUT.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/test_LAYOUT.kt index 61ac05d05e8..7039f391193 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/test_LAYOUT.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/test_LAYOUT.kt @@ -1,38 +1,28 @@ package kotlinx.android.synthetic.test -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.app.Activity.item_detail_container: ft - get() = findViewById(0) as? FrameLayout +val android.app.Activity.item_detail_container: ft + get() = findViewById(0) as? android.widget.FrameLayout -val android.app.Fragment.item_detail_container: ft - get() = getView().findViewById(0) as? FrameLayout +val android.app.Fragment.item_detail_container: ft + get() = getView().findViewById(0) as? android.widget.FrameLayout -val android.app.Activity.textView1: ft - get() = findViewById(0) as? TextView +val android.app.Activity.textView1: ft + get() = findViewById(0) as? android.widget.TextView -val android.app.Fragment.textView1: ft - get() = getView().findViewById(0) as? TextView +val android.app.Fragment.textView1: ft + get() = getView().findViewById(0) as? android.widget.TextView -val android.app.Activity.password: ft - get() = findViewById(0) as? EditText +val android.app.Activity.password: ft + get() = findViewById(0) as? android.widget.EditText -val android.app.Fragment.password: ft - get() = getView().findViewById(0) as? EditText +val android.app.Fragment.password: ft + get() = getView().findViewById(0) as? android.widget.EditText -val android.app.Activity.login: ft - get() = findViewById(0) as? Button +val android.app.Activity.login: ft + get() = findViewById(0) as? android.widget.Button -val android.app.Fragment.login: ft - get() = getView().findViewById(0) as? Button +val android.app.Fragment.login: ft + get() = getView().findViewById(0) as? android.widget.Button diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/test_VIEW.kt index 71398780f15..ef8008030e2 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/test_VIEW.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/test_VIEW.kt @@ -1,26 +1,16 @@ package kotlinx.android.synthetic.test.view -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.view.View.item_detail_container: ft - get() = findViewById(0) as? FrameLayout +val android.view.View.item_detail_container: ft + get() = findViewById(0) as? android.widget.FrameLayout -val android.view.View.textView1: ft - get() = findViewById(0) as? TextView +val android.view.View.textView1: ft + get() = findViewById(0) as? android.widget.TextView -val android.view.View.password: ft - get() = findViewById(0) as? EditText +val android.view.View.password: ft + get() = findViewById(0) as? android.widget.EditText -val android.view.View.login: ft - get() = findViewById(0) as? Button +val android.view.View.login: ft + get() = findViewById(0) as? android.widget.Button diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/AndroidManifest.xml deleted file mode 100644 index 580c474f5de..00000000000 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/AndroidManifest.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file 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 384bf7848fe..575699045d2 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 @@ -1,22 +1,12 @@ package kotlinx.android.synthetic.test -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.app.Activity.includeTag: ft - get() = findViewById(0) +val android.app.Activity.includeTag: ft + get() = findViewById(0) as? android.view.View -val android.app.Fragment.includeTag: ft - get() = getView().findViewById(0) +val android.app.Fragment.includeTag: ft + get() = getView().findViewById(0) as? android.view.View val android.app.Activity.fragmentTag: ft get() = getFragmentManager().findFragmentById(0) as? android.app.Fragment @@ -24,15 +14,15 @@ val android.app.Activity.fragmentTag: ft get() = getFragmentManager().findFragmentById(0) as? android.app.Fragment -val android.app.Activity.`fun`: ft - get() = findViewById(0) as? TextView +val android.app.Activity.`fun`: ft + get() = findViewById(0) as? android.widget.TextView -val android.app.Fragment.`fun`: ft - get() = getView().findViewById(0) as? TextView +val android.app.Fragment.`fun`: ft + get() = getView().findViewById(0) as? android.widget.TextView -val android.app.Activity.`set`: ft - get() = findViewById(0) as? Button +val android.app.Activity.`set`: ft + get() = findViewById(0) as? android.widget.Button -val android.app.Fragment.`set`: ft - get() = getView().findViewById(0) as? Button +val android.app.Fragment.`set`: ft + get() = getView().findViewById(0) as? android.widget.Button 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 ad39c2729c5..cc6fdab5062 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 @@ -1,23 +1,13 @@ package kotlinx.android.synthetic.test.view -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.view.View.includeTag: ft - get() = findViewById(0) +val android.view.View.includeTag: ft + get() = findViewById(0) as? android.view.View -val android.view.View.`fun`: ft - get() = findViewById(0) as? TextView +val android.view.View.`fun`: ft + get() = findViewById(0) as? android.widget.TextView -val android.view.View.`set`: ft - get() = findViewById(0) as? Button +val android.view.View.`set`: ft + get() = findViewById(0) as? android.widget.Button diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/AndroidManifest.xml deleted file mode 100644 index 580c474f5de..00000000000 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/AndroidManifest.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/test_LAYOUT.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/test_LAYOUT.kt index fef31124451..de9bdc93bce 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/test_LAYOUT.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/test_LAYOUT.kt @@ -1,50 +1,40 @@ package kotlinx.android.synthetic.test -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.app.Activity.item_detail_container: ft - get() = findViewById(0) as? FrameLayout +val android.app.Activity.item_detail_container: ft + get() = findViewById(0) as? android.widget.FrameLayout -val android.app.Fragment.item_detail_container: ft - get() = getView().findViewById(0) as? FrameLayout +val android.app.Fragment.item_detail_container: ft + get() = getView().findViewById(0) as? android.widget.FrameLayout -val android.support.v4.app.Fragment.item_detail_container: ft - get() = getView().findViewById(0) as? FrameLayout +val android.support.v4.app.Fragment.item_detail_container: ft + get() = getView().findViewById(0) as? android.widget.FrameLayout -val android.app.Activity.textView1: ft - get() = findViewById(0) as? TextView +val android.app.Activity.textView1: ft + get() = findViewById(0) as? android.widget.TextView -val android.app.Fragment.textView1: ft - get() = getView().findViewById(0) as? TextView +val android.app.Fragment.textView1: ft + get() = getView().findViewById(0) as? android.widget.TextView -val android.support.v4.app.Fragment.textView1: ft - get() = getView().findViewById(0) as? TextView +val android.support.v4.app.Fragment.textView1: ft + get() = getView().findViewById(0) as? android.widget.TextView -val android.app.Activity.password: ft - get() = findViewById(0) as? EditText +val android.app.Activity.password: ft + get() = findViewById(0) as? android.widget.EditText -val android.app.Fragment.password: ft - get() = getView().findViewById(0) as? EditText +val android.app.Fragment.password: ft + get() = getView().findViewById(0) as? android.widget.EditText -val android.support.v4.app.Fragment.password: ft - get() = getView().findViewById(0) as? EditText +val android.support.v4.app.Fragment.password: ft + get() = getView().findViewById(0) as? android.widget.EditText -val android.app.Activity.login: ft - get() = findViewById(0) as? Button +val android.app.Activity.login: ft + get() = findViewById(0) as? android.widget.Button -val android.app.Fragment.login: ft - get() = getView().findViewById(0) as? Button +val android.app.Fragment.login: ft + get() = getView().findViewById(0) as? android.widget.Button -val android.support.v4.app.Fragment.login: ft - get() = getView().findViewById(0) as? Button +val android.support.v4.app.Fragment.login: ft + get() = getView().findViewById(0) as? android.widget.Button diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/test_VIEW.kt index 71398780f15..ef8008030e2 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/test_VIEW.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/test_VIEW.kt @@ -1,26 +1,16 @@ package kotlinx.android.synthetic.test.view -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.view.View.item_detail_container: ft - get() = findViewById(0) as? FrameLayout +val android.view.View.item_detail_container: ft + get() = findViewById(0) as? android.widget.FrameLayout -val android.view.View.textView1: ft - get() = findViewById(0) as? TextView +val android.view.View.textView1: ft + get() = findViewById(0) as? android.widget.TextView -val android.view.View.password: ft - get() = findViewById(0) as? EditText +val android.view.View.password: ft + get() = findViewById(0) as? android.widget.EditText -val android.view.View.login: ft - get() = findViewById(0) as? Button +val android.view.View.login: ft + get() = findViewById(0) as? android.widget.Button diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/AndroidManifest.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/AndroidManifest.xml deleted file mode 100644 index 580c474f5de..00000000000 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/AndroidManifest.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/test_LAYOUT.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/test_LAYOUT.kt index b27218af4c4..5d03df61d6c 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/test_LAYOUT.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/test_LAYOUT.kt @@ -1,25 +1,15 @@ package kotlinx.android.synthetic.test -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.app.Activity.includeTag: ft - get() = findViewById(0) +val android.app.Activity.includeTag: ft + get() = findViewById(0) as? android.view.View -val android.app.Fragment.includeTag: ft - get() = getView().findViewById(0) +val android.app.Fragment.includeTag: ft + get() = getView().findViewById(0) as? android.view.View -val android.support.v4.app.Fragment.includeTag: ft - get() = getView().findViewById(0) +val android.support.v4.app.Fragment.includeTag: ft + get() = getView().findViewById(0) as? android.view.View val android.app.Activity.fragmentTag: ft get() = getFragmentManager().findFragmentById(0) as? android.app.Fragment @@ -33,21 +23,21 @@ val android.support.v4.app.Fragment.fragmentTag: ft get() = getSupportFragmentManager().findFragmentById(0) as? android.support.v4.app.Fragment -val android.app.Activity.`fun`: ft - get() = findViewById(0) as? TextView +val android.app.Activity.`fun`: ft + get() = findViewById(0) as? android.widget.TextView -val android.app.Fragment.`fun`: ft - get() = getView().findViewById(0) as? TextView +val android.app.Fragment.`fun`: ft + get() = getView().findViewById(0) as? android.widget.TextView -val android.support.v4.app.Fragment.`fun`: ft - get() = getView().findViewById(0) as? TextView +val android.support.v4.app.Fragment.`fun`: ft + get() = getView().findViewById(0) as? android.widget.TextView -val android.app.Activity.`set`: ft - get() = findViewById(0) as? Button +val android.app.Activity.`set`: ft + get() = findViewById(0) as? android.widget.Button -val android.app.Fragment.`set`: ft - get() = getView().findViewById(0) as? Button +val android.app.Fragment.`set`: ft + get() = getView().findViewById(0) as? android.widget.Button -val android.support.v4.app.Fragment.`set`: ft - get() = getView().findViewById(0) as? Button +val android.support.v4.app.Fragment.`set`: ft + get() = getView().findViewById(0) as? android.widget.Button diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/test_VIEW.kt index ad39c2729c5..cc6fdab5062 100644 --- a/plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/test_VIEW.kt +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/test_VIEW.kt @@ -1,23 +1,13 @@ package kotlinx.android.synthetic.test.view -import android.app.* -import android.view.* -import android.widget.* -import android.webkit.* -import android.inputmethodservice.* -import android.opengl.* -import android.appwidget.* -import android.support.v4.app.* -import android.support.v4.view.* -import android.support.v4.widget.* import kotlin.internal.flexible.ft -val android.view.View.includeTag: ft - get() = findViewById(0) +val android.view.View.includeTag: ft + get() = findViewById(0) as? android.view.View -val android.view.View.`fun`: ft - get() = findViewById(0) as? TextView +val android.view.View.`fun`: ft + get() = findViewById(0) as? android.widget.TextView -val android.view.View.`set`: ft - get() = findViewById(0) as? Button +val android.view.View.`set`: ft + get() = findViewById(0) as? android.widget.Button diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/res/layout/test.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/res/layout/test.xml new file mode 100644 index 00000000000..3fb895c7354 --- /dev/null +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/res/layout/test.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/test_LAYOUT.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/test_LAYOUT.kt new file mode 100644 index 00000000000..0bed27102ce --- /dev/null +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/test_LAYOUT.kt @@ -0,0 +1,12 @@ +package kotlinx.android.synthetic.test + +import kotlin.internal.flexible.ft + +@kotlin.internal.flexible.InvalidWidgetType("a.b.c") +val android.app.Activity.MyView: ft + get() = findViewById(0) as? android.view.View + +@kotlin.internal.flexible.InvalidWidgetType("a.b.c") +val android.app.Fragment.MyView: ft + get() = getView().findViewById(0) as? android.view.View + diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/test_VIEW.kt new file mode 100644 index 00000000000..c28df07767f --- /dev/null +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/test_VIEW.kt @@ -0,0 +1,8 @@ +package kotlinx.android.synthetic.test.view + +import kotlin.internal.flexible.ft + +@kotlin.internal.flexible.InvalidWidgetType("a.b.c") +val android.view.View.MyView: ft + get() = findViewById(0) as? android.view.View + diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/res/layout/test.xml b/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/res/layout/test.xml new file mode 100644 index 00000000000..b3812d64d45 --- /dev/null +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/res/layout/test.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/test_LAYOUT.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/test_LAYOUT.kt new file mode 100644 index 00000000000..42654c7683d --- /dev/null +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/test_LAYOUT.kt @@ -0,0 +1,12 @@ +package kotlinx.android.synthetic.test + +import kotlin.internal.flexible.ft + +@kotlin.internal.flexible.InvalidWidgetType("KeyboardView") +val android.app.Activity.MyKeyboardView: ft + get() = findViewById(0) as? android.view.View + +@kotlin.internal.flexible.InvalidWidgetType("KeyboardView") +val android.app.Fragment.MyKeyboardView: ft + get() = getView().findViewById(0) as? android.view.View + diff --git a/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/test_VIEW.kt b/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/test_VIEW.kt new file mode 100644 index 00000000000..382625c2029 --- /dev/null +++ b/plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/test_VIEW.kt @@ -0,0 +1,8 @@ +package kotlinx.android.synthetic.test.view + +import kotlin.internal.flexible.ft + +@kotlin.internal.flexible.InvalidWidgetType("KeyboardView") +val android.view.View.MyKeyboardView: ft + get() = findViewById(0) as? android.view.View + diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt index 52a3a80b20c..fb2383184a3 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.lang.resolve.android.test -import com.intellij.openapi.module.ModuleManager import com.intellij.testFramework.UsefulTestCase import org.jetbrains.kotlin.android.synthetic.res.SyntheticFileGenerator import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles @@ -38,7 +37,7 @@ public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() { val layoutPaths = getResPaths(path) val supportV4 = testDirectory.name.startsWith("support") val parser = CliSyntheticFileGeneratorForConversionTest( - jetCoreEnvironment.project, path + "AndroidManifest.xml", layoutPaths, supportV4) + jetCoreEnvironment.project, File(testDirectory.parent, "AndroidManifest.xml").path, layoutPaths, supportV4) val actual = parser.gen().toMap { it.name } @@ -65,7 +64,7 @@ public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() { } private fun getEnvironment(): KotlinCoreEnvironment { - val configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK) + val configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.ANDROID_API) return KotlinCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) } } \ No newline at end of file diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java index 1afd481b24d..1c456fb25a6 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java @@ -108,6 +108,18 @@ public class AndroidXml2KConversionTestGenerated extends AbstractAndroidXml2KCon String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/"); doTest(fileName); } + + @TestMetadata("unresolvedFqName") + public void testUnresolvedFqName() throws Exception { + String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/"); + doTest(fileName); + } + + @TestMetadata("unresolvedWidget") + public void testUnresolvedWidget() throws Exception { + String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/"); + doTest(fileName); + } } @TestMetadata("plugins/android-compiler-plugin/testData/android/converter/exceptions") diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt index 12c353aad1b..d0ef74957a4 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt @@ -21,6 +21,7 @@ import com.intellij.testFramework.UsefulTestCase import org.jetbrains.kotlin.analyzer.ModuleInfo import org.jetbrains.kotlin.android.synthetic.AndroidConfigurationKeys import org.jetbrains.kotlin.android.synthetic.codegen.AndroidExpressionCodegenExtension +import org.jetbrains.kotlin.android.synthetic.res.AndroidSyntheticFile import org.jetbrains.kotlin.android.synthetic.res.CliSyntheticFileGenerator import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment @@ -48,7 +49,12 @@ class CliSyntheticFileGeneratorForConversionTest( resDirectories: List, private val supportV4: Boolean ) : CliSyntheticFileGenerator(project, manifestPath, resDirectories) { + fun gen() = generateSyntheticFiles(false, supportV4) + + public override fun generateSyntheticFiles(generateCommonFiles: Boolean, supportV4: Boolean): List { + return super.generateSyntheticFiles(generateCommonFiles, this.supportV4) + } } fun UsefulTestCase.createAndroidTestEnvironment(