MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

preserve annotation attributes on override (IDEA-187940)

Browse Source
This commit is contained in:
Anna.Kozlova
2018-03-08 19:06:30 +01:00
parent 156b436799
commit e3f50d46d5
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementsAnnotationsHandler.java
+4 -1
View File
@@ -50,7 +50,10 @@ public interface OverrideImplementsAnnotationsHandler {
if (AnnotationUtil.isAnnotated(source, annotation, flags) && !AnnotationUtil.isAnnotated(target, annotation, flags)) {
PsiModifierList modifierList = target.getModifierList();
assert modifierList != null : target;
AddAnnotationPsiFix.addPhysicalAnnotation(annotation, PsiNameValuePair.EMPTY_ARRAY, modifierList);
PsiAnnotation srcAnnotation = AnnotationUtil.findAnnotation(source, annotation);
PsiNameValuePair[] valuePairs = srcAnnotation != null ? srcAnnotation.getParameterList().getAttributes()
: PsiNameValuePair.EMPTY_ARRAY;
AddAnnotationPsiFix.addPhysicalAnnotation(annotation, valuePairs, modifierList);
}
}
}
java/java-tests/testSrc/com/intellij/java/codeInsight/OverrideImplementTest.groovy
+5 -5
View File
@@ -284,7 +284,7 @@ class Test implements A {
}
void testCustomOverrideImplementsHandler() throws Exception {
myFixture.addClass """package a; public @interface A { }"""
myFixture.addClass """package a; public @interface A { String value();}"""
PlatformTestUtil.registerExtension(Extensions.getRootArea(), OverrideImplementsAnnotationsHandler.EP_NAME, new OverrideImplementsAnnotationsHandler() {
@Override
@@ -297,7 +297,7 @@ class Test implements A {
import a.*;
interface I {
@A List<String> i(@A String p);
@A("") List<String> i(@A("a") String p);
}
class C implements I {
@@ -311,13 +311,13 @@ class Test implements A {
import a.*;
interface I {
@A List<String> i(@A String p);
@A("") List<String> i(@A("a") String p);
}
class C implements I {
@A
@A("")
@Override
public List<String> i(@A String p) {
public List<String> i(@A("a") String p) {
return null;
}
}""".stripIndent()