diff options
| author | Simon Ogorodnik <sem-oro@yandex.ru> | 2016-11-03 19:25:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-03 19:25:09 +0300 |
| commit | c4cf001951bbe92223fdedaf4bb5fbdeddeb2472 (patch) | |
| tree | 9b563ef0ecd32865af82b4c92a07adbdecb54fd4 /core/src/main/kotlin/Kotlin | |
| parent | 21b2fcb46a10acc2afdf94639cd208d15856fdc3 (diff) | |
| download | dokka-c4cf001951bbe92223fdedaf4bb5fbdeddeb2472.tar.gz dokka-c4cf001951bbe92223fdedaf4bb5fbdeddeb2472.tar.bz2 dokka-c4cf001951bbe92223fdedaf4bb5fbdeddeb2472.zip | |
Updated kotlin-compiler to 1.1-M2-8 (#109)
Diffstat (limited to 'core/src/main/kotlin/Kotlin')
| -rw-r--r-- | core/src/main/kotlin/Kotlin/DescriptorDocumentationParser.kt | 4 | ||||
| -rw-r--r-- | core/src/main/kotlin/Kotlin/KotlinAsJavaDocumentationBuilder.kt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/src/main/kotlin/Kotlin/DescriptorDocumentationParser.kt b/core/src/main/kotlin/Kotlin/DescriptorDocumentationParser.kt index 80e02c0c..941d071d 100644 --- a/core/src/main/kotlin/Kotlin/DescriptorDocumentationParser.kt +++ b/core/src/main/kotlin/Kotlin/DescriptorDocumentationParser.kt @@ -100,10 +100,10 @@ class DescriptorDocumentationParser deepestDescriptor = deepestDescriptor.overriddenDescriptors.first() } if (DescriptorUtils.getFqName(deepestDescriptor.containingDeclaration).asString() == "kotlin.Any") { - val anyClassDescriptors = resolutionFacade.resolveSession.getTopLevelClassDescriptors( + val anyClassDescriptors = resolutionFacade.resolveSession.getTopLevelClassifierDescriptors( FqName.fromSegments(listOf("kotlin", "Any")), NoLookupLocation.FROM_IDE) anyClassDescriptors.forEach { - val anyMethod = it.getMemberScope(listOf()) + val anyMethod = (it as ClassDescriptor).getMemberScope(listOf()) .getDescriptorsFiltered(DescriptorKindFilter.FUNCTIONS, { it == descriptor.name }) .single() val kdoc = anyMethod.findKDoc() diff --git a/core/src/main/kotlin/Kotlin/KotlinAsJavaDocumentationBuilder.kt b/core/src/main/kotlin/Kotlin/KotlinAsJavaDocumentationBuilder.kt index 304b2bf2..c7ed8292 100644 --- a/core/src/main/kotlin/Kotlin/KotlinAsJavaDocumentationBuilder.kt +++ b/core/src/main/kotlin/Kotlin/KotlinAsJavaDocumentationBuilder.kt @@ -5,7 +5,7 @@ import com.intellij.psi.JavaPsiFacade import com.intellij.psi.PsiClass import com.intellij.psi.PsiNamedElement import org.jetbrains.dokka.Kotlin.DescriptorDocumentationParser -import org.jetbrains.kotlin.asJava.KtLightElement +import org.jetbrains.kotlin.asJava.elements.KtLightElement import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.FqName |