Implement quickfixes for Android Lint api issues

#KT-16624 Fixed
#KT-16625 Fixed
#KT-14947 Fixed

idea/testData/android/resourceIntention/R.kt

@@ -0,0 +1,8 @@
+package com.myapp
+
+class R {
+    object string {
+        val app_name = 0x7f060021
+        val resource_id = 0x7f060022
+    }
+}

idea/testData/android/resourceIntention/createColorValueResource/alreadyExists/R.java

@@ -0,0 +1,10 @@
+package com.myapp;
+
+public final class R {
+    public static final class string {
+
+    }
+    public static final class color {
+        public static final int super_green = 0x7f060021;
+    }
+}

idea/testData/android/resourceIntention/createColorValueResource/alreadyExists/alreadyExists.test

@@ -0,0 +1,4 @@
+{
+  "isApplicable": false,
+  "intentionText": "Create color value resource 'super_green'"
+}

idea/testData/android/resourceIntention/createColorValueResource/alreadyExists/main.kt

@@ -0,0 +1,4 @@
+import android.app.Activity
+import com.myapp.R
+
+fun Activity.getSuperGreenColor() = getColor(R.color.<caret>super_green)

idea/testData/android/resourceIntention/createColorValueResource/simpleFunction/R.java

@@ -0,0 +1,10 @@
+package com.myapp;
+
+public final class R {
+    public static final class string {
+
+    }
+    public static final class color {
+
+    }
+}

idea/testData/android/resourceIntention/createColorValueResource/simpleFunction/expected/main.kt

@@ -0,0 +1,4 @@
+import android.app.Activity
+import com.myapp.R
+
+fun Activity.getSuperGreenColor() = getColor(R.color.super_green)

idea/testData/android/resourceIntention/createColorValueResource/simpleFunction/expected/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="super_green">a</color>
+</resources>

idea/testData/android/resourceIntention/createColorValueResource/simpleFunction/expected/res/values/strings.xml

@@ -0,0 +1,2 @@
+<resources>
+</resources>

idea/testData/android/resourceIntention/createColorValueResource/simpleFunction/main.kt

@@ -0,0 +1,4 @@
+import android.app.Activity
+import com.myapp.R
+
+fun Activity.getSuperGreenColor() = getColor(R.color.<caret>super_green)

idea/testData/android/resourceIntention/createColorValueResource/simpleFunction/simpleFunction.test

@@ -0,0 +1,4 @@
+{
+  "resDirectory": "../../res",
+  "intentionText": "Create color value resource 'super_green'"
+}

idea/testData/android/resourceIntention/createLayoutResourceFile/alreadyExists/R.java

@@ -0,0 +1,10 @@
+package com.myapp;
+
+public final class R {
+    public static final class string {
+
+    }
+    public static final class layout {
+        public static final int activity_main = 0x7f060021;
+    }
+}

idea/testData/android/resourceIntention/createLayoutResourceFile/alreadyExists/alreadyExists.test

@@ -0,0 +1,4 @@
+{
+  "isApplicable": false,
+  "intentionText": "Create layout resource file 'activity_main.xml'"
+}

idea/testData/android/resourceIntention/createLayoutResourceFile/alreadyExists/main.kt

@@ -0,0 +1,4 @@
+import android.app.Activity
+import com.myapp.R
+
+fun Activity.getSetMainContentView() = setContentView(R.layout.<caret>activity_main)

idea/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/R.java

@@ -0,0 +1,10 @@
+package com.myapp;
+
+public final class R {
+    public static final class string {
+
+    }
+    public static final class layout {
+
+    }
+}

idea/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/expected/main.kt

@@ -0,0 +1,4 @@
+import android.app.Activity
+import com.myapp.R
+
+fun Activity.getSetMainContentView() = setContentView(R.layout.activity_main)

idea/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/expected/res/layout/activity_main.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+</LinearLayout>

idea/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/expected/res/values/strings.xml

@@ -0,0 +1,2 @@
+<resources>
+</resources>

idea/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/main.kt

@@ -0,0 +1,4 @@
+import android.app.Activity
+import com.myapp.R
+
+fun Activity.getSetMainContentView() = setContentView(R.layout.<caret>activity_main)

idea/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/simpleFunction.test

@@ -0,0 +1,4 @@
+{
+  "resDirectory": "../../res",
+  "intentionText": "Create layout resource file 'activity_main.xml'"
+}

