diff --git a/plugins/kotlin/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/plugins/kotlin/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 5648d4089d1b..e498f00fcb62 100755 --- a/plugins/kotlin/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/plugins/kotlin/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -24,10 +24,10 @@ import org.jetbrains.kotlin.allopen.AbstractBytecodeListingTestForAllOpen import org.jetbrains.kotlin.android.* import org.jetbrains.kotlin.android.configure.AbstractConfigureProjectTest import org.jetbrains.kotlin.android.folding.AbstractAndroidResourceFoldingTest -import org.jetbrains.kotlin.android.intentions.AbstractAndroidIntentionTest -import org.jetbrains.kotlin.android.intentions.AbstractAndroidResourceIntentionTest +import org.jetbrains.kotlin.android.quickfix.AbstractAndroidLintQuickfixTest +import org.jetbrains.kotlin.android.intention.AbstractAndroidResourceIntentionTest import org.jetbrains.kotlin.android.lint.AbstractKotlinLintTest -import org.jetbrains.kotlin.android.quickfixes.AbstractAndroidQuickFixMultiFileTest +import org.jetbrains.kotlin.android.quickfix.AbstractAndroidQuickFixMultiFileTest import org.jetbrains.kotlin.annotation.AbstractAnnotationProcessorBoxTest import org.jetbrains.kotlin.annotation.processing.test.sourceRetention.AbstractBytecodeListingTestForSourceRetention import org.jetbrains.kotlin.annotation.processing.test.wrappers.AbstractAnnotationProcessingTest @@ -1209,7 +1209,7 @@ fun main(args: Array) { } testClass { - model("android/resourceIntentions", extension = "test", singleClass = true) + model("android/resourceIntention", extension = "test", singleClass = true) } testClass { @@ -1220,8 +1220,8 @@ fun main(args: Array) { model("android/lint", excludeParentDirs = true) } - testClass { - model("android/intentions", pattern = "^([\\w\\-_]+)\\.kt$") + testClass { + model("android/lintQuickfix", pattern = "^([\\w\\-_]+)\\.kt$") } testClass { diff --git a/plugins/kotlin/idea/src/META-INF/android.xml b/plugins/kotlin/idea/src/META-INF/android.xml index 6d8713880681..003c7c434eae 100644 --- a/plugins/kotlin/idea/src/META-INF/android.xml +++ b/plugins/kotlin/idea/src/META-INF/android.xml @@ -19,7 +19,7 @@ - org.jetbrains.kotlin.android.intentions.KotlinAndroidAddStringResource + org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource Kotlin Android diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/RequiresApi.java b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/RequiresApi.java new file mode 100644 index 000000000000..ddd315876f9d --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/RequiresApi.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * 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 android.support.annotation; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; + +import static java.lang.annotation.RetentionPolicy.CLASS; + +/** + * Denotes that the annotated element should only be called on the given API level + * or higher. + *

+ * This is similar in purpose to the older {@code @TargetApi} annotation, but more + * clearly expresses that this is a requirement on the caller, rather than being + * used to "suppress" warnings within the method that exceed the {@code minSdkVersion}. + */ +@Retention(CLASS) +@Target({TYPE,METHOD,CONSTRUCTOR,FIELD}) +public @interface RequiresApi { + /** + * The API level to require. Alias for {@link #api} which allows you to leave out the + * {@code api=} part. + */ + @IntRange(from=1) + int value() default 1; + + /** The API level to require */ + @IntRange(from=1) + int api() default 1; +} diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt new file mode 100644 index 000000000000..dbf09a01c097 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt @@ -0,0 +1,12 @@ +// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection +// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java + +import android.graphics.drawable.VectorDrawable +import kotlin.reflect.KClass + +annotation class SomeAnnotationWithClass(val cls: KClass<*>) + +@SomeAnnotationWithClass(VectorDrawable::class) +class VectorDrawableProvider { +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.expected new file mode 100644 index 000000000000..2db4b45bc3fb --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/annotation.kt.expected @@ -0,0 +1,15 @@ +// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection +// 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 { +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/companion.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/companion.kt new file mode 100644 index 000000000000..d3325230e28a --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/companion.kt @@ -0,0 +1,11 @@ +// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection +// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java + +import android.graphics.drawable.VectorDrawable + +class VectorDrawableProvider { + companion object { + val VECTOR_DRAWABLE = VectorDrawable() + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/companion.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/companion.kt.expected new file mode 100644 index 000000000000..1858d14b7573 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/companion.kt.expected @@ -0,0 +1,14 @@ +// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection +// 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() + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/defaultParameter.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/defaultParameter.kt new file mode 100644 index 000000000000..9f7d6c647aab --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/defaultParameter.kt @@ -0,0 +1,10 @@ +// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection +// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java + +import android.graphics.drawable.VectorDrawable + + +fun withDefaultParameter(vector: VectorDrawable = VectorDrawable()) { + +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/defaultParameter.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/defaultParameter.kt.expected new file mode 100644 index 000000000000..31602b7a3ab9 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/defaultParameter.kt.expected @@ -0,0 +1,13 @@ +// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection +// 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()) { + +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/extend.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/extend.kt new file mode 100644 index 000000000000..7b955856b4b7 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/extend.kt @@ -0,0 +1,9 @@ +// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection +// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java + +import android.graphics.drawable.VectorDrawable + +class MyVectorDrawable : VectorDrawable() { + +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/extend.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/extend.kt.expected new file mode 100644 index 000000000000..1965006bd622 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/extend.kt.expected @@ -0,0 +1,12 @@ +// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection +// 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() { + +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/functionLiteral.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/functionLiteral.kt new file mode 100644 index 000000000000..9b04c508ebed --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/functionLiteral.kt @@ -0,0 +1,13 @@ +// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection +// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java + +import android.graphics.drawable.VectorDrawable + +class VectorDrawableProvider { + fun getVectorDrawable(): VectorDrawable { + with(this) { + return VectorDrawable() + } + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/functionLiteral.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/functionLiteral.kt.expected new file mode 100644 index 000000000000..fad5bf9a0688 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/functionLiteral.kt.expected @@ -0,0 +1,16 @@ +// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection +// 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() + } + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/method.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/method.kt new file mode 100644 index 000000000000..79068fceb87d --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/method.kt @@ -0,0 +1,11 @@ +// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection +// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java + +import android.graphics.drawable.VectorDrawable + +class VectorDrawableProvider { + fun getVectorDrawable(): VectorDrawable { + return VectorDrawable() + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/method.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/method.kt.expected new file mode 100644 index 000000000000..97c45ca47298 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/method.kt.expected @@ -0,0 +1,14 @@ +// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection +// 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() + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/property.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/property.kt new file mode 100644 index 000000000000..d4c0ae8be3a8 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/property.kt @@ -0,0 +1,9 @@ +// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection +// DEPENDENCY: RequiresApi.java -> android/support/annotation/RequiresApi.java + +import android.graphics.drawable.VectorDrawable + +class VectorDrawableProvider { + val VECTOR_DRAWABLE = VectorDrawable() +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/property.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/property.kt.expected new file mode 100644 index 000000000000..09a6dbc81570 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/property.kt.expected @@ -0,0 +1,12 @@ +// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection +// 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() +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/when.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/when.kt new file mode 100644 index 000000000000..67d45b87a8aa --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/when.kt @@ -0,0 +1,15 @@ +// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection +// 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 -> VectorDrawable() + else -> VectorDrawable() + } + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/when.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/when.kt.expected new file mode 100644 index 000000000000..3126a6e75bef --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/requiresApi/when.kt.expected @@ -0,0 +1,18 @@ +// INTENTION_TEXT: Add @RequiresApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection +// 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() + } + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/activityMethod.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/activityMethod.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/activityMethod.kt rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/activityMethod.kt diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/activityMethod.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/activityMethod.kt.expected similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/activityMethod.kt.expected rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/activityMethod.kt.expected diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/addToExistingAnnotation.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/addToExistingAnnotation.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/addToExistingAnnotation.kt rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/addToExistingAnnotation.kt diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/addToExistingAnnotation.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/addToExistingAnnotation.kt.expected similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/addToExistingAnnotation.kt.expected rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/addToExistingAnnotation.kt.expected diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/constructorParameter.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/constructorParameter.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/constructorParameter.kt rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/constructorParameter.kt diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/constructorParameter.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/constructorParameter.kt.expected similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/constructorParameter.kt.expected rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/constructorParameter.kt.expected diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/destructuringDeclaration.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/destructuringDeclaration.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/destructuringDeclaration.kt rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/destructuringDeclaration.kt diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/destructuringDeclaration.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/destructuringDeclaration.kt.expected similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/destructuringDeclaration.kt.expected rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/destructuringDeclaration.kt.expected diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/lambdaArgument.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/lambdaArgument.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/lambdaArgument.kt rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/lambdaArgument.kt diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/lambdaArgument.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/lambdaArgument.kt.expected similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/lambdaArgument.kt.expected rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/lambdaArgument.kt.expected diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/lambdaArgumentProperty.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/lambdaArgumentProperty.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/lambdaArgumentProperty.kt rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/lambdaArgumentProperty.kt diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/lambdaArgumentProperty.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/lambdaArgumentProperty.kt.expected similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/lambdaArgumentProperty.kt.expected rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/lambdaArgumentProperty.kt.expected diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/methodParameter.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/methodParameter.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/methodParameter.kt rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/methodParameter.kt diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/methodParameter.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/methodParameter.kt.expected similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/methodParameter.kt.expected rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/methodParameter.kt.expected diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/propertyWithLambda.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/propertyWithLambda.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/propertyWithLambda.kt rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/propertyWithLambda.kt diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/propertyWithLambda.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/propertyWithLambda.kt.expected similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/propertyWithLambda.kt.expected rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/propertyWithLambda.kt.expected diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/simpleProperty.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/simpleProperty.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/simpleProperty.kt rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/simpleProperty.kt diff --git a/plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/simpleProperty.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/simpleProperty.kt.expected similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/intentions/suppressLint/simpleProperty.kt.expected rename to plugins/kotlin/idea/tests/testData/android/lintQuickfix/suppressLint/simpleProperty.kt.expected diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt new file mode 100644 index 000000000000..f9f055359d70 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt @@ -0,0 +1,11 @@ +// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable +import kotlin.reflect.KClass + +annotation class SomeAnnotationWithClass(val cls: KClass<*>) + +@SomeAnnotationWithClass(VectorDrawable::class) +class VectorDrawableProvider { +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.expected new file mode 100644 index 000000000000..738d2a571d1b --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/annotation.kt.expected @@ -0,0 +1,14 @@ +// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +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 { +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/companion.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/companion.kt new file mode 100644 index 000000000000..a35ae52f4bce --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/companion.kt @@ -0,0 +1,10 @@ +// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable + +class VectorDrawableProvider { + companion object { + val VECTOR_DRAWABLE = VectorDrawable() + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/companion.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/companion.kt.expected new file mode 100644 index 000000000000..570322550cbf --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/companion.kt.expected @@ -0,0 +1,13 @@ +// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +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() + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/defaultParameter.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/defaultParameter.kt new file mode 100644 index 000000000000..8cff109b6cd5 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/defaultParameter.kt @@ -0,0 +1,9 @@ +// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable + + +fun withDefaultParameter(vector: VectorDrawable = VectorDrawable()) { + +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/defaultParameter.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/defaultParameter.kt.expected new file mode 100644 index 000000000000..1b00e2bc8199 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/defaultParameter.kt.expected @@ -0,0 +1,12 @@ +// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.annotation.TargetApi +import android.graphics.drawable.VectorDrawable +import android.os.Build + + +@TargetApi(Build.VERSION_CODES.LOLLIPOP) +fun withDefaultParameter(vector: VectorDrawable = VectorDrawable()) { + +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/extend.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/extend.kt new file mode 100644 index 000000000000..b47ea5737469 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/extend.kt @@ -0,0 +1,8 @@ +// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable + +class MyVectorDrawable : VectorDrawable() { + +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/extend.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/extend.kt.expected new file mode 100644 index 000000000000..6ea867dfef82 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/extend.kt.expected @@ -0,0 +1,11 @@ +// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.annotation.TargetApi +import android.graphics.drawable.VectorDrawable +import android.os.Build + +@TargetApi(Build.VERSION_CODES.LOLLIPOP) +class MyVectorDrawable : VectorDrawable() { + +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/functionLiteral.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/functionLiteral.kt new file mode 100644 index 000000000000..ea1b9c2c64b8 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/functionLiteral.kt @@ -0,0 +1,12 @@ +// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable + +class VectorDrawableProvider { + fun getVectorDrawable(): VectorDrawable { + with(this) { + return VectorDrawable() + } + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/functionLiteral.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/functionLiteral.kt.expected new file mode 100644 index 000000000000..3c31dd270f4d --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/functionLiteral.kt.expected @@ -0,0 +1,15 @@ +// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +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() + } + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/method.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/method.kt new file mode 100644 index 000000000000..4df86f64ee46 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/method.kt @@ -0,0 +1,10 @@ +// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable + +class VectorDrawableProvider { + fun getVectorDrawable(): VectorDrawable { + return VectorDrawable() + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/method.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/method.kt.expected new file mode 100644 index 000000000000..8e27e69701fa --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/method.kt.expected @@ -0,0 +1,13 @@ +// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +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() + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/property.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/property.kt new file mode 100644 index 000000000000..0cc187c454df --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/property.kt @@ -0,0 +1,8 @@ +// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable + +class VectorDrawableProvider { + val VECTOR_DRAWABLE = VectorDrawable() +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/property.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/property.kt.expected new file mode 100644 index 000000000000..9b8f9a4119e5 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/property.kt.expected @@ -0,0 +1,11 @@ +// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.annotation.TargetApi +import android.graphics.drawable.VectorDrawable +import android.os.Build + +@TargetApi(Build.VERSION_CODES.LOLLIPOP) +class VectorDrawableProvider { + val VECTOR_DRAWABLE = VectorDrawable() +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/when.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/when.kt new file mode 100644 index 000000000000..27a591914069 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/when.kt @@ -0,0 +1,14 @@ +// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable + +class VectorDrawableProvider { + val flag = false + fun getVectorDrawable(): VectorDrawable { + return when (flag) { + true -> VectorDrawable() + else -> VectorDrawable() + } + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/when.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/when.kt.expected new file mode 100644 index 000000000000..4ca486cdcbb3 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetApi/when.kt.expected @@ -0,0 +1,17 @@ +// INTENTION_TEXT: Add @TargetApi(LOLLIPOP) Annotation +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +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() + } + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/annotation.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/annotation.kt new file mode 100644 index 000000000000..e052b68c6e6e --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/annotation.kt @@ -0,0 +1,12 @@ +// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... } +// INTENTION_NOT_AVAILABLE +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable +import kotlin.reflect.KClass + +annotation class SomeAnnotationWithClass(val cls: KClass<*>) + +@SomeAnnotationWithClass(VectorDrawable::class) +class VectorDrawableProvider { +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/defaultParameter.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/defaultParameter.kt new file mode 100644 index 000000000000..97f5da238fa0 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/defaultParameter.kt @@ -0,0 +1,10 @@ +// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... } +// INTENTION_NOT_AVAILABLE +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable + + +fun withDefaultParameter(vector: VectorDrawable = VectorDrawable()) { + +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/expressionBody.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/expressionBody.kt new file mode 100644 index 000000000000..16ee93fa9982 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/expressionBody.kt @@ -0,0 +1,8 @@ +// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... } +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable + +class VectorDrawableProvider { + fun getVectorDrawable(): VectorDrawable = VectorDrawable() +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/expressionBody.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/expressionBody.kt.expected new file mode 100644 index 000000000000..4dbd098d2803 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/expressionBody.kt.expected @@ -0,0 +1,11 @@ +// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... } +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable +import android.os.Build + +class VectorDrawableProvider { + fun getVectorDrawable(): VectorDrawable = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + VectorDrawable() + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/functionLiteral.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/functionLiteral.kt new file mode 100644 index 000000000000..915c5c697a84 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/functionLiteral.kt @@ -0,0 +1,12 @@ +// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... } +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable + +class VectorDrawableProvider { + fun getVectorDrawable(): VectorDrawable { + with(this) { + return VectorDrawable() + } + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/functionLiteral.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/functionLiteral.kt.expected new file mode 100644 index 000000000000..375c7905f46d --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/functionLiteral.kt.expected @@ -0,0 +1,15 @@ +// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... } +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable +import android.os.Build + +class VectorDrawableProvider { + fun getVectorDrawable(): VectorDrawable { + with(this) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + return VectorDrawable() + } + } + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/if.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/if.kt new file mode 100644 index 000000000000..e2f81f2bbc0e --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/if.kt @@ -0,0 +1,12 @@ +// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... } +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable + +class VectorDrawableProvider { + val flag = false + fun getVectorDrawable(): VectorDrawable { + if (flag) + return VectorDrawable() + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/if.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/if.kt.expected new file mode 100644 index 000000000000..c1fe66e6c43e --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/if.kt.expected @@ -0,0 +1,15 @@ +// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... } +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable +import android.os.Build + +class VectorDrawableProvider { + val flag = false + fun getVectorDrawable(): VectorDrawable { + if (flag) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + return VectorDrawable() + } + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/ifWithBlock.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/ifWithBlock.kt new file mode 100644 index 000000000000..c74f3ee3ab68 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/ifWithBlock.kt @@ -0,0 +1,13 @@ +// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... } +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable + +class VectorDrawableProvider { + val flag = false + fun getVectorDrawable(): VectorDrawable { + if (flag) { + return VectorDrawable() + } + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/ifWithBlock.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/ifWithBlock.kt.expected new file mode 100644 index 000000000000..bb365b9d6f94 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/ifWithBlock.kt.expected @@ -0,0 +1,16 @@ +// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... } +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable +import android.os.Build + +class VectorDrawableProvider { + val flag = false + fun getVectorDrawable(): VectorDrawable { + if (flag) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + return VectorDrawable() + } + } + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/method.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/method.kt new file mode 100644 index 000000000000..a1bbff234aea --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/method.kt @@ -0,0 +1,10 @@ +// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... } +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable + +class VectorDrawableProvider { + fun getVectorDrawable(): VectorDrawable { + return VectorDrawable() + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/method.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/method.kt.expected new file mode 100644 index 000000000000..20a4c2038f58 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/method.kt.expected @@ -0,0 +1,13 @@ +// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... } +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable +import android.os.Build + +class VectorDrawableProvider { + fun getVectorDrawable(): VectorDrawable { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + return VectorDrawable() + } + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/when.kt b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/when.kt new file mode 100644 index 000000000000..11474aca9184 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/when.kt @@ -0,0 +1,14 @@ +// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... } +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +import android.graphics.drawable.VectorDrawable + +class VectorDrawableProvider { + val flag = false + fun getVectorDrawable(): VectorDrawable { + return when (flag) { + true -> VectorDrawable() + else -> VectorDrawable() + } + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/when.kt.expected b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/when.kt.expected new file mode 100644 index 000000000000..90ccdff38f1e --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/lintQuickfix/targetVersionCheck/when.kt.expected @@ -0,0 +1,17 @@ +// INTENTION_TEXT: Surround with if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) { ... } +// INSPECTION_CLASS: org.jetbrains.android.inspections.klint.AndroidLintInspectionToolProvider$AndroidKLintNewApiInspection + +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 -> VectorDrawable() + } + } +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/R.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/R.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/R.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/R.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/alreadyExists/R.java b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/alreadyExists/R.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/alreadyExists/R.java rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/alreadyExists/R.java diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/alreadyExists/alreadyExists.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/alreadyExists/alreadyExists.test similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/alreadyExists/alreadyExists.test rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/alreadyExists/alreadyExists.test diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/alreadyExists/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/alreadyExists/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/alreadyExists/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/alreadyExists/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/simpleFunction/R.java b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/simpleFunction/R.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/simpleFunction/R.java rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/simpleFunction/R.java diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/simpleFunction/expected/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/simpleFunction/expected/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/simpleFunction/expected/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/simpleFunction/expected/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/simpleFunction/expected/res/values/colors.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/simpleFunction/expected/res/values/colors.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/simpleFunction/expected/res/values/colors.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/simpleFunction/expected/res/values/colors.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/simpleFunction/expected/res/values/strings.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/simpleFunction/expected/res/values/strings.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/simpleFunction/expected/res/values/strings.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/simpleFunction/expected/res/values/strings.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/simpleFunction/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/simpleFunction/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/simpleFunction/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/simpleFunction/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/simpleFunction/simpleFunction.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/simpleFunction/simpleFunction.test similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createColorValueResource/simpleFunction/simpleFunction.test rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createColorValueResource/simpleFunction/simpleFunction.test diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/alreadyExists/R.java b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/alreadyExists/R.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/alreadyExists/R.java rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/alreadyExists/R.java diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/alreadyExists/alreadyExists.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/alreadyExists/alreadyExists.test similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/alreadyExists/alreadyExists.test rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/alreadyExists/alreadyExists.test diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/alreadyExists/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/alreadyExists/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/alreadyExists/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/alreadyExists/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/simpleFunction/R.java b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/R.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/simpleFunction/R.java rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/R.java diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/simpleFunction/expected/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/expected/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/simpleFunction/expected/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/expected/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/simpleFunction/expected/res/layout/activity_main.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/expected/res/layout/activity_main.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/simpleFunction/expected/res/layout/activity_main.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/expected/res/layout/activity_main.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/simpleFunction/expected/res/values/strings.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/expected/res/values/strings.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/simpleFunction/expected/res/values/strings.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/expected/res/values/strings.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/simpleFunction/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/simpleFunction/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/simpleFunction/simpleFunction.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/simpleFunction.test similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createLayoutResourceFile/simpleFunction/simpleFunction.test rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createLayoutResourceFile/simpleFunction/simpleFunction.test diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createStringValueResource/alreadyExists/R.java b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createStringValueResource/alreadyExists/R.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createStringValueResource/alreadyExists/R.java rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createStringValueResource/alreadyExists/R.java diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createStringValueResource/alreadyExists/alreadyExists.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createStringValueResource/alreadyExists/alreadyExists.test similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createStringValueResource/alreadyExists/alreadyExists.test rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createStringValueResource/alreadyExists/alreadyExists.test diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createStringValueResource/alreadyExists/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createStringValueResource/alreadyExists/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createStringValueResource/alreadyExists/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createStringValueResource/alreadyExists/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createStringValueResource/simpleFunction/R.java b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createStringValueResource/simpleFunction/R.java similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createStringValueResource/simpleFunction/R.java rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createStringValueResource/simpleFunction/R.java diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createStringValueResource/simpleFunction/expected/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createStringValueResource/simpleFunction/expected/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createStringValueResource/simpleFunction/expected/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createStringValueResource/simpleFunction/expected/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createStringValueResource/simpleFunction/expected/res/values/strings.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createStringValueResource/simpleFunction/expected/res/values/strings.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createStringValueResource/simpleFunction/expected/res/values/strings.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createStringValueResource/simpleFunction/expected/res/values/strings.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createStringValueResource/simpleFunction/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createStringValueResource/simpleFunction/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createStringValueResource/simpleFunction/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createStringValueResource/simpleFunction/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/createStringValueResource/simpleFunction/simpleFunction.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/createStringValueResource/simpleFunction/simpleFunction.test similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/createStringValueResource/simpleFunction/simpleFunction.test rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/createStringValueResource/simpleFunction/simpleFunction.test diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityExtension/activityExtension.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityExtension/activityExtension.test new file mode 100644 index 000000000000..d134935d769b --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityExtension/activityExtension.test @@ -0,0 +1,5 @@ +{ + "rFile": "../../R.kt", + "resDirectory": "../../res", + "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource" +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityExtension/expected/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityExtension/expected/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityExtension/expected/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityExtension/expected/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityExtension/expected/res/values/strings.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityExtension/expected/res/values/strings.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityExtension/expected/res/values/strings.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityExtension/expected/res/values/strings.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityExtension/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityExtension/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityExtension/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityExtension/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityMethod/activityMethod.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityMethod/activityMethod.test new file mode 100644 index 000000000000..d134935d769b --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityMethod/activityMethod.test @@ -0,0 +1,5 @@ +{ + "rFile": "../../R.kt", + "resDirectory": "../../res", + "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource" +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityMethod/expected/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityMethod/expected/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityMethod/expected/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityMethod/expected/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityMethod/expected/res/values/strings.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityMethod/expected/res/values/strings.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityMethod/expected/res/values/strings.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityMethod/expected/res/values/strings.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityMethod/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityMethod/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityMethod/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/activityMethod/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/classInActivity/classInActivity.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/classInActivity/classInActivity.test new file mode 100644 index 000000000000..d134935d769b --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/classInActivity/classInActivity.test @@ -0,0 +1,5 @@ +{ + "rFile": "../../R.kt", + "resDirectory": "../../res", + "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource" +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/classInActivity/expected/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/classInActivity/expected/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/classInActivity/expected/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/classInActivity/expected/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/classInActivity/expected/res/values/strings.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/classInActivity/expected/res/values/strings.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/classInActivity/expected/res/values/strings.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/classInActivity/expected/res/values/strings.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/classInActivity/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/classInActivity/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/classInActivity/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/classInActivity/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/extensionLambda/expected/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/extensionLambda/expected/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/extensionLambda/expected/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/extensionLambda/expected/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/extensionLambda/expected/res/values/strings.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/extensionLambda/expected/res/values/strings.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/extensionLambda/expected/res/values/strings.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/extensionLambda/expected/res/values/strings.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/extensionLambda/extensionLambda.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/extensionLambda/extensionLambda.test new file mode 100644 index 000000000000..d134935d769b --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/extensionLambda/extensionLambda.test @@ -0,0 +1,5 @@ +{ + "rFile": "../../R.kt", + "resDirectory": "../../res", + "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource" +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/extensionLambda/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/extensionLambda/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/extensionLambda/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/extensionLambda/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/function/expected/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/function/expected/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/function/expected/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/function/expected/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/function/expected/res/values/strings.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/function/expected/res/values/strings.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/function/expected/res/values/strings.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/function/expected/res/values/strings.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/function/function.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/function/function.test new file mode 100644 index 000000000000..d134935d769b --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/function/function.test @@ -0,0 +1,5 @@ +{ + "rFile": "../../R.kt", + "resDirectory": "../../res", + "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource" +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/function/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/function/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/function/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/function/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/genericContextExtensionFunction/expected/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/genericContextExtensionFunction/expected/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/genericContextExtensionFunction/expected/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/genericContextExtensionFunction/expected/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/genericContextExtensionFunction/expected/res/values/strings.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/genericContextExtensionFunction/expected/res/values/strings.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/genericContextExtensionFunction/expected/res/values/strings.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/genericContextExtensionFunction/expected/res/values/strings.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/genericContextExtensionFunction/genericContextExtensionFunction.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/genericContextExtensionFunction/genericContextExtensionFunction.test new file mode 100644 index 000000000000..d134935d769b --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/genericContextExtensionFunction/genericContextExtensionFunction.test @@ -0,0 +1,5 @@ +{ + "rFile": "../../R.kt", + "resDirectory": "../../res", + "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource" +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/genericContextExtensionFunction/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/genericContextExtensionFunction/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/genericContextExtensionFunction/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/genericContextExtensionFunction/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerClassInActivity/expected/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerClassInActivity/expected/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerClassInActivity/expected/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerClassInActivity/expected/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerClassInActivity/expected/res/values/strings.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerClassInActivity/expected/res/values/strings.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerClassInActivity/expected/res/values/strings.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerClassInActivity/expected/res/values/strings.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerClassInActivity/innerClassInActivity.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerClassInActivity/innerClassInActivity.test new file mode 100644 index 000000000000..d134935d769b --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerClassInActivity/innerClassInActivity.test @@ -0,0 +1,5 @@ +{ + "rFile": "../../R.kt", + "resDirectory": "../../res", + "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource" +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerClassInActivity/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerClassInActivity/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerClassInActivity/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerClassInActivity/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerViewInActivity/expected/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerViewInActivity/expected/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerViewInActivity/expected/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerViewInActivity/expected/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerViewInActivity/expected/res/values/strings.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerViewInActivity/expected/res/values/strings.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerViewInActivity/expected/res/values/strings.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerViewInActivity/expected/res/values/strings.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerViewInActivity/innerViewInActivity.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerViewInActivity/innerViewInActivity.test new file mode 100644 index 000000000000..d134935d769b --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerViewInActivity/innerViewInActivity.test @@ -0,0 +1,5 @@ +{ + "rFile": "../../R.kt", + "resDirectory": "../../res", + "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource" +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerViewInActivity/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerViewInActivity/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerViewInActivity/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/innerViewInActivity/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivity/expected/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivity/expected/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivity/expected/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivity/expected/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivity/expected/res/values/strings.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivity/expected/res/values/strings.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivity/expected/res/values/strings.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivity/expected/res/values/strings.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivity/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivity/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivity/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivity/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivity/objectInActivity.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivity/objectInActivity.test new file mode 100644 index 000000000000..d134935d769b --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivity/objectInActivity.test @@ -0,0 +1,5 @@ +{ + "rFile": "../../R.kt", + "resDirectory": "../../res", + "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource" +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivityMethod/expected/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivityMethod/expected/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivityMethod/expected/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivityMethod/expected/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivityMethod/expected/res/values/strings.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivityMethod/expected/res/values/strings.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivityMethod/expected/res/values/strings.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivityMethod/expected/res/values/strings.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivityMethod/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivityMethod/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivityMethod/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivityMethod/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivityMethod/objectInActivityMethod.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivityMethod/objectInActivityMethod.test new file mode 100644 index 000000000000..d134935d769b --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInActivityMethod/objectInActivityMethod.test @@ -0,0 +1,5 @@ +{ + "rFile": "../../R.kt", + "resDirectory": "../../res", + "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource" +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInFunction/expected/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInFunction/expected/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInFunction/expected/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInFunction/expected/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInFunction/expected/res/values/strings.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInFunction/expected/res/values/strings.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInFunction/expected/res/values/strings.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInFunction/expected/res/values/strings.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInFunction/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInFunction/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInFunction/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInFunction/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInFunction/objectInFunction.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInFunction/objectInFunction.test new file mode 100644 index 000000000000..d134935d769b --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/objectInFunction/objectInFunction.test @@ -0,0 +1,5 @@ +{ + "rFile": "../../R.kt", + "resDirectory": "../../res", + "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource" +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/stringTemplate/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/stringTemplate/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/stringTemplate/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/stringTemplate/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/stringTemplate/stringTemplate.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/stringTemplate/stringTemplate.test new file mode 100644 index 000000000000..774c4ef3d377 --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/stringTemplate/stringTemplate.test @@ -0,0 +1,4 @@ +{ + "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource", + "isApplicable": false +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewExtensionActivityMethod/expected/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewExtensionActivityMethod/expected/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewExtensionActivityMethod/expected/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewExtensionActivityMethod/expected/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewExtensionActivityMethod/expected/res/values/strings.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewExtensionActivityMethod/expected/res/values/strings.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewExtensionActivityMethod/expected/res/values/strings.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewExtensionActivityMethod/expected/res/values/strings.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewExtensionActivityMethod/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewExtensionActivityMethod/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewExtensionActivityMethod/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewExtensionActivityMethod/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewExtensionActivityMethod/viewExtensionActivityMethod.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewExtensionActivityMethod/viewExtensionActivityMethod.test new file mode 100644 index 000000000000..d134935d769b --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewExtensionActivityMethod/viewExtensionActivityMethod.test @@ -0,0 +1,5 @@ +{ + "rFile": "../../R.kt", + "resDirectory": "../../res", + "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource" +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewMethod/expected/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewMethod/expected/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewMethod/expected/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewMethod/expected/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewMethod/expected/res/values/strings.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewMethod/expected/res/values/strings.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewMethod/expected/res/values/strings.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewMethod/expected/res/values/strings.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewMethod/main.kt b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewMethod/main.kt similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewMethod/main.kt rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewMethod/main.kt diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewMethod/viewMethod.test b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewMethod/viewMethod.test new file mode 100644 index 000000000000..d134935d769b --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/android/resourceIntention/kotlinAndroidAddStringResource/viewMethod/viewMethod.test @@ -0,0 +1,5 @@ +{ + "rFile": "../../R.kt", + "resDirectory": "../../res", + "intentionClass": "org.jetbrains.kotlin.android.intention.KotlinAndroidAddStringResource" +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/res/values/strings.xml b/plugins/kotlin/idea/tests/testData/android/resourceIntention/res/values/strings.xml similarity index 100% rename from plugins/kotlin/idea/tests/testData/android/resourceIntentions/res/values/strings.xml rename to plugins/kotlin/idea/tests/testData/android/resourceIntention/res/values/strings.xml diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityExtension/activityExtension.test b/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityExtension/activityExtension.test deleted file mode 100644 index 8d7369829241..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityExtension/activityExtension.test +++ /dev/null @@ -1,5 +0,0 @@ -{ - "rFile": "../../R.kt", - "resDirectory": "../../res", - "intentionClass": "org.jetbrains.kotlin.android.intentions.KotlinAndroidAddStringResource" -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityMethod/activityMethod.test b/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityMethod/activityMethod.test deleted file mode 100644 index 8d7369829241..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/activityMethod/activityMethod.test +++ /dev/null @@ -1,5 +0,0 @@ -{ - "rFile": "../../R.kt", - "resDirectory": "../../res", - "intentionClass": "org.jetbrains.kotlin.android.intentions.KotlinAndroidAddStringResource" -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/classInActivity/classInActivity.test b/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/classInActivity/classInActivity.test deleted file mode 100644 index 8d7369829241..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/classInActivity/classInActivity.test +++ /dev/null @@ -1,5 +0,0 @@ -{ - "rFile": "../../R.kt", - "resDirectory": "../../res", - "intentionClass": "org.jetbrains.kotlin.android.intentions.KotlinAndroidAddStringResource" -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/extensionLambda/extensionLambda.test b/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/extensionLambda/extensionLambda.test deleted file mode 100644 index 8d7369829241..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/extensionLambda/extensionLambda.test +++ /dev/null @@ -1,5 +0,0 @@ -{ - "rFile": "../../R.kt", - "resDirectory": "../../res", - "intentionClass": "org.jetbrains.kotlin.android.intentions.KotlinAndroidAddStringResource" -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/function/function.test b/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/function/function.test deleted file mode 100644 index 8d7369829241..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/function/function.test +++ /dev/null @@ -1,5 +0,0 @@ -{ - "rFile": "../../R.kt", - "resDirectory": "../../res", - "intentionClass": "org.jetbrains.kotlin.android.intentions.KotlinAndroidAddStringResource" -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/genericContextExtensionFunction/genericContextExtensionFunction.test b/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/genericContextExtensionFunction/genericContextExtensionFunction.test deleted file mode 100644 index 8d7369829241..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/genericContextExtensionFunction/genericContextExtensionFunction.test +++ /dev/null @@ -1,5 +0,0 @@ -{ - "rFile": "../../R.kt", - "resDirectory": "../../res", - "intentionClass": "org.jetbrains.kotlin.android.intentions.KotlinAndroidAddStringResource" -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerClassInActivity/innerClassInActivity.test b/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerClassInActivity/innerClassInActivity.test deleted file mode 100644 index 8d7369829241..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerClassInActivity/innerClassInActivity.test +++ /dev/null @@ -1,5 +0,0 @@ -{ - "rFile": "../../R.kt", - "resDirectory": "../../res", - "intentionClass": "org.jetbrains.kotlin.android.intentions.KotlinAndroidAddStringResource" -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerViewInActivity/innerViewInActivity.test b/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerViewInActivity/innerViewInActivity.test deleted file mode 100644 index 8d7369829241..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/innerViewInActivity/innerViewInActivity.test +++ /dev/null @@ -1,5 +0,0 @@ -{ - "rFile": "../../R.kt", - "resDirectory": "../../res", - "intentionClass": "org.jetbrains.kotlin.android.intentions.KotlinAndroidAddStringResource" -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivity/objectInActivity.test b/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivity/objectInActivity.test deleted file mode 100644 index 8d7369829241..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivity/objectInActivity.test +++ /dev/null @@ -1,5 +0,0 @@ -{ - "rFile": "../../R.kt", - "resDirectory": "../../res", - "intentionClass": "org.jetbrains.kotlin.android.intentions.KotlinAndroidAddStringResource" -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivityMethod/objectInActivityMethod.test b/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivityMethod/objectInActivityMethod.test deleted file mode 100644 index 8d7369829241..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInActivityMethod/objectInActivityMethod.test +++ /dev/null @@ -1,5 +0,0 @@ -{ - "rFile": "../../R.kt", - "resDirectory": "../../res", - "intentionClass": "org.jetbrains.kotlin.android.intentions.KotlinAndroidAddStringResource" -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInFunction/objectInFunction.test b/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInFunction/objectInFunction.test deleted file mode 100644 index 8d7369829241..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/objectInFunction/objectInFunction.test +++ /dev/null @@ -1,5 +0,0 @@ -{ - "rFile": "../../R.kt", - "resDirectory": "../../res", - "intentionClass": "org.jetbrains.kotlin.android.intentions.KotlinAndroidAddStringResource" -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/stringTemplate/stringTemplate.test b/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/stringTemplate/stringTemplate.test deleted file mode 100644 index caafa4f89455..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/stringTemplate/stringTemplate.test +++ /dev/null @@ -1,4 +0,0 @@ -{ - "intentionClass": "org.jetbrains.kotlin.android.intentions.KotlinAndroidAddStringResource", - "isApplicable": false -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewExtensionActivityMethod/viewExtensionActivityMethod.test b/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewExtensionActivityMethod/viewExtensionActivityMethod.test deleted file mode 100644 index 8d7369829241..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewExtensionActivityMethod/viewExtensionActivityMethod.test +++ /dev/null @@ -1,5 +0,0 @@ -{ - "rFile": "../../R.kt", - "resDirectory": "../../res", - "intentionClass": "org.jetbrains.kotlin.android.intentions.KotlinAndroidAddStringResource" -} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewMethod/viewMethod.test b/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewMethod/viewMethod.test deleted file mode 100644 index 8d7369829241..000000000000 --- a/plugins/kotlin/idea/tests/testData/android/resourceIntentions/kotlinAndroidAddStringResource/viewMethod/viewMethod.test +++ /dev/null @@ -1,5 +0,0 @@ -{ - "rFile": "../../R.kt", - "resDirectory": "../../res", - "intentionClass": "org.jetbrains.kotlin.android.intentions.KotlinAndroidAddStringResource" -} \ No newline at end of file