as31: Fix test data for android lint based tests for AS 3.0

idea/testData/android/lint/supportAnnotation.kt.as31

@@ -0,0 +1,36 @@
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSupportAnnotationUsageInspection
+// DEPENDENCY: IntRange.java -> android/support/annotation/IntRange.java
+// DEPENDENCY: RequiresPermission.java -> android/support/annotation/RequiresPermission.java
+
+
+import android.support.annotation.IntRange
+import android.support.annotation.RequiresPermission
+import android.Manifest
+import android.view.View
+
+const val constantVal = 0L
+
+<error descr="Invalid range: the `from` attribute must be less than the `to` attribute">@IntRange(from = 10, to = 0)</error>
+fun invalidRange1a(): Int = 5
+
+@IntRange(from = constantVal, to = 10) // ok
+fun invalidRange0b(): Int = 5
+
+<error descr="Invalid range: the `from` attribute must be less than the `to` attribute">@IntRange(from = 10, to = constantVal)</error>
+fun invalidRange1b(): Int = 5
+
+
+// should be ok, KT-16600
+@RequiresPermission(anyOf = arrayOf(Manifest.permission.ACCESS_CHECKIN_PROPERTIES,
+                                    Manifest.permission.ACCESS_FINE_LOCATION))
+fun needsPermissions1() { }
+
+// should be ok, KT-16600
+@RequiresPermission(Manifest.permission.ACCESS_CHECKIN_PROPERTIES)
+fun needsPermissions2() { }
+
+// error
+<error descr="Only specify one of `value`, `anyOf` or `allOf`">@RequiresPermission(
+        value = Manifest.permission.ACCESS_CHECKIN_PROPERTIES,
+        anyOf = arrayOf(Manifest.permission.ACCESS_CHECKIN_PROPERTIES, Manifest.permission.ACCESS_FINE_LOCATION))</error>
+fun needsPermissions3() { }

idea/testData/android/lintQuickfix/parcelable/missingCreator.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add Parcelable Implementation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintParcelCreatorInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintParcelCreatorInspection
 import android.os.Parcel
 import android.os.Parcelable
 

idea/testData/android/lintQuickfix/parcelable/missingCreator.kt.expected.as31

@@ -0,0 +1,27 @@
+// INTENTION_TEXT: Add Parcelable Implementation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintParcelCreatorInspection
+import android.os.Parcel
+import android.os.Parcelable
+
+class MissingCreator() : Parcelable {
+    constructor(parcel: Parcel) : this() {
+    }
+
+    override fun writeToParcel(dest: Parcel?, flags: Int) {
+        TODO("not implemented")
+    }
+
+    override fun describeContents(): Int {
+        TODO("not implemented")
+    }
+
+    companion object CREATOR : Parcelable.Creator<MissingCreator> {
+        override fun createFromParcel(parcel: Parcel): MissingCreator {
+            return MissingCreator(parcel)
+        }
+
+        override fun newArray(size: Int): Array<MissingCreator?> {
+            return arrayOfNulls(size)
+        }
+    }
+}

idea/testData/android/lintQuickfix/parcelable/noImplementation.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add Parcelable Implementation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintParcelCreatorInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintParcelCreatorInspection
 import android.os.Parcelable
 
 class <caret>NoImplementation : Parcelable

idea/testData/android/lintQuickfix/parcelable/noImplementation.kt.expected.as31

@@ -0,0 +1,27 @@
+// INTENTION_TEXT: Add Parcelable Implementation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintParcelCreatorInspection
+import android.os.Parcel
+import android.os.Parcelable
+
+class NoImplementation() : Parcelable {
+    constructor(parcel: Parcel) : this() {
+    }
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<NoImplementation> {
+        override fun createFromParcel(parcel: Parcel): NoImplementation {
+            return NoImplementation(parcel)
+        }
+
+        override fun newArray(size: Int): Array<NoImplementation?> {
+            return arrayOfNulls(size)
+        }
+    }
+}

