as31: Drop custom Kotlin Android lint, register quickfixes with extension point

generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as31

@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.android.configure.AbstractConfigureProjectTest
 import org.jetbrains.kotlin.android.folding.AbstractAndroidResourceFoldingTest
 import org.jetbrains.kotlin.android.intention.AbstractAndroidIntentionTest
 import org.jetbrains.kotlin.android.intention.AbstractAndroidResourceIntentionTest
-import org.jetbrains.kotlin.android.lint.AbstractKotlinLintTest
 import org.jetbrains.kotlin.android.parcel.AbstractParcelBytecodeListingTest
 import org.jetbrains.kotlin.android.quickfix.AbstractAndroidLintQuickfixTest
 import org.jetbrains.kotlin.android.quickfix.AbstractAndroidQuickFixMultiFileTest
@@ -1115,10 +1114,6 @@ fun main(args: Array<String>) {
             model("android/quickfix", pattern = """^(\w+)\.((before\.Main\.\w+)|(test))$""", testMethod = "doTestWithExtraFile")
         }
 
-        testClass<AbstractKotlinLintTest> {
-            model("android/lint", excludeParentDirs = true)
-        }
-
         testClass<AbstractAndroidLintQuickfixTest> {
             model("android/lintQuickfix", pattern = "^([\\w\\-_]+)\\.kt$")
         }

idea/idea-android/src/org/jetbrains/kotlin/android/quickfix/AddTargetApiQuickFix.kt.as31

@@ -0,0 +1,95 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.android.quickfix
+
+import com.android.SdkConstants
+import com.android.tools.lint.checks.ApiDetector.REQUIRES_API_ANNOTATION
+import com.intellij.codeInsight.FileModificationService
+import com.intellij.psi.PsiElement
+import com.intellij.psi.util.PsiTreeUtil
+import org.jetbrains.android.inspections.lint.AndroidLintQuickFix
+import org.jetbrains.android.inspections.lint.AndroidQuickfixContexts
+import org.jetbrains.android.util.AndroidBundle
+import org.jetbrains.kotlin.android.hasBackingField
+import org.jetbrains.kotlin.idea.util.addAnnotation
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.psi.*
+
+
+class AddTargetApiQuickFix(
+        val api: Int,
+        val useRequiresApi: Boolean
+) : AndroidLintQuickFix {
+
+    private companion object {
+        val FQNAME_TARGET_API = FqName(SdkConstants.FQCN_TARGET_API)
+        val FQNAME_REQUIRES_API = FqName(REQUIRES_API_ANNOTATION)
+    }
+
+    override fun isApplicable(startElement: PsiElement, endElement: PsiElement, contextType: AndroidQuickfixContexts.ContextType): Boolean =
+            getAnnotationContainer(startElement, useRequiresApi) != null
+
+    override fun getName(): String = getAnnotationValue(false).let {
+        if (useRequiresApi) {
+            // Not Available in Android plugin 2.0
+            // AndroidBundle.message("android.lint.fix.add.requires.api", it)
+            "Add @RequiresApi($it) Annotation"
+        } else {
+            AndroidBundle.message("android.lint.fix.add.target.api", it)
+        }
+    }
+
+    override fun apply(startElement: PsiElement, endElement: PsiElement, context: AndroidQuickfixContexts.Context) {
+        val annotationContainer = getAnnotationContainer(startElement, useRequiresApi) ?: return
+        if (!FileModificationService.getInstance().preparePsiElementForWrite(annotationContainer)) {
+            return
+        }
+
+        if (annotationContainer is KtModifierListOwner) {
+             annotationContainer.addAnnotation(
+                    if (useRequiresApi) FQNAME_REQUIRES_API else FQNAME_TARGET_API,
+                    getAnnotationValue(true),
+                    whiteSpaceText = if (annotationContainer.isNewLineNeededForAnnotation()) "\n" else " ")
+        }
+    }
+
+    private fun KtElement.isNewLineNeededForAnnotation() = !(this is KtParameter || this is KtTypeParameter || this is KtPropertyAccessor)
+
+    private fun getAnnotationValue(fullyQualified: Boolean) = getVersionField(api, fullyQualified)
+
+    private fun getAnnotationContainer(element: PsiElement, useRequiresApi: Boolean): PsiElement? {
+        return PsiTreeUtil.findFirstParent(element) {
+            if (useRequiresApi)
+                it.isRequiresApiAnnotationValidTarget()
+            else
+                it.isTargetApiAnnotationValidTarget()
+        }
+    }
+
+    private fun PsiElement.isRequiresApiAnnotationValidTarget(): Boolean {
+        return this is KtClassOrObject ||
+               (this is KtFunction && this !is KtFunctionLiteral) ||
+               (this is KtProperty && !isLocal && hasBackingField()) ||
+               this is KtPropertyAccessor
+    }
+
+    private fun PsiElement.isTargetApiAnnotationValidTarget(): Boolean {
+        return this is KtClassOrObject ||
+               (this is KtFunction && this !is KtFunctionLiteral) ||
+               this is KtPropertyAccessor
+    }
+}