idea/testData/android/resourceIntention/createStringValueResource/alreadyExists/R.java

@@ -0,0 +1,7 @@
+package com.myapp;
+
+public final class R {
+    public static final class string {
+        public static final int my_activity_title = 0x7f060021;
+    }
+}

idea/testData/android/resourceIntention/createStringValueResource/alreadyExists/alreadyExists.test

@@ -0,0 +1,4 @@
+{
+  "isApplicable": false,
+  "intentionText": "Create string value resource 'my_activity_title'"
+}

idea/testData/android/resourceIntention/createStringValueResource/alreadyExists/main.kt

@@ -0,0 +1,5 @@
+import android.content.Context
+import com.myapp.R
+
+fun Context.getActivityTitle() = getString(R.string.<caret>my_activity_title)
+

idea/testData/android/resourceIntention/createStringValueResource/simpleFunction/R.java

@@ -0,0 +1,8 @@
+package com.myapp;
+
+public final class R {
+    public static final class string {
+        public static final int app_name = 0x7f060021;
+        public static final int resource_id = 0x7f060022;
+    }
+}

idea/testData/android/resourceIntention/createStringValueResource/simpleFunction/expected/main.kt

@@ -0,0 +1,5 @@
+import android.content.Context
+import com.myapp.R
+
+fun Context.getActivityTitle() = getString(R.string.<caret>my_activity_title)
+

idea/testData/android/resourceIntention/createStringValueResource/simpleFunction/expected/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="my_activity_title">a</string>
+</resources>

idea/testData/android/resourceIntention/createStringValueResource/simpleFunction/main.kt

@@ -0,0 +1,5 @@
+import android.content.Context
+import com.myapp.R
+
+fun Context.getActivityTitle() = getString(R.string.<caret>my_activity_title)
+

idea/testData/android/resourceIntention/createStringValueResource/simpleFunction/simpleFunction.test