idea/testData/android/lintQuickfix/requiresApi/annotation.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 // DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
 
 import android.graphics.drawable.VectorDrawable

idea/testData/android/lintQuickfix/requiresApi/annotation.kt.expected.as31

@@ -0,0 +1,15 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import android.support.annotation.RequiresApi
+import kotlin.reflect.KClass
+
+annotation class SomeAnnotationWithClass(val cls: KClass<*>)
+
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+@SomeAnnotationWithClass(VectorDrawable::class)
+class VectorDrawableProvider {
+}

idea/testData/android/lintQuickfix/requiresApi/companion.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 // DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
 
 import android.graphics.drawable.VectorDrawable

idea/testData/android/lintQuickfix/requiresApi/companion.kt.expected.as31

@@ -0,0 +1,14 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import android.support.annotation.RequiresApi
+
+class VectorDrawableProvider {
+    companion object {
+        @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+        val VECTOR_DRAWABLE = VectorDrawable()
+    }
+}

idea/testData/android/lintQuickfix/requiresApi/defaultParameter.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 // DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
 
 import android.graphics.drawable.VectorDrawable

idea/testData/android/lintQuickfix/requiresApi/defaultParameter.kt.expected.as31

@@ -0,0 +1,13 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import android.support.annotation.RequiresApi
+
+
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+fun withDefaultParameter(vector: VectorDrawable = VectorDrawable()) {
+
+}

idea/testData/android/lintQuickfix/requiresApi/extend.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 // DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
 
 import android.graphics.drawable.VectorDrawable

idea/testData/android/lintQuickfix/requiresApi/extend.kt.expected.as31

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import android.support.annotation.RequiresApi
+
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+class MyVectorDrawable : VectorDrawable() {
+
+}

idea/testData/android/lintQuickfix/requiresApi/functionLiteral.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 // DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
 
 import android.graphics.drawable.VectorDrawable

idea/testData/android/lintQuickfix/requiresApi/functionLiteral.kt.expected.as31

@@ -0,0 +1,16 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import android.support.annotation.RequiresApi
+
+class VectorDrawableProvider {
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    fun getVectorDrawable(): VectorDrawable {
+        with(this) {
+            return VectorDrawable()
+        }
+    }
+}

idea/testData/android/lintQuickfix/requiresApi/inlinedConstant.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @RequiresApi(KITKAT) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintInlinedApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintInlinedApiInspection
 // DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
 
 class Test {

idea/testData/android/lintQuickfix/requiresApi/inlinedConstant.kt.expected.as31

@@ -0,0 +1,13 @@
+import android.os.Build
+import android.support.annotation.RequiresApi
+
+// INTENTION_TEXT: Add @RequiresApi(KITKAT) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintInlinedApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+class Test {
+    @RequiresApi(Build.VERSION_CODES.KITKAT)
+    fun foo(): Int {
+        return android.R.attr.windowTranslucentStatus
+    }
+}

idea/testData/android/lintQuickfix/requiresApi/method.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 // DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
 
 import android.graphics.drawable.VectorDrawable

idea/testData/android/lintQuickfix/requiresApi/method.kt.expected.as31

@@ -0,0 +1,14 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import android.support.annotation.RequiresApi
+
+class VectorDrawableProvider {
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    fun getVectorDrawable(): VectorDrawable {
+        return VectorDrawable()
+    }
+}

idea/testData/android/lintQuickfix/requiresApi/property.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 // DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
 
 import android.graphics.drawable.VectorDrawable

idea/testData/android/lintQuickfix/requiresApi/property.kt.expected.as31

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import android.support.annotation.RequiresApi
+
+class VectorDrawableProvider {
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    val VECTOR_DRAWABLE = VectorDrawable()
+}

idea/testData/android/lintQuickfix/requiresApi/topLevelProperty.kt.as31

@@ -0,0 +1,7 @@
+// INTENTION_TEXT: Add @RequiresApi(M) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+import android.app.Activity
+
+val top: Int
+    get() = Activity().<caret>checkSelfPermission(READ_CONTACTS)

