changeset 50665:cebd0673feeb

8203176: javadoc handles non-ASCII characters incorrectly. Reviewed-by: ksrini
author jjg
date Tue, 15 May 2018 14:15:47 -0700
parents 94a048a97de4
children fb66b2959eaf
files src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java test/langtools/jdk/javadoc/doclet/testUnicode/TestUnicode.java
diffstat 2 files changed, 68 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java	Tue May 15 13:58:03 2018 -0700
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java	Tue May 15 14:15:47 2018 -0700
@@ -1472,7 +1472,7 @@
 
                 @Override
                 public Boolean visitLiteral(LiteralTree node, Content c) {
-                    String s = node.getBody().toString();
+                    String s = node.getBody().getBody();
                     Content content = new StringContent(utils.normalizeNewlines(s));
                     if (node.getKind() == CODE)
                         content = HtmlTree.CODE(content);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testUnicode/TestUnicode.java	Tue May 15 14:15:47 2018 -0700
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug      8203176
+ * @summary  javadoc handles non-ASCII characters incorrectly
+ * @library  /tools/lib ../lib
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox JavadocTester
+ * @run main TestUnicode
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import toolbox.ToolBox;
+
+public class TestUnicode extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        TestUnicode tester = new TestUnicode();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    void test() throws Exception {
+        char ellipsis = '\u2026';
+        Path src = Files.createDirectories(Paths.get("src"));
+        tb.writeJavaFiles(src,
+                "/** Hel" + ellipsis + "lo {@code World(" + ellipsis + ")}. */\n"
+                + "public class Code { }\n");
+
+        javadoc("-d", "out",
+                "-encoding", "utf-8",
+                src.resolve("Code.java").toString());
+        checkExit(Exit.OK);
+
+        checkOutput("Code.html", true,
+                "<div class=\"block\">Hel" + ellipsis + "lo <code>World(" + ellipsis + ")</code>.</div>");
+        checkOutput("Code.html", false,
+                "\\u");
+    }
+}