idea/idea-android/src/org/jetbrains/kotlin/android/quickfix/AddTargetVersionCheckQuickFix.kt.as31

@@ -0,0 +1,94 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.android.quickfix
+
+import com.intellij.codeInsight.FileModificationService
+import com.intellij.psi.PsiDocumentManager
+import com.intellij.psi.PsiElement
+import com.intellij.psi.util.PsiTreeUtil
+import org.jetbrains.android.inspections.lint.AndroidLintQuickFix
+import org.jetbrains.android.inspections.lint.AndroidQuickfixContexts
+import org.jetbrains.kotlin.idea.caches.resolve.analyze
+import org.jetbrains.kotlin.idea.codeInsight.surroundWith.statement.KotlinIfSurrounder
+import org.jetbrains.kotlin.idea.core.ShortenReferences
+import org.jetbrains.kotlin.idea.inspections.findExistingEditor
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
+
+
+class AddTargetVersionCheckQuickFix(val api: Int) : AndroidLintQuickFix {
+
+    override fun apply(startElement: PsiElement, endElement: PsiElement, context: AndroidQuickfixContexts.Context) {
+        val targetExpression = getTargetExpression(startElement)
+        val project = targetExpression?.project ?: return
+        val editor = targetExpression.findExistingEditor() ?: return
+
+        val file = targetExpression.containingFile
+        val documentManager = PsiDocumentManager.getInstance(project)
+        val document = documentManager.getDocument(file) ?: return
+
+        if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
+            return
+        }
+
+        val surrounder = getSurrounder(targetExpression, "\"VERSION.SDK_INT < ${getVersionField(api, false)}\"")
+        val conditionRange = surrounder.surroundElements(project, editor, arrayOf(targetExpression)) ?: return
+        val conditionText = "android.os.Build.VERSION.SDK_INT >= ${getVersionField(api, true)}"
+        document.replaceString(conditionRange.startOffset, conditionRange.endOffset, conditionText)
+        documentManager.commitDocument(document)
+
+        ShortenReferences.DEFAULT.process(documentManager.getPsiFile(document) as KtFile,
+                                          conditionRange.startOffset,
+                                          conditionRange.startOffset + conditionText.length)
+    }
+
+    override fun isApplicable(startElement: PsiElement, endElement: PsiElement, contextType: AndroidQuickfixContexts.ContextType): Boolean =
+        getTargetExpression(startElement) != null
+
+    override fun getName(): String = "Surround with if (VERSION.SDK_INT >= VERSION_CODES.${getVersionField(api, false)}) { ... }"
+
+    private fun getTargetExpression(element: PsiElement): KtElement? {
+        var current = PsiTreeUtil.getParentOfType(element, KtExpression::class.java)
+        while (current != null) {
+            if (current.parent is KtBlockExpression ||
+                current.parent is KtContainerNode ||
+                current.parent is KtWhenEntry ||
+                current.parent is KtFunction ||
+                current.parent is KtPropertyAccessor ||
+                current.parent is KtProperty ||
+                current.parent is KtReturnExpression ||
+                current.parent is KtDestructuringDeclaration) {
+                break
+            }
+            current = PsiTreeUtil.getParentOfType(current, KtExpression::class.java, true)
+        }
+
+        return current
+    }
+
+    private fun getSurrounder(element: KtElement, todoText: String?): KotlinIfSurrounder {
+        val used = element.analyze(BodyResolveMode.PARTIAL_WITH_CFA)[BindingContext.USED_AS_EXPRESSION, element] ?: false
+        return if (used) {
+            object : KotlinIfSurrounder() {
+                override fun getCodeTemplate(): String = "if (a) { \n} else {\nTODO(${todoText ?: ""})\n}"
+            }
+        } else {
+            KotlinIfSurrounder()
+        }
+    }
+}

