format method according to javadoc rules (IDEA-69744 ) [roma]

(cherry picked from commit df32e7ef7079f182fefb2135b9213eed4df575c9)
This commit is contained in:
anna
2011-12-06 10:37:46 +01:00
parent 527df18788
commit 84e03a2c2b
3 changed files with 64 additions and 3 deletions
@@ -346,7 +346,11 @@ public class PsiFormatUtil extends PsiFormatUtilBase {
type = TypeConversionUtil.erasure(type);
} else if ((options & SHOW_RAW_NON_TOP_TYPE) != 0) {
if (!(PsiUtil.resolveClassInType(type) instanceof PsiTypeParameter)) {
final boolean preserveEllipsis = type instanceof PsiEllipsisType;
type = TypeConversionUtil.erasure(type);
if (preserveEllipsis && type instanceof PsiArrayType) {
type = new PsiEllipsisType(((PsiArrayType)type).getComponentType());
}
}
}
return (options & SHOW_FQ_CLASS_NAMES) == 0 ? type.getPresentableText() : type.getInternalCanonicalText();