idea/testData/android/lintQuickfix/requiresApi/topLevelProperty.kt.expected.as31

@@ -0,0 +1,10 @@
+// INTENTION_TEXT: Add @RequiresApi(M) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+import android.app.Activity
+import android.os.Build
+import android.support.annotation.RequiresApi
+
+val top: Int
+    @RequiresApi(Build.VERSION_CODES.M)
+    get() = Activity().checkSelfPermission(READ_CONTACTS)

idea/testData/android/lintQuickfix/requiresApi/when.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 // DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
 
 import android.graphics.drawable.VectorDrawable

idea/testData/android/lintQuickfix/requiresApi/when.kt.expected.as31

@@ -0,0 +1,18 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import android.support.annotation.RequiresApi
+
+class VectorDrawableProvider {
+    val flag = false
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    fun getVectorDrawable(): VectorDrawable {
+        return when (flag) {
+            true -> VectorDrawable()
+            else -> VectorDrawable()
+        }
+    }
+}

idea/testData/android/lintQuickfix/suppressLint/activityMethod.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSdCardPathInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
 
 import android.app.Activity
 import android.os.Environment

idea/testData/android/lintQuickfix/suppressLint/activityMethod.kt.expected.as31

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.os.Environment
+
+
+class MainActivity : Activity() {
+    @SuppressLint("SdCardPath")
+    fun getSdCard(fromEnvironment: Boolean) = if (fromEnvironment) Environment.getExternalStorageDirectory().path else "/sdcard"
+}

idea/testData/android/lintQuickfix/suppressLint/addToExistingAnnotation.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSdCardPathInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
 
 import android.annotation.SuppressLint
 import android.app.Activity

idea/testData/android/lintQuickfix/suppressLint/addToExistingAnnotation.kt.expected.as31

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.os.Environment
+
+
+class MainActivity : Activity() {
+    @SuppressLint("Something", "SdCardPath")
+    fun getSdCard(fromEnvironment: Boolean) = if (fromEnvironment) Environment.getExternalStorageDirectory().path else "/sdcard"
+}

idea/testData/android/lintQuickfix/suppressLint/constructorParameter.kt.as31

@@ -1,4 +1,4 @@
 // INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSdCardPathInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
 
 class SdCard(val path: String = "<caret>/sdcard")

idea/testData/android/lintQuickfix/suppressLint/constructorParameter.kt.expected.as31

@@ -0,0 +1,6 @@
+import android.annotation.SuppressLint
+
+// INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
+
+class SdCard(@SuppressLint("SdCardPath") val path: String = "/sdcard")