idea/idea-android/src/org/jetbrains/kotlin/android/quickfix/ApiUtils.kt.as31

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.android.quickfix
+
+import com.android.sdklib.SdkVersionInfo.*
+
+
+fun getVersionField(api: Int, fullyQualified: Boolean): String = getBuildCode(api)?.let {
+    if (fullyQualified) "android.os.Build.VERSION_CODES.$it" else it
+} ?: api.toString()

idea/idea-android/src/org/jetbrains/kotlin/android/quickfix/KotlinAndroidQuickFixProvider.kt.as31

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.android.quickfix
+
+import com.android.SdkConstants.SUPPORT_ANNOTATIONS_PREFIX
+import com.android.tools.lint.checks.ApiDetector
+import com.android.tools.lint.checks.CommentDetector
+import com.android.tools.lint.checks.ParcelDetector
+import com.android.tools.lint.detector.api.Issue
+import com.android.tools.lint.detector.api.TextFormat
+import com.intellij.psi.JavaPsiFacade
+import com.intellij.psi.PsiElement
+import com.intellij.psi.search.GlobalSearchScope
+import org.jetbrains.android.inspections.lint.AndroidLintQuickFix
+import org.jetbrains.android.inspections.lint.AndroidLintQuickFixProvider
+
+
+class KotlinAndroidQuickFixProvider : AndroidLintQuickFixProvider {
+    override fun getQuickFixes(
+            issue: Issue,
+            startElement: PsiElement,
+            endElement: PsiElement,
+            message: String,
+            data: Any?
+    ): Array<AndroidLintQuickFix> {
+        val fixes: Array<AndroidLintQuickFix> = when (issue) {
+            ApiDetector.UNSUPPORTED, ApiDetector.INLINED -> getApiQuickFixes(issue, startElement, message)
+            ParcelDetector.ISSUE -> arrayOf(ParcelableQuickFix())
+            else -> emptyArray()
+        }
+
+        if (issue != CommentDetector.STOP_SHIP) {
+            return fixes + SuppressLintQuickFix(issue.id)
+        }
+
+        return fixes
+    }
+
+    fun getApiQuickFixes(issue: Issue, element: PsiElement, message: String): Array<AndroidLintQuickFix> {
+        val api = ApiDetector.getRequiredVersion(issue, message, TextFormat.RAW)
+        if (api == -1) {
+            return AndroidLintQuickFix.EMPTY_ARRAY
+        }
+
+        val project = element.project
+        if (JavaPsiFacade.getInstance(project).findClass(REQUIRES_API_ANNOTATION, GlobalSearchScope.allScope(project)) != null) {
+            return arrayOf(AddTargetApiQuickFix(api, true), AddTargetApiQuickFix(api, false), AddTargetVersionCheckQuickFix(api))
+        }
+
+        return arrayOf(AddTargetApiQuickFix(api, false), AddTargetVersionCheckQuickFix(api))
+    }
+
+    companion object {
+        val REQUIRES_API_ANNOTATION = SUPPORT_ANNOTATIONS_PREFIX + "RequiresApi"
+    }
+}

