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

8276966: Improve diagnostic output for the mismatching parts of a hybrid snippet

Browse Source 
Reviewed-by: prappo
This commit is contained in:
Hannes Wallnöfer 2025-10-03 15:53:37 +00:00
parent 7231916754
commit f81c7c592b
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
View File

@ -462,6 +462,7 @@ public class SnippetTaglet extends BaseTaglet {
%s
----------------- external -----------------
%s
--------------------------------------------
""".formatted(inline, external);
}

18
test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetTag.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2025, 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
@ -23,7 +23,7 @@
/*
* @test
* @bug 8266666 8275788 8276964 8299080
* @bug 8266666 8275788 8276964 8299080 8276966
* @summary Implementation for snippets
* @library /tools/lib ../../lib
* @modules jdk.compiler/com.sun.tools.javac.api
@ -2166,6 +2166,7 @@ public class TestSnippetTag extends SnippetTester {
Hello, Snippet!
----------------- external -----------------
Hello, Snippet!...more
--------------------------------------------
</pre>
</details>
""");
@ -2207,8 +2208,16 @@ public class TestSnippetTag extends SnippetTester {
"pkg");
checkExit(Exit.ERROR);
checkOutput(Output.OUT, true,
"""
A.java:4: error: contents mismatch""");
"""
A.java:4: error: contents mismatch""",
"""
----------------- inline -------------------
Hello, Snippet! ...more
\s\s
----------------- external -----------------
Hello, Snippet!
\s\s
--------------------------------------------""");
checkOutput("pkg/A.html", true, """
<details class="invalid-tag">
<summary>invalid @snippet</summary>
@ -2219,6 +2228,7 @@ public class TestSnippetTag extends SnippetTester {
----------------- external -----------------
Hello, Snippet!
--------------------------------------------
</pre>
</details>
""");