idea/testData/android/lintQuickfix/suppressLint/destructuringDeclaration.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSdCardPathInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
 
 fun foo() {
     val (a: String, b: String) = "<caret>/sdcard"

idea/testData/android/lintQuickfix/suppressLint/destructuringDeclaration.kt.expected.as31

@@ -0,0 +1,12 @@
+import android.annotation.SuppressLint
+
+// INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
+
+@SuppressLint("SdCardPath")
+fun foo() {
+    val (a: String, b: String) = "/sdcard"
+}
+
+operator fun CharSequence.component1(): String = "component1"
+operator fun CharSequence.component2(): String = "component2"

idea/testData/android/lintQuickfix/suppressLint/lambdaArgument.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSdCardPathInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
 
 fun foo(l: Any) = l
 

idea/testData/android/lintQuickfix/suppressLint/lambdaArgument.kt.expected.as31

@@ -0,0 +1,13 @@
+import android.annotation.SuppressLint
+
+// INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
+
+fun foo(l: Any) = l
+
+@SuppressLint("SdCardPath")
+fun bar() {
+    foo() {
+        "<caret>/sdcard"
+    }
+}

idea/testData/android/lintQuickfix/suppressLint/lambdaArgumentProperty.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSdCardPathInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
 
 fun foo(l: Any) = l
 

idea/testData/android/lintQuickfix/suppressLint/lambdaArgumentProperty.kt.expected.as31

@@ -0,0 +1,9 @@
+import android.annotation.SuppressLint
+
+// INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
+
+fun foo(l: Any) = l
+
+@SuppressLint("SdCardPath")
+val bar = foo() { "/sdcard" }

idea/testData/android/lintQuickfix/suppressLint/methodParameter.kt.as31

@@ -1,4 +1,4 @@
 // INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSdCardPathInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
 
 fun foo(path: String = "<caret>/sdcard") = path

idea/testData/android/lintQuickfix/suppressLint/methodParameter.kt.expected.as31

@@ -0,0 +1,6 @@
+import android.annotation.SuppressLint
+
+// INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
+
+fun foo(@SuppressLint("SdCardPath") path: String = "/sdcard") = path

idea/testData/android/lintQuickfix/suppressLint/propertyWithLambda.kt.as31

@@ -1,4 +1,4 @@
 // INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSdCardPathInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
 
 val getPath = { "<caret>/sdcard" }

idea/testData/android/lintQuickfix/suppressLint/propertyWithLambda.kt.expected.as31

@@ -0,0 +1,7 @@
+import android.annotation.SuppressLint
+
+// INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
+
+@SuppressLint("SdCardPath")
+val getPath = { "/sdcard" }

idea/testData/android/lintQuickfix/suppressLint/simpleProperty.kt.as31

@@ -1,4 +1,4 @@
 // INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSdCardPathInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
 
 val path = "<caret>/sdcard"

idea/testData/android/lintQuickfix/suppressLint/simpleProperty.kt.expected.as31

@@ -0,0 +1,7 @@
+import android.annotation.SuppressLint
+
+// INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintSdCardPathInspection
+
+@SuppressLint("SdCardPath")
+val path = "/sdcard"

idea/testData/android/lintQuickfix/targetApi/annotation.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 
 import android.graphics.drawable.VectorDrawable
 import kotlin.reflect.KClass

idea/testData/android/lintQuickfix/targetApi/annotation.kt.expected.as31

@@ -0,0 +1,14 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.annotation.TargetApi
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+import kotlin.reflect.KClass
+
+annotation class SomeAnnotationWithClass(val cls: KClass<*>)
+
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+@SomeAnnotationWithClass(VectorDrawable::class)
+class VectorDrawableProvider {
+}

idea/testData/android/lintQuickfix/targetApi/companion.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 
 import android.graphics.drawable.VectorDrawable
 

idea/testData/android/lintQuickfix/targetApi/companion.kt.expected.as31

@@ -0,0 +1,13 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.annotation.TargetApi
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    companion object {
+        val VECTOR_DRAWABLE = VectorDrawable()
+    }
+}

idea/testData/android/lintQuickfix/targetApi/defaultParameter.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 
 import android.graphics.drawable.VectorDrawable
 

idea/testData/android/lintQuickfix/targetApi/defaultParameter.kt.expected.as31

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.annotation.TargetApi
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+fun withDefaultParameter(vector: VectorDrawable = VectorDrawable()) {
+
+}

idea/testData/android/lintQuickfix/targetApi/extend.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 
 import android.graphics.drawable.VectorDrawable
 

idea/testData/android/lintQuickfix/targetApi/extend.kt.expected.as31

@@ -0,0 +1,11 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.annotation.TargetApi
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+class MyVectorDrawable : VectorDrawable() {
+
+}

idea/testData/android/lintQuickfix/targetApi/functionLiteral.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 
 import android.graphics.drawable.VectorDrawable
 

idea/testData/android/lintQuickfix/targetApi/functionLiteral.kt.expected.as31

@@ -0,0 +1,15 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.annotation.TargetApi
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    fun getVectorDrawable(): VectorDrawable {
+        with(this) {
+            return VectorDrawable()
+        }
+    }
+}