idea/idea-android/src/org/jetbrains/kotlin/android/quickfix/ParcelableQuickFix.kt.as31

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.android.quickfix
+
+import com.intellij.psi.PsiElement
+import com.intellij.psi.util.PsiTreeUtil
+import org.jetbrains.android.inspections.lint.AndroidLintQuickFix
+import org.jetbrains.android.inspections.lint.AndroidQuickfixContexts
+import org.jetbrains.android.util.AndroidBundle
+import org.jetbrains.kotlin.android.canAddParcelable
+import org.jetbrains.kotlin.android.implementParcelable
+import org.jetbrains.kotlin.android.isParcelize
+import org.jetbrains.kotlin.psi.KtClass
+
+
+class ParcelableQuickFix : AndroidLintQuickFix {
+    override fun apply(startElement: PsiElement, endElement: PsiElement, context: AndroidQuickfixContexts.Context) {
+        startElement.getTargetClass()?.implementParcelable()
+    }
+
+    override fun isApplicable(startElement: PsiElement, endElement: PsiElement, contextType: AndroidQuickfixContexts.ContextType): Boolean {
+        val targetClass = startElement.getTargetClass() ?: return false
+        return targetClass.canAddParcelable() && !targetClass.isParcelize()
+    }
+
+    override fun getName(): String = AndroidBundle.message("implement.parcelable.intention.text")
+
+    private fun PsiElement.getTargetClass(): KtClass? = PsiTreeUtil.getParentOfType(this, KtClass::class.java, false)
+}

idea/idea-android/src/org/jetbrains/kotlin/android/quickfix/SuppressLintQuickFix.kt.as31

@@ -0,0 +1,99 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.android.quickfix
+
+import com.android.SdkConstants
+import com.intellij.codeInsight.FileModificationService
+import com.intellij.psi.PsiElement
+import com.intellij.psi.util.PsiTreeUtil
+import org.jetbrains.android.inspections.lint.AndroidLintQuickFix
+import org.jetbrains.android.inspections.lint.AndroidQuickfixContexts
+import org.jetbrains.android.util.AndroidBundle
+import org.jetbrains.kotlin.android.hasBackingField
+import org.jetbrains.kotlin.idea.util.addAnnotation
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.psi.*
+
+
+class SuppressLintQuickFix(id: String) : AndroidLintQuickFix {
+    private val lintId = getLintId(id)
+
+    override fun apply(startElement: PsiElement, endElement: PsiElement, context: AndroidQuickfixContexts.Context) {
+        val annotationContainer = PsiTreeUtil.findFirstParent(startElement, true) { it.isSuppressLintTarget() } ?: return
+        if (!FileModificationService.getInstance().preparePsiElementForWrite(annotationContainer)) {
+            return
+        }
+
+        val argument = "\"$lintId\""
+
+        when (annotationContainer) {
+            is KtModifierListOwner -> {
+                annotationContainer.addAnnotation(
+                        FQNAME_SUPPRESS_LINT,
+                        argument,
+                        whiteSpaceText = if (annotationContainer.isNewLineNeededForAnnotation()) "\n" else " ",
+                        addToExistingAnnotation = { entry -> addArgumentToAnnotation(entry, argument) })
+            }
+        }
+    }
+
+    override fun getName(): String = AndroidBundle.message(SUPPRESS_LINT_MESSAGE, lintId)
+
+    override fun isApplicable(
+            startElement: PsiElement,
+            endElement: PsiElement,
+            contextType: AndroidQuickfixContexts.ContextType
+    ): Boolean = true
+
+    private fun addArgumentToAnnotation(entry: KtAnnotationEntry, argument: String): Boolean {
+        // add new arguments to an existing entry
+        val args = entry.valueArgumentList
+        val psiFactory = KtPsiFactory(entry)
+        val newArgList = psiFactory.createCallArguments("($argument)")
+        when {
+            args == null -> // new argument list
+                entry.addAfter(newArgList, entry.lastChild)
+            args.arguments.isEmpty() -> // replace '()' with a new argument list
+                args.replace(newArgList)
+            args.arguments.none { it.textMatches(argument) } ->
+                args.addArgument(newArgList.arguments[0])
+        }
+
+        return true
+    }
+
+    private fun getLintId(intentionId: String) =
+            if (intentionId.startsWith(INTENTION_NAME_PREFIX)) intentionId.substring(INTENTION_NAME_PREFIX.length) else intentionId
+
+    private fun KtElement.isNewLineNeededForAnnotation(): Boolean {
+        return !(this is KtParameter ||
+                 this is KtTypeParameter ||
+                 this is KtPropertyAccessor)
+    }
+
+    private fun PsiElement.isSuppressLintTarget(): Boolean {
+        return this is KtDeclaration &&
+               (this as? KtProperty)?.hasBackingField() ?: true &&
+               this !is KtFunctionLiteral &&
+               this !is KtDestructuringDeclaration
+    }
+    private companion object {
+        val INTENTION_NAME_PREFIX = "AndroidLint"
+        val SUPPRESS_LINT_MESSAGE = "android.lint.fix.suppress.lint.api.annotation"
+        val FQNAME_SUPPRESS_LINT = FqName(SdkConstants.FQCN_SUPPRESS_LINT)
+    }
+}

