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

[javadoc-tests] Test for external type annotations (IDEA-231901); bump default level to 21

Browse Source 
GitOrigin-RevId: 184754528a776dbd7545cecb7da625840e2cbffe
This commit is contained in:
Tagir Valeev
2024-09-19 19:06:26 +00:00
committed by intellij-monorepo-bot
parent be4f6cd282
commit f7a5a79a2e
7 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/javadocIG/classTypeParamsPresentation.html
+1 -1
View File
@@ -1 +1 @@
<span style="color: #909090">[&lt; java 1.7 &gt;] </span><a href="psi_element://java.util">java.util</a><br/> <span style="color:#000080;font-weight:bold;">public</span> <span style="color:#000080;font-weight:bold;">class</span> <span style="color:#000000;">ArrayList</span><span style="">&lt;</span><span style="color:#20999d;">E</span><span style="">&gt;</span><span style="color:#000080;font-weight:bold;"> extends </span><span style="color:#000000;"><a href="psi_element://java.util.AbstractList">AbstractList</a></span><span style="">&lt;</span><span style="color:#20999d;">E</span><span style="">&gt;</span><br/> <span style="color:#000080;font-weight:bold;">implements </span><span style="color:#000000;"><a href="psi_element://java.util.List">List</a></span><span style="">&lt;</span><span style="color:#20999d;">E</span><span style="">&gt;</span><span style="">, </span><span style="color:#000000;"><a href="psi_element://java.util.RandomAccess">RandomAccess</a></span><span style="">, </span><span style="color:#000000;"><a href="psi_element://java.lang.Cloneable">Cloneable</a></span><span style="">, </span><span style="color:#000000;"><a href="psi_element://java.io.Serializable">Serializable</a></span>
<span style="color: #909090">[&lt; java 21 &gt;] </span><a href="psi_element://java.util">java.util</a><br/> <span style="color:#000080;font-weight:bold;">public</span> <span style="color:#000080;font-weight:bold;">class</span> <span style="color:#000000;">ArrayList</span><span style="">&lt;</span><span style="color:#20999d;">E</span><span style="">&gt;</span><span style="color:#000080;font-weight:bold;"> extends </span><span style="color:#000000;"><a href="psi_element://java.util.AbstractList">AbstractList</a></span><span style="">&lt;</span><span style="color:#20999d;">E</span><span style="">&gt;</span><br/> <span style="color:#000080;font-weight:bold;">implements </span><span style="color:#000000;"><a href="psi_element://java.util.List">List</a></span><span style="">&lt;</span><span style="color:#20999d;">E</span><span style="">&gt;</span><span style="">, </span><span style="color:#000000;"><a href="psi_element://java.util.RandomAccess">RandomAccess</a></span><span style="">, </span><span style="color:#000000;"><a href="psi_element://java.lang.Cloneable">Cloneable</a></span><span style="">, </span><span style="color:#000000;"><a href="psi_element://java.io.Serializable">Serializable</a></span>
java/java-tests/testData/codeInsight/javadocIG/externalTypeAnnotations.html
+2
View File
@@ -0,0 +1,2 @@
<html><head><base href="placeholder"></head><body><div class="bottom"><icon src="AllIcons.Nodes.Class">&nbsp;<a href="psi_element://java.util.concurrent.CompletableFuture"><code><span style="color:#000000;">java.util.concurrent.CompletableFuture</span><span style="">&lt;</span><span style="color:#20999d;">T</span><span style="">&gt;</span></code></a></div><div class='definition'><pre><span style="color:#808000;">@</span><span style="color:#808000;">NotNull</span><a href="external.annotations"><icon src="AllIcons.Ide.External_link_arrow"></a>&nbsp;
<span style="color:#000080;font-weight:bold;">public</span>&nbsp;<a href="psi_element://java.util.concurrent.CompletableFuture"><code><span style="color:#000000;">CompletableFuture</span></code></a><span style="">&lt;</span><span style="color:#20999d;">T</span><span style="">&gt;</span>&nbsp;<span style="color:#000000;">whenComplete</span><span style="">(</span><br> <span style="color:#808000;">@</span><span style="color:#808000;">NotNull</span><a href="external.annotations"><icon src="AllIcons.Ide.External_link_arrow"></a>&nbsp;<a href="psi_element://java.util.function.BiConsumer"><code><span style="color:#000000;">java.util.function.BiConsumer</span></code></a><span style="">&lt;</span><span style="">?</span><span style="color:#000080;font-weight:bold;"> super </span><span style="color:#808000;">@</span><span style="color:#808000;">UnknownNullability</span><a href="external.annotations"><icon src="AllIcons.Ide.External_link_arrow"></a>&nbsp;<span style="color:#20999d;">T</span><span style="">, </span><span style="">?</span><span style="color:#000080;font-weight:bold;"> super </span><span style="color:#808000;">@</span><span style="color:#808000;">UnknownNullability</span><a href="external.annotations"><icon src="AllIcons.Ide.External_link_arrow"></a>&nbsp;<a href="psi_element://java.lang.Throwable"><code><span style="color:#000000;">Throwable</span></code></a><span style="">&gt;</span>&nbsp;<span style="color:#000000;">action</span><br><span style="">)</span></pre></div><table class='sections'><p><tr><td valign='top' class='section'><p>Specified by:</td><td valign='top'><p><a href="psi_element://java.util.concurrent.CompletionStage#whenComplete(java.util.function.BiConsumer)"><code><span style="color:#000000;">whenComplete</span></code></a> in interface <a href="psi_element://java.util.concurrent.CompletionStage"><code><span style="color:#000000;">CompletionStage</span></code></a></td></table>
java/java-tests/testData/codeInsight/javadocIG/fieldInitializedWithLambda.html
+1 -1
View File
@@ -1 +1 @@
<html><head><base href="placeholder"></head><body><div class="bottom"><icon src="AllIcons.Nodes.Class">&nbsp;<a href="psi_element://A"><code><span style="color:#000000;">A</span></code></a></div><div class='definition'><pre><span style="color:#000080;font-weight:bold;">public static</span> <span style="color:#ff0000">java.util.function.Consumer&lt;Integer&gt;</span> <span style="color:#660e7a;font-style:italic;">F</span> <span style="">= </span><span style="">i&#32;-&gt;&#32;System.out.println(i)</span></pre></div><table class='sections'></table>
<html><head><base href="placeholder"></head><body><div class="bottom"><icon src="AllIcons.Nodes.Class">&nbsp;<a href="psi_element://A"><code><span style="color:#000000;">A</span></code></a></div><div class='definition'><pre><span style="color:#000080;font-weight:bold;">public static</span> <a href="psi_element://java.util.function.Consumer"><code><span style="color:#000000;">java.util.function.Consumer</span></code></a><span style="">&lt;</span><a href="psi_element://java.lang.Integer"><code><span style="color:#000000;">Integer</span></code></a><span style="">&gt;</span> <span style="color:#660e7a;font-style:italic;">F</span> <span style="">= </span><span style="">i&#32;-&gt;&#32;System.out.println(i)</span></pre></div><table class='sections'></table>
java/java-tests/testData/codeInsight/javadocIG/ideadev2326.html
+1 -1
View File
@@ -1,2 +1,2 @@
<html><head><base href="placeholder"></head><body><div class="bottom"><icon src="AllIcons.Nodes.Class">&nbsp;<a href="psi_element://Idea4780"><code><span style="color:#000000;">Idea4780</span></code></a></div><div class='definition'><pre><span style="color:#000080;font-weight:bold;">public</span>&nbsp;<a href="psi_element://java.lang.Object"><code><span style="color:#000000;">Object</span></code></a>&nbsp;<span style="color:#000000;">read</span><span style="">(</span><span style="">)</span>
<span style="color:#000080;font-weight:bold;">throws</span>&nbsp;<a href="psi_element://java.io.IOException"><code><span style="color:#000000;">IOException</span></code></a></pre></div><table class='sections'><p><tr><td valign='top' class='section'><p>Throws:</td><td valign='top'><p><a href="psi_element://java.io.IOException"><code><span style="color:#0000ff;">IOException</span></code></a> &ndash; if an I/O error occurs while reading. <p><a href="psi_element://java.io.EOFException"><code><span style="color:#0000ff;">EOFException</span></code></a> &ndash; if this source is already closed when the <code>read()</code> is called, or is closed during the <code>read()</code>. <p><span style="color:#ff0000">InterruptedIOException</span> &ndash; if the reading thread is interrupted.</td></table>
<span style="color:#000080;font-weight:bold;">throws</span>&nbsp;<a href="psi_element://java.io.IOException"><code><span style="color:#000000;">IOException</span></code></a></pre></div><table class='sections'><p><tr><td valign='top' class='section'><p>Throws:</td><td valign='top'><p><a href="psi_element://java.io.IOException"><code><span style="color:#0000ff;">IOException</span></code></a> &ndash; if an I/O error occurs while reading. <p><a href="psi_element://java.io.EOFException"><code><span style="color:#0000ff;">EOFException</span></code></a> &ndash; if this source is already closed when the <code>read()</code> is called, or is closed during the <code>read()</code>. <p><a href="psi_element://java.io.InterruptedIOException"><code><span style="color:#0000ff;">InterruptedIOException</span></code></a> &ndash; if the reading thread is interrupted.</td></table>
java/java-tests/testData/codeInsight/javadocIG/recordParameters.html
+1 -1
View File
@@ -1,4 +1,4 @@
<html><head><base href="placeholder"></head><body><div class='definition'><pre><span style="color:#000080;font-weight:bold;">record</span> <span style="color:#000000;">Test</span>
<span style="color:#000080;font-weight:bold;">extends</span> <span style="color:#ff0000">java.lang.Record</span></pre></div><div class='content'>
<span style="color:#000080;font-weight:bold;">extends</span> <a href="psi_element://java.lang.Record"><code><span style="color:#000000;">Record</span></code></a></pre></div><div class='content'>
main comment
</div><table class='sections'><p><tr><td valign='top' class='section'><p>Params:</td><td valign='top'><code><span style="color:#000000;">test</span></code> &ndash; simple description</td></table>
java/java-tests/testData/codeInsight/javadocIG/reflectConstructor.html
+1 -1
View File
@@ -1,4 +1,4 @@
<html><head><base href="placeholder"></head><body><div class="bottom"><icon src="AllIcons.Nodes.Class" />&nbsp;<a href="psi_element://java.lang.Class"><code><span style="color:#000000;">java.<wbr>lang.<wbr>Class</span><span style="">&lt;</span><span style="color:#20999d;">T</span><span style="">&gt;</span></code></a></div><div class="definition"><pre><span style="color:#ff0000">@<span style="color:#808000;">CallerSensitive</span></span>&nbsp;
<span style="color:#808000;">@</span><span style="color:#808000;">Contract</span><span style="">(</span><span style="">pure</span><span style=""> = </span><span style="color:#000080;font-weight:bold;">true</span><span style="">)</span><a href="external.annotations"><icon src="AllIcons.Ide.External_link_arrow" /></a>&nbsp;
<span style="color:#000080;font-weight:bold;">public</span>&nbsp;<a href="psi_element://java.lang.reflect.Constructor"><code><span style="color:#000000;">java.<wbr>lang.<wbr>reflect.<wbr>Constructor</span></code></a><span style="">&lt;</span><span style="">?</span><span style="">&gt;</span>&nbsp;<span style="color:#808000;">@</span><span style="color:#808000;">NotNull</span><a href="external.annotations"><icon src="AllIcons.Ide.External_link_arrow" /></a>&nbsp;<span style="">[]</span>&nbsp;<span style="color:#000000;">getDeclaredConstructors</span><span style="">(</span><span style="">)</span>
<span style="color:#000080;font-weight:bold;">throws</span>&nbsp;<a href="psi_element://java.lang.SecurityException"><code><span style="color:#000000;">SecurityException</span></code></a></pre></div><table class="sections"><tbody><tr><td valign="top" class="section"><p>Throws:</p></td><td valign="top"><p><a href="psi_element://java.lang.SecurityException"><code><span style="color:#0000ff;">SecurityException</span></code></a></p></td></tr></tbody></table><div class="bottom"><icon src="AllIcons.Nodes.PpLibFolder" />&nbsp;&lt; java 10 &gt;</div></body></html>
<span style="color:#000080;font-weight:bold;">throws</span>&nbsp;<a href="psi_element://java.lang.SecurityException"><code><span style="color:#000000;">SecurityException</span></code></a></pre></div><table class="sections"><tbody><tr><td valign="top" class="section"><p>Throws:</p></td><td valign="top"><p><a href="psi_element://java.lang.SecurityException"><code><span style="color:#0000ff;">SecurityException</span></code></a></p></td></tr></tbody></table><div class="bottom"><icon src="AllIcons.Nodes.PpLibFolder" />&nbsp;&lt; java 21 &gt;</div></body></html>
java/java-tests/testSrc/com/intellij/java/codeInsight/javadoc/JavaDocInfoGeneratorTest.java
+14 -10
View File
@@ -42,7 +42,7 @@ import java.util.List;
public class JavaDocInfoGeneratorTest extends JavaCodeInsightTestCase {
private static final String TEST_DATA_FOLDER = "/codeInsight/javadocIG/";
private int myJdkVersion = 7;
private int myJdkVersion = 21;
@NotNull
@Override
@@ -119,8 +119,8 @@ public class JavaDocInfoGeneratorTest extends JavaCodeInsightTestCase {
public void testHtmlLinkWithRef() { verifyJavaDoc(getTestClass()); }
public void testMultipleSpacesInLiteral() { useJava8(); verifyJavaDoc(getTestClass()); }
public void testLegacySpacesInLiteral() { useJava7(); verifyJavaDoc(getTestClass()); }
public void testDocumentationForJdkClassWithReferencesToClassesFromJavaLang() { doTestAtCaret(); }
public void testDocumentationForUncheckedExceptionsInSupers() { doTestAtCaret(); }
public void testDocumentationForJdkClassWithReferencesToClassesFromJavaLang() { useJava7(); doTestAtCaret(); }
public void testDocumentationForUncheckedExceptionsInSupers() { useJava7(); doTestAtCaret(); }
public void testDocumentationForGetterByField() { doTestAtCaret(); }
public void testParamInJavadoc() { doTestAtCaret(); }
public void testParamInMethod() { doTestAtCaret(); }
@@ -137,7 +137,7 @@ public class JavaDocInfoGeneratorTest extends JavaCodeInsightTestCase {
public void testTypeAnnotationArray() { useJava8(); doTestAtCaret(); }
public void testTypeAnnotationClass() { useJava8(); doTestClass(); }
public void testInlineTagIndex() { useJava9(); doTestClass(); }
public void testInlineTagSummary() { useJava10(); doTestClass(); }
public void testInlineTagSummary() { doTestClass(); }
public void testLeadingSpacesInPre() { doTestClass(); }
public void testBlockquotePre() { doTestAtCaret(); }
public void testPreInDeprecated() { doTestClass(); }
@@ -183,7 +183,7 @@ public class JavaDocInfoGeneratorTest extends JavaCodeInsightTestCase {
public void testUnknownInlineMultilineTag() { doTestClass(); }
public void testUnknownTag() { doTestMethod(); }
public void testUnknownClassTag() { doTestClass(); }
public void testReflectConstructor() { useJava10(); doTestAtCaret(); }
public void testReflectConstructor() { doTestAtCaret(); }
public void testMarkdownGeneralFeatures() { doTestClass(); }
public void testMarkdownCodeBlock(){ doTestClass(); }
public void testMarkdownReferenceLink(){ doTestClass(); }
@@ -318,6 +318,7 @@ public class JavaDocInfoGeneratorTest extends JavaCodeInsightTestCase {
}
public void testDocumentationForJdkClassWhenExternalDocIsNotAvailable() {
useJava7();
PsiClass aClass = myJavaFacade.findClass("java.lang.String");
assertNotNull(aClass);
verifyJavaDoc(aClass, Collections.singletonList("dummyUrl"));
@@ -328,6 +329,14 @@ public class JavaDocInfoGeneratorTest extends JavaCodeInsightTestCase {
doTestAtCaret();
});
}
public void testExternalTypeAnnotations() {
PsiClass aClass = myJavaFacade.findClass("java.util.concurrent.CompletableFuture");
assertNotNull(aClass);
PsiMethod[] whenComplete = aClass.findMethodsByName("whenComplete", false);
assertEquals(1, whenComplete.length);
verifyJavaDoc(whenComplete[0]);
}
public void testLibraryPackageDocumentation() {
VirtualFile libClasses = JavaExternalDocumentationTest.getJarFile("library.jar");
@@ -489,11 +498,6 @@ public class JavaDocInfoGeneratorTest extends JavaCodeInsightTestCase {
setUpJdk();
}
private void useJava10() {
myJdkVersion = 10;
setUpJdk();
}
private static String loadFile(File file) {
try {
return StringUtil.convertLineSeparators(FileUtil.loadFile(file).trim());