idea/testData/android/lintQuickfix/targetApi/inlinedConstant.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @TargetApi(KITKAT) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintInlinedApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintInlinedApiInspection
 
 class Test {
     fun foo(): Int {

idea/testData/android/lintQuickfix/targetApi/inlinedConstant.kt.expected.as31

@@ -0,0 +1,12 @@
+import android.annotation.TargetApi
+import android.os.Build
+
+// INTENTION_TEXT: Add @TargetApi(KITKAT) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintInlinedApiInspection
+
+class Test {
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    fun foo(): Int {
+        return android.R.attr.windowTranslucentStatus
+    }
+}

idea/testData/android/lintQuickfix/targetApi/method.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 
 import android.graphics.drawable.VectorDrawable
 

idea/testData/android/lintQuickfix/targetApi/method.kt.expected.as31

@@ -0,0 +1,13 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.annotation.TargetApi
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    fun getVectorDrawable(): VectorDrawable {
+        return VectorDrawable()
+    }
+}

idea/testData/android/lintQuickfix/targetApi/property.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 
 import android.graphics.drawable.VectorDrawable
 

idea/testData/android/lintQuickfix/targetApi/property.kt.expected.as31

@@ -0,0 +1,11 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.annotation.TargetApi
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+class VectorDrawableProvider {
+    val VECTOR_DRAWABLE = VectorDrawable()
+}

idea/testData/android/lintQuickfix/targetApi/topLevelProperty.kt.as31

@@ -0,0 +1,6 @@
+// INTENTION_TEXT: Add @TargetApi(M) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+import android.app.Activity
+
+val top: Int
+    get() = Activity().<caret>checkSelfPermission(READ_CONTACTS)

idea/testData/android/lintQuickfix/targetApi/topLevelProperty.kt.expected.as31

@@ -0,0 +1,9 @@
+// INTENTION_TEXT: Add @TargetApi(M) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+import android.annotation.TargetApi
+import android.app.Activity
+import android.os.Build
+
+val top: Int
+    @TargetApi(Build.VERSION_CODES.M)
+    get() = Activity().checkSelfPermission(READ_CONTACTS)

idea/testData/android/lintQuickfix/targetApi/when.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 
 import android.graphics.drawable.VectorDrawable
 

idea/testData/android/lintQuickfix/targetApi/when.kt.expected.as31

@@ -0,0 +1,17 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.annotation.TargetApi
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    val flag = false
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    fun getVectorDrawable(): VectorDrawable {
+        return when (flag) {
+            true -> VectorDrawable()
+            else -> VectorDrawable()
+        }
+    }
+}

idea/testData/android/lintQuickfix/targetVersionCheck/annotation.kt.as31

@@ -1,6 +1,6 @@
 // INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
 // INTENTION_NOT_AVAILABLE
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 
 import android.graphics.drawable.VectorDrawable
 import kotlin.reflect.KClass

idea/testData/android/lintQuickfix/targetVersionCheck/defaultParameter.kt.as31

@@ -1,6 +1,6 @@
 // INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
 // INTENTION_NOT_AVAILABLE
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 
 import android.graphics.drawable.VectorDrawable
 

idea/testData/android/lintQuickfix/targetVersionCheck/destructuringDeclaration.kt.as31

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.app.Activity
+import android.graphics.drawable.VectorDrawable
+
+data class ValueProvider(var p1: VectorDrawable, val p2: Int)
+
+val activity = Activity()
+fun foo() {
+    val (v1, v2) = ValueProvider(<caret>VectorDrawable(), 0)
+}

idea/testData/android/lintQuickfix/targetVersionCheck/destructuringDeclaration.kt.expected.as31

@@ -0,0 +1,17 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.app.Activity
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+data class ValueProvider(var p1: VectorDrawable, val p2: Int)
+
+val activity = Activity()
+fun foo() {
+    val (v1, v2) = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        ValueProvider(VectorDrawable(), 0)
+    } else {
+        TODO("VERSION.SDK_INT < LOLLIPOP")
+    }
+}

idea/testData/android/lintQuickfix/targetVersionCheck/expressionBody.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 
 import android.graphics.drawable.VectorDrawable
 

