infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-15 18:33:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

8006236: doclint: structural issue hidden

Browse Source 
Reviewed-by: darcy
This commit is contained in:
Jonathan Gibbons 2013-01-16 10:29:52 -08:00
parent 5a60f56dbe
commit 17ebfc350d
3 changed files with 85 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
langtools/src/share/classes/com/sun/tools/doclint/Checker.java
View File

@ -25,6 +25,7 @@
package com.sun.tools.doclint;
import com.sun.source.doctree.LiteralTree;
import java.util.regex.Matcher;
import com.sun.source.doctree.LinkTree;
import java.net.URI;
@ -359,9 +360,8 @@ public class Checker extends DocTreeScanner<Void, Void> {
env.messages.error(HTML, tree, "dc.tag.unknown", treeName);
} else if (t.endKind == HtmlTag.EndKind.NONE) {
env.messages.error(HTML, tree, "dc.tag.end.not.permitted", treeName);
} else if (tagStack.isEmpty()) {
env.messages.error(HTML, tree, "dc.tag.end.unexpected", treeName);
} else {
boolean done = false;
while (!tagStack.isEmpty()) {
TagStackItem top = tagStack.peek();
if (t == top.tag) {
@ -383,6 +383,7 @@ public class Checker extends DocTreeScanner<Void, Void> {
env.messages.error(HTML, tree, "dc.text.not.allowed", treeName);
}
tagStack.pop();
done = true;
break;
} else if (top.tag == null || top.tag.endKind != HtmlTag.EndKind.REQUIRED) {
tagStack.pop();
@ -400,10 +401,15 @@ public class Checker extends DocTreeScanner<Void, Void> {
tagStack.pop();
} else {
env.messages.error(HTML, tree, "dc.tag.end.unexpected", treeName);
done = true;
break;
}
}
}
if (!done && tagStack.isEmpty()) {
env.messages.error(HTML, tree, "dc.tag.end.unexpected", treeName);
}
}
return super.visitEndElement(tree, ignore);
@ -545,6 +551,19 @@ public class Checker extends DocTreeScanner<Void, Void> {
}
}
@Override
public Void visitLiteral(LiteralTree tree, Void ignore) {
if (tree.getKind() == DocTree.Kind.CODE) {
for (TagStackItem tsi: tagStack) {
if (tsi.tag == HtmlTag.CODE) {
env.messages.warning(HTML, tree, "dc.tag.nested.not.allowed", "code");
break;
}
}
}
return super.visitLiteral(tree, ignore);
}
@Override
public Void visitParam(ParamTree tree, Void ignore) {
boolean typaram = tree.isTypeParameter();

39
langtools/test/tools/doclint/EndTagsTest.java Normal file
View File

@ -0,0 +1,39 @@
/*
* @test /nodynamiccopyright/
* @bug 8006236
* @summary doclint: structural issue hidden
* @build DocLintTester
* @run main DocLintTester -Xmsgs:-html EndTagsTest.java
* @run main DocLintTester -ref EndTagsTest.out EndTagsTest.java
*/
/** */
public class EndTagsTest {
/** <p> <a name="a1"> text <img alt="image" src="image.png"> </a> </p> */
public void valid_all() { }
/** <p> <a name="a2"> text <img alt="image" src="image.png"> </a> */
public void valid_omit_optional_close() { }
/** </a> */
public void invalid_missing_start() { }
/** <p> </a> */
public void invalid_missing_start_2() { }
/** <p> text </p> </a> */
public void invalid_missing_start_3() { }
/** <img alt="image" src="image.png"> </img> */
public void invalid_end() { }
/** <invalid> </invalid> */
public void unknown_start_end() { }
/** <invalid> */
public void unknown_start() { }
/** </invalid> */
public void unknown_end() { }
}

25
langtools/test/tools/doclint/EndTagsTest.out Normal file
View File

@ -0,0 +1,25 @@
EndTagsTest.java:18: error: unexpected end tag: </a>
/** </a> */
^
EndTagsTest.java:21: error: unexpected end tag: </a>
/** <p> </a> */
^
EndTagsTest.java:24: error: unexpected end tag: </a>
/** <p> text </p> </a> */
^
EndTagsTest.java:27: error: invalid end tag: </img>
/** <img alt="image" src="image.png"> </img> */
^
EndTagsTest.java:30: error: unknown tag: invalid
/** <invalid> </invalid> */
^
EndTagsTest.java:30: error: unknown tag: invalid
/** <invalid> </invalid> */
^
EndTagsTest.java:33: error: unknown tag: invalid
/** <invalid> */
^
EndTagsTest.java:36: error: unknown tag: invalid
/** </invalid> */
^
8 errors