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

quick doc: fix class type params around <> (IDEA-113445)

Browse Source
This commit is contained in:
anna
2013-10-23 20:19:50 +02:00
parent 59d9a71d6c
commit fa8eca5d9b
4 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java
+2 -2
View File
@@ -194,7 +194,7 @@ public class JavaDocumentationProvider implements CodeDocumentationProvider, Ext
if (aClass.hasTypeParameters()) {
PsiTypeParameter[] parms = aClass.getTypeParameters();
buffer.append("<");
buffer.append("&lt;");
for (int i = 0; i < parms.length; i++) {
PsiTypeParameter p = parms[i];
@@ -220,7 +220,7 @@ public class JavaDocumentationProvider implements CodeDocumentationProvider, Ext
}
}
buffer.append(">");
buffer.append("&gt;");
}
PsiClassType[] refs;
java/java-tests/testData/codeInsight/javadocIG/classTypeParamsPresentation.html
+3
View File
@@ -0,0 +1,3 @@
[&lt; java 1.7 &gt;] java.util
public class java.util.ArrayList&lt;E&gt; extends java.util.AbstractList&lt;E&gt;
implements java.util.List&lt;E&gt;, java.util.RandomAccess, java.lang.Cloneable, java.io.Serializable
java/java-tests/testData/codeInsight/javadocIG/classTypeParamsPresentation.java
+2
View File
@@ -0,0 +1,2 @@
import java.util.*;
class A extends ArrayList<String> {}
java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java
+12
View File
@@ -82,6 +82,18 @@ public class JavaDocInfoGeneratorTest extends CodeInsightTestCase {
assertEquals(StringUtil.convertLineSeparators(htmlText.trim()), StringUtil.convertLineSeparators(docInfo.trim()));
}
public void testClassTypeParamsPresentation() throws Exception {
PsiClass psiClass = getTestClass();
final PsiReferenceList extendsList = psiClass.getExtendsList();
final PsiJavaCodeReferenceElement referenceElement = extendsList.getReferenceElements()[0];
final PsiClass superClass = extendsList.getReferencedTypes()[0].resolve();
final File htmlPath = new File(JavaTestUtil.getJavaTestDataPath() + "/codeInsight/javadocIG/" + getTestName(true) + ".html");
String htmlText = FileUtil.loadFile(htmlPath);
String docInfo = new JavaDocumentationProvider().getQuickNavigateInfo(superClass, referenceElement);
assertNotNull(docInfo);
assertEquals(StringUtil.convertLineSeparators(htmlText.trim()), StringUtil.convertLineSeparators(docInfo.trim()));
}
private void doTestField() throws Exception {
PsiClass psiClass = getTestClass();
PsiField field = psiClass.getFields() [0];