idea/testData/android/lintQuickfix/targetVersionCheck/expressionBody.kt.expected.as31

@@ -0,0 +1,13 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        VectorDrawable()
+    } else {
+        TODO("VERSION.SDK_INT < LOLLIPOP")
+    }
+}

idea/testData/android/lintQuickfix/targetVersionCheck/functionLiteral.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 
 import android.graphics.drawable.VectorDrawable
 

idea/testData/android/lintQuickfix/targetVersionCheck/functionLiteral.kt.expected.as31

@@ -0,0 +1,17 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable {
+        with(this) {
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                VectorDrawable()
+            } else {
+                TODO("VERSION.SDK_INT < LOLLIPOP")
+            }
+        }
+    }
+}

idea/testData/android/lintQuickfix/targetVersionCheck/getterWIthExpressionBody.kt.as31

@@ -0,0 +1,7 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+val v: VectorDrawable
+    get() = <caret>VectorDrawable()

idea/testData/android/lintQuickfix/targetVersionCheck/getterWIthExpressionBody.kt.expected.as31

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+val v: VectorDrawable
+    get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        VectorDrawable()
+    } else {
+        TODO("VERSION.SDK_INT < LOLLIPOP")
+    }

idea/testData/android/lintQuickfix/targetVersionCheck/if.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 
 import android.graphics.drawable.VectorDrawable
 

idea/testData/android/lintQuickfix/targetVersionCheck/if.kt.expected.as31

@@ -0,0 +1,17 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    val flag = false
+    fun getVectorDrawable(): VectorDrawable {
+        if (flag)
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                VectorDrawable()
+            } else {
+                TODO("VERSION.SDK_INT < LOLLIPOP")
+            }
+    }
+}

idea/testData/android/lintQuickfix/targetVersionCheck/ifWithBlock.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 
 import android.graphics.drawable.VectorDrawable
 

idea/testData/android/lintQuickfix/targetVersionCheck/ifWithBlock.kt.expected.as31

@@ -0,0 +1,18 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    val flag = false
+    fun getVectorDrawable(): VectorDrawable {
+        if (flag) {
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                VectorDrawable()
+            } else {
+                TODO("VERSION.SDK_INT < LOLLIPOP")
+            }
+        }
+    }
+}

idea/testData/android/lintQuickfix/targetVersionCheck/inlinedConstant.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.KITKAT) { ... }
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintInlinedApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintInlinedApiInspection
 
 class Test {
     fun foo(): Int {

idea/testData/android/lintQuickfix/targetVersionCheck/inlinedConstant.kt.expected.as31

@@ -0,0 +1,14 @@
+import android.os.Build
+
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.KITKAT) { ... }
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintInlinedApiInspection
+
+class Test {
+    fun foo(): Int {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            android.R.attr.windowTranslucentStatus
+        } else {
+            TODO("VERSION.SDK_INT < KITKAT")
+        }
+    }
+}

idea/testData/android/lintQuickfix/targetVersionCheck/method.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 
 import android.graphics.drawable.VectorDrawable
 

idea/testData/android/lintQuickfix/targetVersionCheck/method.kt.expected.as31

@@ -0,0 +1,15 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            VectorDrawable()
+        } else {
+            TODO("VERSION.SDK_INT < LOLLIPOP")
+        }
+    }
+}

idea/testData/android/lintQuickfix/targetVersionCheck/when.kt.as31

@@ -1,5 +1,5 @@
 // INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
-// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
 
 import android.graphics.drawable.VectorDrawable
 

idea/testData/android/lintQuickfix/targetVersionCheck/when.kt.expected.as31

@@ -0,0 +1,19 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: com.android.tools.idea.lint.AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+import android.os.Build
+
+class VectorDrawableProvider {
+    val flag = false
+    fun getVectorDrawable(): VectorDrawable {
+        return when (flag) {
+            true -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                VectorDrawable()
+            } else {
+                TODO("VERSION.SDK_INT < LOLLIPOP")
+            }
+            else -> VectorDrawable()
+        }
+    }
+}