diff options
| author | Kamil Doległo <kamilok1965@interia.pl> | 2020-02-10 15:02:26 +0100 |
|---|---|---|
| committer | Kamil Doległo <kamilok1965@interia.pl> | 2020-02-10 15:02:26 +0100 |
| commit | 0d0d41f594f1095b4ccc999cffe01a6ef9a22dbb (patch) | |
| tree | 32b09319400677750af154034e09d82d4706a396 /core/src/main/kotlin/Kotlin/DocumentationBuilder.kt | |
| parent | 23fbfa0e8e793314cea8d96ac1584d72ec70bb60 (diff) | |
| parent | 465ea3d23be40d0d21df7f7cab51ec2d42e3237f (diff) | |
| download | dokka-0d0d41f594f1095b4ccc999cffe01a6ef9a22dbb.tar.gz dokka-0d0d41f594f1095b4ccc999cffe01a6ef9a22dbb.tar.bz2 dokka-0d0d41f594f1095b4ccc999cffe01a6ef9a22dbb.zip | |
Merge dev-0.10.1 into master
Diffstat (limited to 'core/src/main/kotlin/Kotlin/DocumentationBuilder.kt')
| -rw-r--r-- | core/src/main/kotlin/Kotlin/DocumentationBuilder.kt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt index 3168e033..13bbbb11 100644 --- a/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt +++ b/core/src/main/kotlin/Kotlin/DocumentationBuilder.kt @@ -423,7 +423,7 @@ class DocumentationBuilder fun DocumentationModule.appendFragments(fragments: Collection<PackageFragmentDescriptor>, packageContent: Map<String, Content>, packageDocumentationBuilder: PackageDocumentationBuilder) { - val allFqNames = fragments.filter{ it.isDocumented(passConfiguration) }.map { it.fqName }.distinct() + val allFqNames = fragments.filter { it.isDocumented(passConfiguration) }.map { it.fqName }.distinct() for (packageName in allFqNames) { if (packageName.isRoot && !passConfiguration.includeRootPackage) continue @@ -713,7 +713,7 @@ class DocumentationBuilder } fun FunctionDescriptor.build(external: Boolean = false): DocumentationNode { - if (ErrorUtils.containsErrorType(this)) { + if (ErrorUtils.containsErrorTypeInParameters(this) || ErrorUtils.containsErrorType(this.returnType)) { logger.warn("Found an unresolved type in ${signatureWithSourceLocation()}") } @@ -1157,7 +1157,9 @@ fun ClassDescriptor.supertypesWithAnyPrecise(): Collection<KotlinType> { fun PassConfiguration.effectivePackageOptions(pack: String): DokkaConfiguration.PackageOptions { val rootPackageOptions = PackageOptionsImpl("", includeNonPublic, reportUndocumented, skipDeprecated, false) - return perPackageOptions.firstOrNull { pack == it.prefix || pack.startsWith(it.prefix + ".") } ?: rootPackageOptions + return perPackageOptions.firstOrNull { pack == it.prefix } + ?: perPackageOptions.firstOrNull { pack.startsWith(it.prefix + ".") } + ?: rootPackageOptions } fun PassConfiguration.effectivePackageOptions(pack: FqName): DokkaConfiguration.PackageOptions = effectivePackageOptions(pack.asString()) |