@@ -0,0 +1,4 @@
+{
+  "resDirectory": "../../res",
+  "intentionText": "Create string value resource 'my_activity_title'"
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityExtension/activityExtension.test

@@ -0,0 +1,5 @@
+{
+  "rFile": "../../R.kt",
+  "resDirectory": "../../res",
+  "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource"
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityExtension/expected/main.kt

@@ -0,0 +1,7 @@
+package com.myapp
+
+import android.app.Activity
+
+fun Activity.getSomeText() {
+    getString(R.string.resource_id)
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityExtension/expected/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="resource_id">some text</string>
+</resources>

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityExtension/main.kt

@@ -0,0 +1,7 @@
+package com.myapp
+
+import android.app.Activity
+
+fun Activity.getSomeText() {
+    "some <caret>text"
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityMethod/activityMethod.test

@@ -0,0 +1,5 @@
+{
+  "rFile": "../../R.kt",
+  "resDirectory": "../../res",
+  "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource"
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityMethod/expected/main.kt

@@ -0,0 +1,9 @@
+package com.myapp
+
+import android.app.Activity
+
+class MyActivity: Activity() {
+    fun foo() {
+        val a = getString(R.string.resource_id)
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityMethod/expected/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="resource_id">some string</string>
+</resources>

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityMethod/main.kt

@@ -0,0 +1,9 @@
+package com.myapp
+
+import android.app.Activity
+
+class MyActivity: Activity() {
+    fun foo() {
+        val a = "some <caret>string"
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/classInActivity/classInActivity.test

@@ -0,0 +1,5 @@
+{
+  "rFile": "../../R.kt",
+  "resDirectory": "../../res",
+  "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource"
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/classInActivity/expected/main.kt

@@ -0,0 +1,12 @@
+package com.myapp
+
+import android.app.Activity
+import android.content.Context
+
+class MyActivity: Activity() {
+    class Helper {
+        fun test(context: Context) {
+            val b = context.getString(R.string.resource_id)
+        }
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/classInActivity/expected/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="resource_id">some string</string>
+</resources>

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/classInActivity/main.kt

@@ -0,0 +1,12 @@
+package com.myapp
+
+import android.app.Activity
+import android.content.Context
+
+class MyActivity: Activity() {
+    class Helper {
+        fun test(context: Context) {
+            val b = "some <caret>string"
+        }
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/extensionLambda/expected/main.kt

@@ -0,0 +1,13 @@
+package com.myapp
+
+import android.content.Context
+
+fun foo(context: Context) {
+    with (context) {
+        with (2) {
+            getString(R.string.resource_id)
+        }
+    }
+}
+
+inline fun <T, R> with(receiver: T, block: T.() -> R): R = receiver.block()

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/extensionLambda/expected/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="resource_id">zxc</string>
+</resources>

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/extensionLambda/extensionLambda.test

@@ -0,0 +1,5 @@
+{
+  "rFile": "../../R.kt",
+  "resDirectory": "../../res",
+  "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource"
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/extensionLambda/main.kt

@@ -0,0 +1,13 @@
+package com.myapp
+
+import android.content.Context
+
+fun foo(context: Context) {
+    with (context) {
+        with (2) {
+            "z<caret>xc"
+        }
+    }
+}
+
+inline fun <T, R> with(receiver: T, block: T.() -> R): R = receiver.block()

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/function/expected/main.kt

@@ -0,0 +1,7 @@
+package com.myapp
+
+import android.content.Context
+
+fun getSomeText(context: Context) {
+    context.getString(R.string.resource_id)
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/function/expected/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="resource_id">some text</string>
+</resources>

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/function/function.test

@@ -0,0 +1,5 @@
+{
+  "rFile": "../../R.kt",
+  "resDirectory": "../../res",
+  "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource"
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/function/main.kt

@@ -0,0 +1,7 @@
+package com.myapp
+
+import android.content.Context
+
+fun getSomeText(context: Context) {
+    "some <caret>text"
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/genericContextExtensionFunction/expected/main.kt

@@ -0,0 +1,5 @@
+package com.myapp
+
+import android.content.Context
+
+fun <T: Context> T.getText(): String? = getString(R.string.resource_id)

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/genericContextExtensionFunction/expected/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="resource_id">some text</string>
+</resources>

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/genericContextExtensionFunction/genericContextExtensionFunction.test

@@ -0,0 +1,5 @@
+{
+  "rFile": "../../R.kt",
+  "resDirectory": "../../res",
+  "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource"
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/genericContextExtensionFunction/main.kt

@@ -0,0 +1,5 @@
+package com.myapp
+
+import android.content.Context
+
+fun <T: Context> T.getText(): String? = "some <caret>text"

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerClassInActivity/expected/main.kt

@@ -0,0 +1,13 @@
+package com.myapp
+
+import android.app.Activity
+
+class MyActivity: Activity() {
+    inner class Helper {
+        fun a(): String = "q"
+
+        inner class HelperOfHelper {
+            fun b(): String = getString(R.string.resource_id)
+        }
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerClassInActivity/expected/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="resource_id">some string</string>
+</resources>

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerClassInActivity/innerClassInActivity.test

@@ -0,0 +1,5 @@
+{
+  "rFile": "../../R.kt",
+  "resDirectory": "../../res",
+  "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource"
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerClassInActivity/main.kt

@@ -0,0 +1,13 @@
+package com.myapp
+
+import android.app.Activity
+
+class MyActivity: Activity() {
+    inner class Helper {
+        fun a(): String = "q"
+
+        inner class HelperOfHelper {
+            fun b(): String = "some <caret>string"
+        }
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerViewInActivity/expected/main.kt

@@ -0,0 +1,13 @@
+package com.myapp
+
+import android.app.Activity
+import android.content.Context
+import android.view.View
+
+class MyActivity: Activity() {
+    inner class SubView constructor(context: Context): View(context) {
+        fun test() {
+            val b = context.getString(R.string.resource_id)
+        }
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerViewInActivity/expected/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="resource_id">some string</string>
+</resources>

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerViewInActivity/innerViewInActivity.test

@@ -0,0 +1,5 @@
+{
+  "rFile": "../../R.kt",
+  "resDirectory": "../../res",
+  "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource"
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerViewInActivity/main.kt

@@ -0,0 +1,13 @@
+package com.myapp
+
+import android.app.Activity
+import android.content.Context
+import android.view.View
+
+class MyActivity: Activity() {
+    inner class SubView constructor(context: Context): View(context) {
+        fun test() {
+            val b = "some <caret>string"
+        }
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivity/expected/main.kt

@@ -0,0 +1,12 @@
+package com.myapp
+
+import android.app.Activity
+import android.content.Context
+
+class MyActivity: Activity() {
+    object A {
+        fun doSomething(context: Context) {
+            context.getString(R.string.resource_id)
+        }
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivity/expected/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="resource_id">some string</string>
+</resources>

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivity/main.kt

@@ -0,0 +1,12 @@
+package com.myapp
+
+import android.app.Activity
+import android.content.Context
+
+class MyActivity: Activity() {
+    object A {
+        fun doSomething(context: Context) {
+            "some <caret>string"
+        }
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivity/objectInActivity.test

@@ -0,0 +1,5 @@
+{
+  "rFile": "../../R.kt",
+  "resDirectory": "../../res",
+  "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource"
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivityMethod/expected/main.kt

@@ -0,0 +1,11 @@
+package com.myapp
+
+import android.app.Activity
+
+class MyActivity: Activity() {
+    fun foo() {
+        object {
+            val text = getString(R.string.resource_id)
+        }
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivityMethod/expected/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="resource_id">some string</string>
+</resources>

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivityMethod/main.kt

@@ -0,0 +1,11 @@
+package com.myapp
+
+import android.app.Activity
+
+class MyActivity: Activity() {
+    fun foo() {
+        object {
+            val text = "some <caret>string"
+        }
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivityMethod/objectInActivityMethod.test

@@ -0,0 +1,5 @@
+{
+  "rFile": "../../R.kt",
+  "resDirectory": "../../res",
+  "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource"
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInFunction/expected/main.kt

@@ -0,0 +1,10 @@
+package com.myapp
+
+import android.app.Activity
+import android.content.Context
+
+fun foo(context: Context) {
+    object {
+        val text = context.getString(R.string.resource_id)
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInFunction/expected/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="resource_id">some string</string>
+</resources>

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInFunction/main.kt

@@ -0,0 +1,10 @@
+package com.myapp
+
+import android.app.Activity
+import android.content.Context
+
+fun foo(context: Context) {
+    object {
+        val text = "some <caret>string"
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInFunction/objectInFunction.test

@@ -0,0 +1,5 @@
+{
+  "rFile": "../../R.kt",
+  "resDirectory": "../../res",
+  "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource"
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/stringTemplate/main.kt

@@ -0,0 +1,5 @@
+fun foo() {
+    val a = "some"
+    val b = "text"
+    val bar = "$a <caret>+ $b"
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/stringTemplate/stringTemplate.test

@@ -0,0 +1,4 @@
+{
+  "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource",
+  "isApplicable": false
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewExtensionActivityMethod/expected/main.kt

@@ -0,0 +1,10 @@
+package com.myapp
+
+import android.app.Activity
+import android.view.View
+
+class MyActivity: Activity() {
+    fun View.foo() {
+        val a = context.getString(R.string.resource_id)
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewExtensionActivityMethod/expected/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="resource_id">some string</string>
+</resources>

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewExtensionActivityMethod/main.kt

@@ -0,0 +1,10 @@
+package com.myapp
+
+import android.app.Activity
+import android.view.View
+
+class MyActivity: Activity() {
+    fun View.foo() {
+        val a = "some <caret>string"
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewExtensionActivityMethod/viewExtensionActivityMethod.test

@@ -0,0 +1,5 @@
+{
+  "rFile": "../../R.kt",
+  "resDirectory": "../../res",
+  "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource"
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewMethod/expected/main.kt

@@ -0,0 +1,10 @@
+package com.myapp
+
+import android.content.Context
+import android.view.View
+
+class DemoView constructor(context: Context): View(context) {
+    fun test() {
+        val b = context.getString(R.string.resource_id)
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewMethod/expected/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="resource_id">some string</string>
+</resources>

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewMethod/main.kt

@@ -0,0 +1,10 @@
+package com.myapp
+
+import android.content.Context
+import android.view.View
+
+class DemoView constructor(context: Context): View(context) {
+    fun test() {
+        val b = "some <caret>string"
+    }
+}

idea/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewMethod/viewMethod.test

@@ -0,0 +1,5 @@
+{
+  "rFile": "../../R.kt",
+  "resDirectory": "../../res",
+  "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource"
+}

idea/testData/android/resourceIntention/res/values/strings.xml

@@ -0,0 +1,2 @@
+<resources>
+</resources>