idea/idea-android/tests/org/jetbrains/kotlin/android/quickfix/AbstractAndroidLintQuickfixTest.kt.as31

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.android.quickfix
+
+import com.intellij.codeInspection.InspectionProfileEntry
+import com.intellij.openapi.util.io.FileUtil
+import com.intellij.util.PathUtil
+import org.jetbrains.android.inspections.lint.AndroidLintInspectionBase
+import org.jetbrains.kotlin.android.KotlinAndroidTestCase
+import org.jetbrains.kotlin.test.InTextDirectivesUtils
+import java.io.File
+
+
+abstract class AbstractAndroidLintQuickfixTest : KotlinAndroidTestCase() {
+
+    override fun setUp() {
+        AndroidLintInspectionBase.invalidateInspectionShortName2IssueMap()
+        super.setUp()
+    }
+
+    fun doTest(path: String) {
+        val fileText = FileUtil.loadFile(File(path), true)
+        val intentionText = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// INTENTION_TEXT: ") ?: error("Empty intention text")
+        val mainInspectionClassName = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// INSPECTION_CLASS: ") ?: error("Empty inspection class name")
+        val dependency = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// DEPENDENCY: ")
+        val intentionAvailable = !InTextDirectivesUtils.isDirectiveDefined(fileText, "// INTENTION_NOT_AVAILABLE")
+
+        val inspection = Class.forName(mainInspectionClassName).newInstance() as InspectionProfileEntry
+        myFixture.enableInspections(inspection)
+
+        val sourceFile = myFixture.copyFileToProject(path, "src/${PathUtil.getFileName(path)}")
+        myFixture.configureFromExistingVirtualFile(sourceFile)
+
+        if (dependency != null) {
+            val (dependencyFile, dependencyTargetPath) = dependency.split(" -> ").map(String::trim)
+            myFixture.copyFileToProject("${PathUtil.getParentPath(path)}/$dependencyFile", "src/$dependencyTargetPath")
+        }
+
+        if (intentionAvailable) {
+            val intention = myFixture.getAvailableIntention(intentionText) ?: error("Failed to find intention")
+            myFixture.launchAction(intention)
+            myFixture.checkResultByFile(path + ".expected")
+        }
+        else {
+            assertNull("Intention should not be available", myFixture.availableIntentions.find { it.text == intentionText })
+        }
+    }
+}

idea/src/META-INF/android-lint.xml.as31

@@ -0,0 +1,8 @@
+<idea-plugin>
+    <extensions defaultExtensionNs="com.intellij">
+        <externalAnnotator language="kotlin" implementationClass="org.jetbrains.android.inspections.lint.AndroidLintExternalAnnotator"/>
+
+        <projectService serviceInterface="org.jetbrains.uast.kotlin.KotlinUastBindingContextProviderService"
+                        serviceImplementation="org.jetbrains.uast.kotlin.internal.IdeaKotlinUastBindingContextProviderService"/>
+    </extensions>
+</idea-plugin>

