azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Experimental fixes: additional tests, handle local declarations

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-05-23 18:21:18 +03:00
parent 51fba03253
commit a76bb80e4d
7 changed files with 125 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/ExperimentalFixesFactory.kt
+9 -5
View File
@@ -15,11 +15,9 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
import org.jetbrains.kotlin.idea.core.toDescriptor
import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.psi.KtCallableDeclaration
import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypesAndPredicate
import org.jetbrains.kotlin.resolve.AnnotationChecker
import org.jetbrains.kotlin.resolve.checkers.ExperimentalUsageChecker
import org.jetbrains.kotlin.resolve.descriptorUtil.module
@@ -27,7 +25,13 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.module
object ExperimentalFixesFactory : KotlinIntentionActionsFactory() {
override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> {
val element = diagnostic.psiElement
val containingDeclaration: KtDeclaration = element.getStrictParentOfType() ?: return emptyList()
val containingDeclaration: KtDeclaration = element.getParentOfTypesAndPredicate(
true,
KtDeclarationWithBody::class.java,
KtClassOrObject::class.java
) {
!KtPsiUtil.isLocal(it)
} ?: return emptyList()
val factory = diagnostic.factory
val annotationFqName = when (factory) {
idea/testData/quickfix/experimental/functionInLocalClass.kt
Vendored
+20
View File
@@ -0,0 +1,20 @@
// "Add '@MyExperimentalAPI' annotation to 'outer'" "true"
// COMPILER_ARGUMENTS: -Xuse-experimental=kotlin.Experimental
// WITH_RUNTIME
@Experimental
@Target(AnnotationTarget.FUNCTION)
annotation class MyExperimentalAPI
open class Base {
@MyExperimentalAPI
open fun foo() {}
}
class Outer {
fun outer() {
class Derived : Base() {
override fun foo<caret>() {}
}
}
}
idea/testData/quickfix/experimental/functionInLocalClass.kt.after
Vendored
+21
View File
@@ -0,0 +1,21 @@
// "Add '@MyExperimentalAPI' annotation to 'outer'" "true"
// COMPILER_ARGUMENTS: -Xuse-experimental=kotlin.Experimental
// WITH_RUNTIME
@Experimental
@Target(AnnotationTarget.FUNCTION)
annotation class MyExperimentalAPI
open class Base {
@MyExperimentalAPI
open fun foo() {}
}
class Outer {
@MyExperimentalAPI
fun outer() {
class Derived : Base() {
override fun foo<caret>() {}
}
}
}
idea/testData/quickfix/experimental/localFunction.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
// "Add '@MyExperimentalAPI' annotation to 'outer'" "true"
// COMPILER_ARGUMENTS: -Xuse-experimental=kotlin.Experimental
// WITH_RUNTIME
@Experimental
annotation class MyExperimentalAPI
@MyExperimentalAPI
fun foo() {}
fun outer() {
fun bar() {
foo<caret>()
}
}
idea/testData/quickfix/experimental/localFunction.kt.after
Vendored
+16
View File
@@ -0,0 +1,16 @@
// "Add '@MyExperimentalAPI' annotation to 'outer'" "true"
// COMPILER_ARGUMENTS: -Xuse-experimental=kotlin.Experimental
// WITH_RUNTIME
@Experimental
annotation class MyExperimentalAPI
@MyExperimentalAPI
fun foo() {}
@MyExperimentalAPI
fun outer() {
fun bar() {
foo()
}
}
idea/testData/quickfix/experimental/nestedClasses.kt
Vendored
+23
View File
@@ -0,0 +1,23 @@
// "Add '@MyExperimentalAPI' annotation to containing class 'Outer'" "false"
// COMPILER_ARGUMENTS: -Xuse-experimental=kotlin.Experimental
// WITH_RUNTIME
// ACTION: Add '@MyExperimentalAPI' annotation to 'bar'
// ACTION: Add '@MyExperimentalAPI' annotation to containing class 'Inner'
// ACTION: Add '@UseExperimental(MyExperimentalAPI::class)' annotation to 'bar'
// ERROR: This declaration is experimental and its usage must be marked with '@MyExperimentalAPI' or '@UseExperimental(MyExperimentalAPI::class)'
@Experimental
annotation class MyExperimentalAPI
@MyExperimentalAPI
fun foo() {}
class Outer {
class Bar {
class Inner {
fun bar() {
foo<caret>()
}
}
}
}
idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
Generated
+21 -12
View File
@@ -1645,38 +1645,32 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
@TestMetadata("removeUnusedParameterWithTypeParameter.kt")
public void testRemoveUnusedParameterWithTypeParameter() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter.kt");
doTest(fileName);
runTest("idea/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter.kt");
}
@TestMetadata("removeUnusedParameterWithTypeParameter2.kt")
public void testRemoveUnusedParameterWithTypeParameter2() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter2.kt");
doTest(fileName);
runTest("idea/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter2.kt");
}
@TestMetadata("removeUnusedParameterWithTypeParameter3.kt")
public void testRemoveUnusedParameterWithTypeParameter3() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter3.kt");
doTest(fileName);
runTest("idea/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter3.kt");
}
@TestMetadata("removeUnusedParameterWithTypeParameter4.kt")
public void testRemoveUnusedParameterWithTypeParameter4() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter4.kt");
doTest(fileName);
runTest("idea/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter4.kt");
}
@TestMetadata("removeUnusedParameterWithTypeParameter5.kt")
public void testRemoveUnusedParameterWithTypeParameter5() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter5.kt");
doTest(fileName);
runTest("idea/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter5.kt");
}
@TestMetadata("removeUnusedParameterWithTypeParameter6.kt")
public void testRemoveUnusedParameterWithTypeParameter6() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter6.kt");
doTest(fileName);
runTest("idea/testData/quickfix/changeSignature/removeUnusedParameterWithTypeParameter6.kt");
}
@TestMetadata("removeUnusedPrimaryConstructorParameter.kt")
@@ -6063,6 +6057,21 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
runTest("idea/testData/quickfix/experimental/classUseExperimental.kt");
}
@TestMetadata("functionInLocalClass.kt")
public void testFunctionInLocalClass() throws Exception {
runTest("idea/testData/quickfix/experimental/functionInLocalClass.kt");
}
@TestMetadata("localFunction.kt")
public void testLocalFunction() throws Exception {
runTest("idea/testData/quickfix/experimental/localFunction.kt");
}
@TestMetadata("nestedClasses.kt")
public void testNestedClasses() throws Exception {
runTest("idea/testData/quickfix/experimental/nestedClasses.kt");
}
@TestMetadata("override.kt")
public void testOverride() throws Exception {
runTest("idea/testData/quickfix/experimental/override.kt");