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

[java] missing annotations on method return types

Browse Source
This commit is contained in:
Roman Shevchenko
2016-07-21 16:41:11 +02:00
parent efea9cb13b
commit 124285ee2a
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java
+16 -8
View File
@@ -28,6 +28,7 @@ import com.intellij.psi.util.PsiUtil;
import com.intellij.util.CharTable;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.JBIterable;
import com.intellij.util.containers.Stack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -92,7 +93,9 @@ public class JavaSharedImplUtil {
if (modifierList != null) {
PsiAnnotation[] annotations = modifierList.getAnnotations();
if (annotations.length > 0) {
TypeAnnotationProvider provider = new FilteringTypeAnnotationProvider(annotations);
TypeAnnotationProvider original =
modifierList.getParent() instanceof PsiMethod ? type.getAnnotationProvider() : TypeAnnotationProvider.EMPTY;
TypeAnnotationProvider provider = new FilteringTypeAnnotationProvider(annotations, original);
if (type instanceof PsiArrayType) {
Stack<PsiArrayType> types = new Stack<PsiArrayType>();
do {
@@ -196,10 +199,12 @@ public class JavaSharedImplUtil {
private static class FilteringTypeAnnotationProvider implements TypeAnnotationProvider {
private final PsiAnnotation[] myCandidates;
private final TypeAnnotationProvider myOriginalProvider;
private volatile PsiAnnotation[] myCache;
private FilteringTypeAnnotationProvider(PsiAnnotation[] candidates) {
private FilteringTypeAnnotationProvider(PsiAnnotation[] candidates, TypeAnnotationProvider originalProvider) {
myCandidates = candidates;
myOriginalProvider = originalProvider;
}
@NotNull
@@ -207,12 +212,15 @@ public class JavaSharedImplUtil {
public PsiAnnotation[] getAnnotations() {
PsiAnnotation[] result = myCache;
if (result == null) {
List<PsiAnnotation> filtered = ContainerUtil.filter(myCandidates, new Condition<PsiAnnotation>() {
@Override
public boolean value(PsiAnnotation annotation) {
return AnnotationTargetUtil.isTypeAnnotation(annotation);
}
});
List<PsiAnnotation> filtered = JBIterable.of(myCandidates)
.filter(new Condition<PsiAnnotation>() {
@Override
public boolean value(PsiAnnotation annotation) {
return AnnotationTargetUtil.isTypeAnnotation(annotation);
}
})
.append(myOriginalProvider.getAnnotations())
.toList();
myCache = result = filtered.isEmpty() ? PsiAnnotation.EMPTY_ARRAY : filtered.toArray(new PsiAnnotation[filtered.size()]);
}
return result;
java/java-tests/testSrc/com/intellij/codeInsight/psi/AnnotatedTypeTest.groovy
+5 -7
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-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.
@@ -36,9 +36,7 @@ class AnnotatedTypeTest extends LightCodeInsightFixtureTestCase {
@interface A { }
@Target(ElementType.TYPE_USE) @interface TA { int value() default 42; }
class O {
class I { }
}
class O { class I { } }
@SuppressWarnings("ExceptionClassNameDoesntEndWithException") class E1 extends Exception { }
@SuppressWarnings("ExceptionClassNameDoesntEndWithException") class E2 extends Exception { }""".stripIndent())
@@ -101,9 +99,9 @@ class AnnotatedTypeTest extends LightCodeInsightFixtureTestCase {
}
public void testMethodReturnType() {
def psi = factory.createMethodFromText("@A @TA(1) String m() { return null; }", context)
assertTypeText psi.returnType, "java.lang.@pkg.TA(1) String", "java.lang.String"
assertAnnotations psi.returnType, "@TA(1)"
def psi = factory.createMethodFromText("@A @TA(1) <T> @TA(2) String m() { return null; }", context)
assertTypeText psi.returnType, "java.lang.@pkg.TA(1) @pkg.TA(2) String", "java.lang.String"
assertAnnotations psi.returnType, "@TA(1)", "@TA(2)"
}
private void doTest(String text, String annotated, String canonical) {