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
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+1
View File
@@ -224,6 +224,7 @@ public interface Errors {
DiagnosticFactory0<KtExpression> ANNOTATION_PARAMETER_MUST_BE_ENUM_CONST = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<KtExpression> ANNOTATION_PARAMETER_DEFAULT_VALUE_MUST_BE_CONSTANT = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<KtAnnotatedExpression> ANNOTATIONS_ON_BLOCK_LEVEL_EXPRESSION_ON_THE_SAME_LINE = DiagnosticFactory0.create(WARNING);
DiagnosticFactory0<KtAnnotationEntry> ANNOTATION_USED_AS_ANNOTATION_ARGUMENT = DiagnosticFactory0.create(ERROR);
DiagnosticFactory0<PsiElement> ILLEGAL_SINCE_KOTLIN_VALUE = DiagnosticFactory0.create(ERROR);
DiagnosticFactory1<PsiElement, String> NEWER_VERSION_IN_SINCE_KOTLIN = DiagnosticFactory1.create(WARNING);
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
+2
View File
@@ -791,6 +791,8 @@ public class DefaultErrorMessages {
"Annotations on block-level expressions are being parsed differently depending on presence of a new line after them. " +
"Use new line if whole block-level expression must be annotated or wrap annotated expression in parentheses");
MAP.put(ANNOTATION_USED_AS_ANNOTATION_ARGUMENT, "An annotation can't be used as the annotations argument");
MAP.put(CONST_VAL_NOT_TOP_LEVEL_OR_OBJECT, "Const 'val' are only allowed on top level or in objects");
MAP.put(CONST_VAL_WITH_DELEGATE, "Const 'val' should not have a delegate");
MAP.put(CONST_VAL_WITH_GETTER, "Const 'val' should not have a getter");
compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationResolverImpl.java
+6 -2
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.resolve;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.*;
@@ -36,13 +37,12 @@ import org.jetbrains.kotlin.resolve.scopes.LexicalScope;
import org.jetbrains.kotlin.storage.StorageManager;
import org.jetbrains.kotlin.types.ErrorUtils;
import org.jetbrains.kotlin.types.KotlinType;
import org.jetbrains.kotlin.types.TypeUtils;
import org.jetbrains.kotlin.types.expressions.ExpressionTypingContext;
import javax.inject.Inject;
import java.util.ArrayList;
import java.util.List;
import static org.jetbrains.kotlin.diagnostics.Errors.ANNOTATION_USED_AS_ANNOTATION_ARGUMENT;
import static org.jetbrains.kotlin.diagnostics.Errors.NOT_AN_ANNOTATION_CLASS;
import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE;
@@ -148,6 +148,10 @@ public class AnnotationResolverImpl extends AnnotationResolver {
@NotNull LexicalScope scope,
@NotNull BindingTrace trace
) {
if (PsiTreeUtil.getParentOfType(annotationEntry, KtAnnotationEntry.class) != null) {
trace.report(ANNOTATION_USED_AS_ANNOTATION_ARGUMENT.on(annotationEntry));
}
return callResolver.resolveFunctionCall(
trace, scope,
CallMaker.makeCall(null, null, annotationEntry),
compiler/testData/diagnostics/tests/annotations/annotatedExpressionInsideAnnotation.kt
Vendored
+11
View File
@@ -0,0 +1,11 @@
// SKIP_ERRORS_BEFORE
annotation class X(val value: Y, val y: Y)
annotation class Y()
@X(<!ANNOTATION_USED_AS_ANNOTATION_ARGUMENT!>@Y()<!><!SYNTAX!><!>, y = Y())
fun foo1() {
}
@X(<!ANNOTATION_USED_AS_ANNOTATION_ARGUMENT!>@Y()<!><!SYNTAX!><!>, y = <!ANNOTATION_USED_AS_ANNOTATION_ARGUMENT!>@Y()<!><!SYNTAX!><!>)
fun foo2() {
}
compiler/testData/diagnostics/tests/annotations/annotatedExpressionInsideAnnotation.txt
Vendored
+20
View File
@@ -0,0 +1,20 @@
package
@X(y = Y) public fun foo1(): kotlin.Unit
@X public fun foo2(): kotlin.Unit
public final annotation class X : kotlin.Annotation {
public constructor X(/*0*/ value: Y, /*1*/ y: Y)
public final val value: Y
public final val y: Y
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final annotation class Y : kotlin.Annotation {
public constructor Y()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+6
View File
@@ -886,6 +886,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
doTest(fileName);
}
@TestMetadata("annotatedExpressionInsideAnnotation.kt")
public void testAnnotatedExpressionInsideAnnotation() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotatedExpressionInsideAnnotation.kt");
doTest(fileName);
}
@TestMetadata("AnnotatedLocalObjectFun.kt")
public void testAnnotatedLocalObjectFun() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectFun.kt");
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)