idea/src/META-INF/android.xml.as31

@@ -102,6 +102,10 @@
         <highlighterExtension implementation="org.jetbrains.kotlin.android.AndroidHighlighterExtension"/>
     </extensions>
 
+    <extensions defaultExtensionNs="org.jetbrains.android">
+        <androidLintQuickFixProvider implementation="org.jetbrains.kotlin.android.quickfix.KotlinAndroidQuickFixProvider" />
+    </extensions>
+
     <extensions defaultExtensionNs="org.jetbrains.kotlin.android.model">
         <androidModuleInfoProvider implementation="org.jetbrains.kotlin.android.model.impl.AndroidModuleInfoProviderImpl"/>
     </extensions>

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

@@ -0,0 +1,14 @@
+// INTENTION_TEXT: Add Parcelable Implementation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintParcelCreatorInspection
+import android.os.Parcel
+import android.os.Parcelable
+
+class <caret>MissingCreator : Parcelable {
+    override fun writeToParcel(dest: Parcel?, flags: Int) {
+        TODO("not implemented")
+    }
+
+    override fun describeContents(): Int {
+        TODO("not implemented")
+    }
+}

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

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

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

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+import kotlin.reflect.KClass
+
+annotation class SomeAnnotationWithClass(val cls: KClass<*>)
+
+@SomeAnnotationWithClass(<caret>VectorDrawable::class)
+class VectorDrawableProvider {
+}

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

@@ -0,0 +1,11 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    companion object {
+        val VECTOR_DRAWABLE = <caret>VectorDrawable()
+    }
+}

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

@@ -0,0 +1,10 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+
+
+fun withDefaultParameter(vector: VectorDrawable = <caret>VectorDrawable()) {
+
+}

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

@@ -0,0 +1,9 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+
+class MyVectorDrawable : <caret>VectorDrawable() {
+
+}

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

@@ -0,0 +1,13 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable {
+        with(this) {
+            return <caret>VectorDrawable()
+        }
+    }
+}

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

@@ -0,0 +1,9 @@
+// INTENTION_TEXT: Add @RequiresApi(KITKAT) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintInlinedApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+class Test {
+    fun foo(): Int {
+        return android.R.attr.<caret>windowTranslucentStatus
+    }
+}

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

@@ -0,0 +1,11 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable {
+        return <caret>VectorDrawable()
+    }
+}

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

@@ -0,0 +1,9 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    val VECTOR_DRAWABLE = <caret>VectorDrawable()
+}

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

@@ -0,0 +1,15 @@
+// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    val flag = false
+    fun getVectorDrawable(): VectorDrawable {
+        return when (flag) {
+            true -> <caret>VectorDrawable()
+            else -> VectorDrawable()
+        }
+    }
+}

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

@@ -0,0 +1,10 @@
+// INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSdCardPathInspection
+
+import android.app.Activity
+import android.os.Environment
+
+
+class MainActivity : Activity() {
+    fun getSdCard(fromEnvironment: Boolean) = if (fromEnvironment) Environment.getExternalStorageDirectory().path else "<caret>/sdcard"
+}

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

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSdCardPathInspection
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.os.Environment
+
+
+class MainActivity : Activity() {
+    @SuppressLint("Something")
+    fun getSdCard(fromEnvironment: Boolean) = if (fromEnvironment) Environment.getExternalStorageDirectory().path else "<caret>/sdcard"
+}

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

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

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

@@ -0,0 +1,9 @@
+// INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSdCardPathInspection
+
+fun foo() {
+    val (a: String, b: String) = "<caret>/sdcard"
+}
+
+operator fun CharSequence.component1(): String = "component1"
+operator fun CharSequence.component2(): String = "component2"

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

