Merge pull request apache#2974 from wal-jan/NETBEANS-1615

[NETBEANS-1615] fixed @throws hint for type variable
canpse · Jan 9, 2023 · e944fa4 · e944fa4
2 parents cd38f5a + 64b0555
commit e944fa4
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 5 deletions.
diff --git a/java/javadoc/src/org/netbeans/modules/javadoc/hints/Analyzer.java b/java/javadoc/src/org/netbeans/modules/javadoc/hints/Analyzer.java
@@ -77,6 +77,7 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
+import javax.lang.model.type.TypeVariable;
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
 import org.netbeans.api.java.source.CompilationInfo;
@@ -676,21 +677,23 @@ public Void visitThrows(ThrowsTree tree, List<ErrorDescription> errors) {
         DocSourcePositions sp = (DocSourcePositions) javac.getTrees().getSourcePositions();
         int start = (int) sp.getStartPosition(javac.getCompilationUnit(), currentDocPath.getDocComment(), tree);
         int end = (int) sp.getEndPosition(javac.getCompilationUnit(), currentDocPath.getDocComment(), tree);
-        if (ex == null || (ex.asType().getKind() == TypeKind.DECLARED
-                && types.isAssignable(ex.asType(), throwable))) {
+        boolean isType = ex != null && (ex.asType().getKind() == TypeKind.DECLARED || ex.asType().getKind() == TypeKind.TYPEVAR);
+        if (ex == null || (isType && types.isAssignable(ex.asType(), throwable))) {
             switch (currentElement.getKind()) {
                 case CONSTRUCTOR:
                 case METHOD:
                     if (ex == null || !(types.isAssignable(ex.asType(), error)
                             || types.isAssignable(ex.asType(), runtime))) {
                         ExecutableElement ee = (ExecutableElement) currentElement;
                         String fqn;
-                        if (ex != null) {
-                            fqn = ((TypeElement) ex).getQualifiedName().toString();
-                        } else {
+                        if (ex == null) {
                             ExpressionTree referenceClass = javac.getTreeUtilities().getReferenceClass(new DocTreePath(currentDocPath, exName));
                             if(referenceClass == null) break;
                             fqn = referenceClass.toString();
+                        } else if (ex.asType().getKind() == TypeKind.TYPEVAR) {
+                            fqn = ex.getSimpleName().toString();
+                        } else {
+                            fqn = ((TypeElement) ex).getQualifiedName().toString();
                         }
                         checkThrowsDeclared(tree, ex, fqn, ee.getThrownTypes(), dtph, start, end, errors);
                     }

diff --git a/java/javadoc/test/unit/src/org/netbeans/modules/javadoc/hints/AddTagFixTest.java b/java/javadoc/test/unit/src/org/netbeans/modules/javadoc/hints/AddTagFixTest.java
@@ -641,6 +641,32 @@ public void testAddThrowsTagFix2() throws Exception {
                 + "}\n");
     }
 
+    public void testAddThrowsTagFix_NETBEANS_1615() throws Exception {
+        // issue NETBEANS-1615
+        HintTest.create()
+                .input(
+                "package test;\n"
+                + "interface Zima {\n"
+                + "    /**\n"
+                + "     */\n"
+                + "    <X extends Exception> void leden() throws X;\n"
+                + "}\n")
+                .preference(AVAILABILITY_KEY + true, true)
+                .preference(SCOPE_KEY, "private")
+                .run(JavadocHint.class)
+                .findWarning("4:46-4:47:warning:Missing @throws tag for X")
+                .applyFix("Add @throws X tag")
+                .assertCompilable()
+                .assertOutput(
+                "package test;\n"
+                + "interface Zima {\n"
+                + "    /**\n"
+                + "     * @throws X\n"
+                + "     */\n"
+                + "    <X extends Exception> void leden() throws X;\n"
+                + "}\n");
+    }
+
     public void testAddThrowsTagFix_NestedClass_160414() throws Exception {
         // issue 160414
         HintTest.create()

diff --git a/java/javadoc/test/unit/src/org/netbeans/modules/javadoc/hints/Analyzer2Test.java b/java/javadoc/test/unit/src/org/netbeans/modules/javadoc/hints/Analyzer2Test.java
@@ -182,6 +182,23 @@ public void testExceptionInheritanceAnalyzer() throws Exception {
                 .assertNotContainsWarnings("Unknown throwable: @throws java.nio.file.NoSuchFileException");
     }
 
+    public void testExceptionTypeAnalyzer() throws Exception {
+        // issue NETBEANS-1615
+        HintTest.create()
+                .input(
+                "package test;\n"
+                + "interface Zima {\n"
+                + "    /**\n"
+                + "     * @throws X\n"
+                + "     */\n"
+                + "    <X extends Exception> void leden() throws X;\n"
+                + "}\n")
+                .preference(AVAILABILITY_KEY + true, true)
+                .preference(SCOPE_KEY, "private")
+                .run(JavadocHint.class)
+                .assertNotContainsWarnings("Missing @throws tag for X");
+    }
+
     public void testInheritanceAnalyzer() throws Exception {
         HintTest.create()
                 .input(