From 7f5631bcfc3e3cd22e50c28d9ccc84095c4c35c8 Mon Sep 17 00:00:00 2001 From: James Strachan Date: Wed, 11 Apr 2012 09:55:04 +0100 Subject: [PATCH] added better tests to check if kdoc stops working again and a few more diagnostics and warnings --- .../test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt | 2 +- .../kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt | 2 +- .../main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/docs/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt b/libraries/docs/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt index b5c4e30ef35..1d6b245b94c 100644 --- a/libraries/docs/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt +++ b/libraries/docs/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt @@ -28,7 +28,7 @@ class GenerateSiteTest : TestCase() { // now lets assert that the API docs generated everything assertFilesExist(outDir, "Expected generate API docs are missing - API doc generation failure", - "kotlin/package.html", "kotlin/dom/package.html") + "kotlin/package-frame.html", "kotlin/dom/package-frame.html", "kotlin/test/package-frame.html") } fun testCopyJSApiDocs(): Unit { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt index 12b9ad39337..5dcb56886ff 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt @@ -60,7 +60,7 @@ class JavadocStyleHtmlDoclet() : Doclet { } - println("Generating kdoc to $outputDir") + println("Generating kdoc to $outputDir excluding packages ${model.config.ignorePackages}") run("allclasses-frame.html", AllClassesFrameTemplate(model, " target=\"classFrame\"")) run("allclasses-noframe.html", AllClassesFrameTemplate(model)) // run("constant-values.html", ConstantValuesTemplate(model)) diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt index d1347cd54a1..82a4981e10f 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt @@ -199,6 +199,8 @@ class KModel(var context: BindingContext, val config: KDocConfig) { val namespaceDescriptor = BindingContextUtils.namespaceDescriptor(context, source) if (namespaceDescriptor != null) { allNamespaces.add(namespaceDescriptor); + } else { + warning("No NamespaceDescriptor for source $source") } } }