@@ -0,0 +1,10 @@
+// INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSdCardPathInspection
+
+fun foo(l: Any) = l
+
+fun bar() {
+    foo() {
+        "<caret>/sdcard"
+    }
+}

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

@@ -0,0 +1,6 @@
+// INTENTION_TEXT: Suppress: Add @SuppressLint("SdCardPath") annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintSdCardPathInspection
+
+fun foo(l: Any) = l
+
+val bar = foo() { "<caret>/sdcard" }

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

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

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

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

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

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

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

@@ -0,0 +1,11 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+import kotlin.reflect.KClass
+
+annotation class SomeAnnotationWithClass(val cls: KClass<*>)
+
+@SomeAnnotationWithClass(<caret>VectorDrawable::class)
+class VectorDrawableProvider {
+}

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

@@ -0,0 +1,10 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    companion object {
+        val VECTOR_DRAWABLE = <caret>VectorDrawable()
+    }
+}

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

@@ -0,0 +1,9 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+
+fun withDefaultParameter(vector: VectorDrawable = <caret>VectorDrawable()) {
+
+}

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

@@ -0,0 +1,8 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class MyVectorDrawable : <caret>VectorDrawable() {
+
+}

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

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable {
+        with(this) {
+            return <caret>VectorDrawable()
+        }
+    }
+}

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

@@ -0,0 +1,8 @@
+// INTENTION_TEXT: Add @TargetApi(KITKAT) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintInlinedApiInspection
+
+class Test {
+    fun foo(): Int {
+        return android.R.attr.<caret>windowTranslucentStatus
+    }
+}

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

@@ -0,0 +1,10 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable {
+        return <caret>VectorDrawable()
+    }
+}

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

@@ -0,0 +1,8 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    val VECTOR_DRAWABLE = <caret>VectorDrawable()
+}

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

@@ -0,0 +1,14 @@
+// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    val flag = false
+    fun getVectorDrawable(): VectorDrawable {
+        return when (flag) {
+            true -> <caret>VectorDrawable()
+            else -> VectorDrawable()
+        }
+    }
+}

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

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INTENTION_NOT_AVAILABLE
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+import kotlin.reflect.KClass
+
+annotation class SomeAnnotationWithClass(val cls: KClass<*>)
+
+@SomeAnnotationWithClass(<caret>VectorDrawable::class)
+class VectorDrawableProvider {
+}

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

@@ -0,0 +1,10 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INTENTION_NOT_AVAILABLE
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+
+fun withDefaultParameter(vector: VectorDrawable = <caret>VectorDrawable()) {
+
+}

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

@@ -0,0 +1,8 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable = <caret>VectorDrawable()
+}

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

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable {
+        with(this) {
+            return <caret>VectorDrawable()
+        }
+    }
+}

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

@@ -0,0 +1,12 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    val flag = false
+    fun getVectorDrawable(): VectorDrawable {
+        if (flag)
+            return <caret>VectorDrawable()
+    }
+}

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

@@ -0,0 +1,13 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    val flag = false
+    fun getVectorDrawable(): VectorDrawable {
+        if (flag) {
+            return <caret>VectorDrawable()
+        }
+    }
+}

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

@@ -0,0 +1,8 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.KITKAT) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintInlinedApiInspection
+
+class Test {
+    fun foo(): Int {
+        return android.R.attr.<caret>windowTranslucentStatus
+    }
+}

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

@@ -0,0 +1,10 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    fun getVectorDrawable(): VectorDrawable {
+        return <caret>VectorDrawable()
+    }
+}

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

@@ -0,0 +1,14 @@
+// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... }
+// INSPECTION_CLASS: org.jetbrains.android.inspections.lint.AndroidLintInspectionToolProvider$AndroidLintNewApiInspection
+
+import android.graphics.drawable.VectorDrawable
+
+class VectorDrawableProvider {
+    val flag = false
+    fun getVectorDrawable(): VectorDrawable {
+        return when (flag) {
+            true -> <caret>VectorDrawable()
+            else -> VectorDrawable()
+        }
+    }
+}