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

accept intersection types in javadoc

Browse Source
This commit is contained in:
anna
2013-10-31 19:05:40 +01:00
parent cbb010adae
commit 7445e7fdc2
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
+11 -3
View File
@@ -1661,7 +1661,7 @@ public class JavaDocInfoGenerator {
return length;
}
if (type instanceof PsiDisjunctionType) {
if (type instanceof PsiDisjunctionType || type instanceof PsiIntersectionType) {
if (!generateLink) {
final String text = StringUtil.escapeXml(type.getCanonicalText());
buffer.append(text);
@@ -1669,9 +1669,17 @@ public class JavaDocInfoGenerator {
}
else {
int length = 0;
for (PsiType psiType : ((PsiDisjunctionType)type).getDisjunctions()) {
final String separator = type instanceof PsiDisjunctionType ? " | " : " & ";
final List<PsiType> componentTypes;
if (type instanceof PsiIntersectionType) {
componentTypes = Arrays.asList(((PsiIntersectionType)type).getConjuncts());
}
else {
componentTypes = ((PsiDisjunctionType)type).getDisjunctions();
}
for (PsiType psiType : componentTypes) {
if (length > 0) {
buffer.append(" | ");
buffer.append(separator);
length += 3;
}
length += generateType(buffer, psiType, context, generateLink);