From 5290f9fdf6c64a768f83a58e40d9a449d696d845 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 24 Aug 2017 16:27:55 +0300 Subject: [PATCH] [java] annotations in generated module javadoc (IDEA-177945) --- .../codeInsight/javadoc/JavaDocInfoGenerator.java | 2 ++ .../java/codeInsight/javadoc/LightJavadocGeneratorTest.kt | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java index a8131cadbd1c..a16f19815bd1 100644 --- a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java +++ b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java @@ -730,6 +730,8 @@ public class JavaDocInfoGenerator { private void generateModuleJavaDoc(StringBuilder buffer, PsiJavaModule module, boolean generatePrologueAndEpilogue) { if (generatePrologueAndEpilogue) generatePrologue(buffer); + generateAnnotations(buffer, module, SignaturePlace.Javadoc, true); + buffer.append("
module ").append(module.getName()).append("
"); PsiDocComment comment = module.getDocComment(); diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/javadoc/LightJavadocGeneratorTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInsight/javadoc/LightJavadocGeneratorTest.kt index 0f096b5d7902..78f42edd74e1 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/javadoc/LightJavadocGeneratorTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/javadoc/LightJavadocGeneratorTest.kt @@ -33,8 +33,12 @@ class LightJavadocGeneratorTest : LightCodeInsightFixtureTestCase() { """.trimIndent()) - fun testDocumentedModule() = doTestModule("/** One humble module. */\nmodule M.N { }", """ + fun testDocumentedModule() = doTestModule("/** One humble module. */\n@Deprecated\nmodule M.N { }", """ + @ + + Deprecated + 
           module
           M.N
@@ -45,7 +49,7 @@ class LightJavadocGeneratorTest : LightCodeInsightFixtureTestCase() {
   private fun doTestModule(text: String, expected: String) {
     val file = myFixture.configureByText("module-info.java", text)
     val module = (file as PsiJavaFile).moduleDeclaration!!
-    val docInfo = JavaDocInfoGeneratorFactory.create(project, module).generateDocInfo(null)!!
+    val docInfo = JavaDocInfoGeneratorFactory.create(project, module).generateDocInfo(null)!!.replace(" ", " ")
     val body = loadElement(docInfo).getChild("body")
     assertThat(body).isEqualTo(expected)
   }