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

8225671: Support HTML 5 character references in javadoc

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Hannes Wallnöfer 2019-06-12 23:21:24 +02:00
parent 78f3c596a3
commit 3353016bbc
5 changed files with 2173 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2422
src/jdk.compiler/share/classes/com/sun/tools/doclint/Entity.java
View File

File diff suppressed because it is too large Load Diff

8
src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/JavadocFormatter.java
View File

@ -513,6 +513,7 @@ public class JavadocFormatter {
public Object visitEntity(EntityTree node, Object p) {
String name = node.getName().toString();
int code = -1;
String value = null;
if (name.startsWith("#")) {
try {
int v = StringUtils.toLowerCase(name).startsWith("#x")
@ -525,13 +526,12 @@ public class JavadocFormatter {
//ignore
}
} else {
Entity entity = Entity.get(name);
if (entity != null) {
code = entity.code;
}
value = Entity.getValue(name);
}
if (code != (-1)) {
result.appendCodePoint(code);
} else if (value != null) {
result.append(value);
} else {
result.append(node.toString());
}

2
test/langtools/tools/doclint/CoverageExtras.java
View File

@ -49,8 +49,6 @@ public class CoverageExtras {
check(Checker.Flag.TABLE_HAS_CAPTION, Checker.Flag.valueOf("TABLE_HAS_CAPTION"), Checker.Flag.values());
check(Entity.nbsp, Entity.valueOf("nbsp"), Entity.values());
check(Messages.Group.ACCESSIBILITY, Messages.Group.valueOf("ACCESSIBILITY"), Messages.Group.values());
}

18
test/langtools/tools/doclint/html/EntitiesTest.java
View File

@ -294,23 +294,35 @@ class EntitiesTest {
* ‹ ‹
* › ›
* € €
* / /
* ⨂ ⨂
* ℧ ࡏ
* ― ―
* ⌭ ⌭
*/
void symbolic_entities() { }
/**
* ⌫
*  
*/
void other_numeric() {}
/**
* &bad;
*/
void bad_name() { }
/**
* �
* 
* 
* ࡏ
* �
* �
*/
void out_of_range() { }
/**
* ―
* ⌫
* 
*/
void sparse_negative() { }

25
test/langtools/tools/doclint/html/EntitiesTest.out
View File

@ -1,19 +1,22 @@
EntitiesTest.java:301: error: invalid entity &bad;
EntitiesTest.java:312: error: invalid entity &bad;
* &bad;
^
EntitiesTest.java:306: error: invalid entity 
EntitiesTest.java:317: error: invalid entity �
* �
^
EntitiesTest.java:318: error: invalid entity 
* 
^
EntitiesTest.java:319: error: invalid entity 
* 
^
EntitiesTest.java:307: error: invalid entity ࡏ
* ࡏ
EntitiesTest.java:320: error: invalid entity �
* �
^
EntitiesTest.java:312: error: invalid entity ―
* ―
EntitiesTest.java:321: error: invalid entity �
* �
^
EntitiesTest.java:313: error: invalid entity ⌫
* ⌫
^
EntitiesTest.java:314: error: invalid entity 
EntitiesTest.java:326: error: invalid entity 
* 
^
6 errors
7 errors