aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Doległo <kamilok1965@interia.pl>2020-04-14 14:14:31 +0200
committerKamil Doległo <kamilok1965@interia.pl>2020-04-15 12:15:04 +0200
commit64e600b126ae8edcfbb3c2716febb01d221520b5 (patch)
tree63e1c32599e1525fed431cb26b10d4d3e7239c49
parentbc843d67b455e484cd05cdf28e5ce5dec68119d4 (diff)
downloaddokka-64e600b126ae8edcfbb3c2716febb01d221520b5.tar.gz
dokka-64e600b126ae8edcfbb3c2716febb01d221520b5.tar.bz2
dokka-64e600b126ae8edcfbb3c2716febb01d221520b5.zip
Fix path clash with top-level declarations, catch link resolving exception, remove default values while merging, merge expect by targets
Diffstat
-rw-r--r--core/src/main/kotlin/model/defaultValues.kt5
-rw-r--r--plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt3
-rw-r--r--plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt17
-rw-r--r--plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt4
-rw-r--r--plugins/base/src/test/kotlin/model/PackagesTest.kt4
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html6
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/<jvm root>/f.html (renamed from plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/f.html)2
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/<jvm root>/index.html44
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html23
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/main.js59
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/main.js.map1
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/pages.js4
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/navigation.html10
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/-init-.html (renamed from plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/-init-.html)4
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/equals.html (renamed from plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/equals.html)2
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/hash-code.html (renamed from plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/hash-code.html)2
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/index.html (renamed from plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/index.html)4
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/to-string.html (renamed from plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/to-string.html)2
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/f.html (renamed from plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/f.html)2
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/index.html59
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html38
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/scripts/main.js59
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/scripts/main.js.map1
-rw-r--r--plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/scripts/pages.js14
-rw-r--r--plugins/base/src/test/resources/expect/function/out/html/navigation.html6
-rw-r--r--plugins/base/src/test/resources/expect/function/out/html/root/<jvm root>/fn.html (renamed from plugins/base/src/test/resources/expect/function/out/html/root/fn.html)2
-rw-r--r--plugins/base/src/test/resources/expect/function/out/html/root/<jvm root>/index.html44
-rw-r--r--plugins/base/src/test/resources/expect/function/out/html/root/index.html23
-rw-r--r--plugins/base/src/test/resources/expect/function/out/html/scripts/main.js59
-rw-r--r--plugins/base/src/test/resources/expect/function/out/html/scripts/main.js.map1
-rw-r--r--plugins/base/src/test/resources/expect/function/out/html/scripts/pages.js4
-rw-r--r--plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/navigation.html10
-rw-r--r--plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/-init-.html (renamed from plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/-init-.html)4
-rw-r--r--plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/equals.html (renamed from plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/equals.html)2
-rw-r--r--plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/hash-code.html (renamed from plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/-fancy/hash-code.html)2
-rw-r--r--plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/index.html (renamed from plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/index.html)4
-rw-r--r--plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/to-string.html (renamed from plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/-fancy/to-string.html)2
-rw-r--r--plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/function.html (renamed from plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/function.html)2
-rw-r--r--plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/index.html59
-rw-r--r--plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html38
-rw-r--r--plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/main.js59
-rw-r--r--plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/main.js.map1
-rw-r--r--plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/pages.js14
-rw-r--r--plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/navigation.html6
-rw-r--r--plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/<jvm root>/f.html (renamed from plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/f.html)2
-rw-r--r--plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/<jvm root>/index.html44
-rw-r--r--plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html23
-rw-r--r--plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/scripts/main.js59
-rw-r--r--plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/scripts/main.js.map1
-rw-r--r--plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/scripts/pages.js4
-rw-r--r--plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/navigation.html6
-rw-r--r--plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/<jvm root>/function.html (renamed from plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/function.html)2
-rw-r--r--plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/<jvm root>/index.html44
-rw-r--r--plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html23
-rw-r--r--plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/scripts/main.js59
-rw-r--r--plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/scripts/main.js.map1
-rw-r--r--plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/scripts/pages.js4
-rw-r--r--plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/navigation.html6
-rw-r--r--plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/<jvm root>/f.html (renamed from plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/f.html)2
-rw-r--r--plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/<jvm root>/index.html44
-rw-r--r--plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html23
-rw-r--r--plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/scripts/main.js59
-rw-r--r--plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/scripts/main.js.map1
-rw-r--r--plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/scripts/pages.js4
-rw-r--r--plugins/base/src/test/resources/expect/functionWithParams/out/html/navigation.html6
-rw-r--r--plugins/base/src/test/resources/expect/functionWithParams/out/html/root/<jvm root>/function.html (renamed from plugins/base/src/test/resources/expect/functionWithParams/out/html/root/function.html)2
-rw-r--r--plugins/base/src/test/resources/expect/functionWithParams/out/html/root/<jvm root>/index.html44
-rw-r--r--plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html23
-rw-r--r--plugins/base/src/test/resources/expect/functionWithParams/out/html/scripts/main.js59
-rw-r--r--plugins/base/src/test/resources/expect/functionWithParams/out/html/scripts/main.js.map1
-rw-r--r--plugins/base/src/test/resources/expect/functionWithParams/out/html/scripts/pages.js4
-rw-r--r--plugins/base/src/test/resources/expect/functionWithReceiver/out/html/navigation.html6
-rw-r--r--plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/<jvm root>/fn.html (renamed from plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/fn.html)2
-rw-r--r--plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/<jvm root>/index.html53
-rw-r--r--plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html32
-rw-r--r--plugins/base/src/test/resources/expect/functionWithReceiver/out/html/scripts/main.js59
-rw-r--r--plugins/base/src/test/resources/expect/functionWithReceiver/out/html/scripts/main.js.map1
-rw-r--r--plugins/base/src/test/resources/expect/functionWithReceiver/out/html/scripts/pages.js4
-rw-r--r--plugins/base/src/test/resources/expect/genericFunction/out/html/navigation.html6
-rw-r--r--plugins/base/src/test/resources/expect/genericFunction/out/html/root/<jvm root>/generic.html (renamed from plugins/base/src/test/resources/expect/genericFunction/out/html/root/generic.html)2
-rw-r--r--plugins/base/src/test/resources/expect/genericFunction/out/html/root/<jvm root>/index.html44
-rw-r--r--plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html23
-rw-r--r--plugins/base/src/test/resources/expect/genericFunction/out/html/scripts/main.js59
-rw-r--r--plugins/base/src/test/resources/expect/genericFunction/out/html/scripts/main.js.map1
-rw-r--r--plugins/base/src/test/resources/expect/genericFunction/out/html/scripts/pages.js4
-rw-r--r--plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/navigation.html6
-rw-r--r--plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/<jvm root>/generic.html (renamed from plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/generic.html)2
-rw-r--r--plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/<jvm root>/index.html44
-rw-r--r--plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html23
-rw-r--r--plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/main.js59
-rw-r--r--plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/main.js.map1
-rw-r--r--plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/pages.js4
-rw-r--r--plugins/base/src/test/resources/expect/inlineFunction/out/html/navigation.html6
-rw-r--r--plugins/base/src/test/resources/expect/inlineFunction/out/html/root/<jvm root>/f.html (renamed from plugins/base/src/test/resources/expect/inlineFunction/out/html/root/f.html)2
-rw-r--r--plugins/base/src/test/resources/expect/inlineFunction/out/html/root/<jvm root>/index.html44
-rw-r--r--plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html23
-rw-r--r--plugins/base/src/test/resources/expect/inlineFunction/out/html/scripts/main.js59
-rw-r--r--plugins/base/src/test/resources/expect/inlineFunction/out/html/scripts/main.js.map