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

Introduce error "ANNOTATION_USED_AS_ANNOTATION_ARGUMENT" along with QF

Browse Source 
The relevant inspection has been removed
So #KT-18855 Fixed
This commit is contained in:
Andrius Semionovas
2017-07-21 07:46:18 +03:00
committed by Mikhail Glukhikh
parent b81ca31aae
commit 68659f5a32
25 changed files with 163 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/inspectionDescriptions/RemoveAtFromAnnotationArgument.html
-5
View File
@@ -1,5 +0,0 @@
<html>
<body>
This inspection detects unnecessary '@' at annotations which are annotation arguments themselves.
</body>
</html>
idea/src/META-INF/plugin.xml
-14
View File
@@ -1412,11 +1412,6 @@
<category>Kotlin</category>
</intentionAction>
<intentionAction>
<className>org.jetbrains.kotlin.idea.intentions.RemoveAtFromAnnotationArgumentIntention</className>
<category>Kotlin</category>
</intentionAction>
<intentionAction>
<className>org.jetbrains.kotlin.idea.intentions.RemoveSingleExpressionStringTemplateIntention</className>
<category>Kotlin</category>
@@ -2038,15 +2033,6 @@
language="kotlin"
/>
<localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveAtFromAnnotationArgumentInspection"
displayName="Unnecessary @"
groupPath="Kotlin"
groupName="Probable bugs"
enabledByDefault="true"
level="WARNING"
language="kotlin"
/>
<localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ConvertLambdaToReferenceInspection"
displayName="Can be replaced with function reference"
groupPath="Kotlin"
idea/src/org/jetbrains/kotlin/idea/intentions/RemoveAtFromAnnotationArgumentIntention.kt
-44
View File
@@ -1,44 +0,0 @@
/*
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.idea.intentions
import com.intellij.openapi.editor.Editor
import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
import org.jetbrains.kotlin.psi.KtAnnotatedExpression
import org.jetbrains.kotlin.psi.KtAnnotationEntry
import org.jetbrains.kotlin.psi.KtPsiFactory
class RemoveAtFromAnnotationArgumentInspection : IntentionBasedInspection<KtAnnotatedExpression>(RemoveAtFromAnnotationArgumentIntention::class)
class RemoveAtFromAnnotationArgumentIntention : SelfTargetingOffsetIndependentIntention<KtAnnotatedExpression>(
KtAnnotatedExpression::class.java,
"Remove @ from annotation argument"
) {
override fun isApplicableTo(element: KtAnnotatedExpression): Boolean {
var parent = element.parent
while (parent != null) {
if (parent is KtAnnotationEntry) return true
parent = parent.parent
}
return false
}
override fun applyTo(element: KtAnnotatedExpression, editor: Editor?) {
val noAt = KtPsiFactory(element.project).createExpression(element.text.replaceFirst("@", ""))
element.replace(noAt)
}
}
idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
+2
View File
@@ -505,5 +505,7 @@ class QuickFixRegistrar : QuickFixContributor {
INAPPLICABLE_RECEIVER_TARGET.registerFactory(MoveReceiverAnnotationFix)
NO_CONSTRUCTOR.registerFactory(RemoveNoConstructorFix)
ANNOTATION_USED_AS_ANNOTATION_ARGUMENT.registerFactory(RemoveAtFromAnnotationArgument)
}
}
idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveAtFromAnnotationArgument.kt
+44
View File
@@ -0,0 +1,44 @@
/*
* Copyright 2010-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.idea.quickfix
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.psi.KtAnnotationEntry
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtPsiFactory
class RemoveAtFromAnnotationArgument(constructor: KtAnnotationEntry) : KotlinQuickFixAction<KtAnnotationEntry>(constructor) {
override fun getText() = "Remove @ from annotation argument"
override fun getFamilyName() = text
override fun invoke(project: Project, editor: Editor?, file: KtFile) {
val element = element ?: return
val noAt = KtPsiFactory(element.project).createExpression(element.text.replaceFirst("@", ""))
element.replace(noAt)
}
companion object : KotlinSingleIntentionActionFactory() {
override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<KtAnnotationEntry>? =
(diagnostic.psiElement as? KtAnnotationEntry)?.let { RemoveAtFromAnnotationArgument(it) }
}
}
idea/testData/intentions/removeAtFromAnnotationArgument/.intention
Vendored
-1
View File
@@ -1 +0,0 @@
org.jetbrains.kotlin.idea.intentions.RemoveAtFromAnnotationArgumentIntention
idea/testData/intentions/removeAtFromAnnotationArgument/atmarkArgument.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// INTENTION_TEXT: Remove @ from annotation argument
annotation class X(val value: Y)
annotation class Y()
@X(@Y()<caret>)
fun foo() {
}
idea/testData/intentions/removeAtFromAnnotationArgument/atmarkArgument.kt.after
Vendored
-8
View File
@@ -1,8 +0,0 @@
// INTENTION_TEXT: Remove @ from annotation argument
annotation class X(val value: Y)
annotation class Y()
@X(Y())
fun foo() {
}
idea/testData/intentions/removeAtFromAnnotationArgument/multipleAtmarkArguments.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
// INTENTION_TEXT: Remove @ from annotation argument
annotation class X(val value: Y, val y: Y)
annotation class Y()
@X(@Y(), y = @Y()<caret>)
fun foo() {
}
idea/testData/intentions/removeAtFromAnnotationArgument/multipleAtmarkArguments.kt.after
Vendored
-8
View File
@@ -1,8 +0,0 @@
// INTENTION_TEXT: Remove @ from annotation argument
annotation class X(val value: Y, val y: Y)
annotation class Y()
@X(@Y(), y = Y())
fun foo() {
}
idea/testData/intentions/removeAtFromAnnotationArgument/stringAtmark.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
// IS_APPLICABLE: false
annotation class X(val s: String)
@X("@@@"<caret>)
fun foo() {
}
idea/testData/intentions/removeAtFromAnnotationArgument/atmarkArrayArguments.kt → idea/testData/quickfix/removeAtFromAnnotationArgument/arrayParam.kt
Vendored
+3 -4
View File
@@ -1,9 +1,8 @@
// WITH_RUNTIME
// INTENTION_TEXT: Remove @ from annotation argument
// SKIP_ERRORS_BEFORE
// "Remove @ from annotation argument" "true"
// DISABLE-ERRORS
annotation class X(val value: Array<Y>)
annotation class Y()
annotation class X(val value: Array<Y>)
@X(arrayOf(Y(), @Y()<caret>))
fun foo() {
idea/testData/intentions/removeAtFromAnnotationArgument/atmarkArrayArguments.kt.after → idea/testData/quickfix/removeAtFromAnnotationArgument/arrayParam.kt.after
Vendored
+3 -4
View File
@@ -1,9 +1,8 @@
// WITH_RUNTIME
// INTENTION_TEXT: Remove @ from annotation argument
// SKIP_ERRORS_BEFORE
// "Remove @ from annotation argument" "true"
// DISABLE-ERRORS
annotation class X(val value: Array<Y>)
annotation class Y()
annotation class X(val value: Array<Y>)
@X(arrayOf(Y(), Y()))
fun foo() {
idea/testData/quickfix/removeAtFromAnnotationArgument/namedParam.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
// "Remove @ from annotation argument" "true"
// ERROR: An annotation parameter must be a compile-time constant
annotation class Y()
annotation class X(val value: Y, val y: Y)
@X(Y(), y = @Y()<caret>)
fun foo() {
}
idea/testData/quickfix/removeAtFromAnnotationArgument/namedParam.kt.after
Vendored
+10
View File
@@ -0,0 +1,10 @@
// "Remove @ from annotation argument" "true"
// ERROR: An annotation parameter must be a compile-time constant
annotation class Y()
annotation class X(val value: Y, val y: Y)
@X(Y(), y = Y())
fun foo() {
}
idea/testData/quickfix/removeAtFromAnnotationArgument/simple.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
// "Remove @ from annotation argument" "true"
// ERROR: An annotation parameter must be a compile-time constant
annotation class Y()
annotation class X(val value: Y)
@X(@Y()<caret>)
fun foo() {
}
idea/testData/quickfix/removeAtFromAnnotationArgument/simple.kt.after
Vendored
+9
View File
@@ -0,0 +1,9 @@
// "Remove @ from annotation argument" "true"
// ERROR: An annotation parameter must be a compile-time constant
annotation class Y()
annotation class X(val value: Y)
@X(Y())
fun foo() {
}
idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
-33
View File
@@ -12147,39 +12147,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
}
}
@TestMetadata("idea/testData/intentions/removeAtFromAnnotationArgument")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class RemoveAtFromAnnotationArgument extends AbstractIntentionTest {
public void testAllFilesPresentInRemoveAtFromAnnotationArgument() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeAtFromAnnotationArgument"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
}
@TestMetadata("atmarkArgument.kt")
public void testAtmarkArgument() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeAtFromAnnotationArgument/atmarkArgument.kt");
doTest(fileName);
}
@TestMetadata("atmarkArrayArguments.kt")
public void testAtmarkArrayArguments() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeAtFromAnnotationArgument/atmarkArrayArguments.kt");
doTest(fileName);
}
@TestMetadata("multipleAtmarkArguments.kt")
public void testMultipleAtmarkArguments() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeAtFromAnnotationArgument/multipleAtmarkArguments.kt");
doTest(fileName);
}
@TestMetadata("stringAtmark.kt")
public void testStringAtmark() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeAtFromAnnotationArgument/stringAtmark.kt");
doTest(fileName);
}
}
@TestMetadata("idea/testData/intentions/removeBraces")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+27
View File
@@ -8319,6 +8319,33 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
}
}
@TestMetadata("idea/testData/quickfix/removeAtFromAnnotationArgument")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class RemoveAtFromAnnotationArgument extends AbstractQuickFixTest {
public void testAllFilesPresentInRemoveAtFromAnnotationArgument() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/removeAtFromAnnotationArgument"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), TargetBackend.ANY, true);
}
@TestMetadata("arrayParam.kt")
public void testArrayParam() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/removeAtFromAnnotationArgument/arrayParam.kt");
doTest(fileName);
}
@TestMetadata("namedParam.kt")
public void testNamedParam() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/removeAtFromAnnotationArgument/namedParam.kt");
doTest(fileName);
}
@TestMetadata("simple.kt")
public void testSimple() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/removeAtFromAnnotationArgument/simple.kt");
doTest(fileName);
}
}
@TestMetadata("idea/testData/quickfix/removeEqTokenFromFunctionDeclaration")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)