aboutsummaryrefslogtreecommitdiff
path: root/src/Kotlin/KotlinAsJavaDocumentationBuilder.kt
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2015-11-16 19:45:45 +0100
committerDmitry Jemerov <yole@jetbrains.com>2015-11-16 19:46:09 +0100
commit64946eac93632e615a48a72ab1bcb7d4978b6edf (patch)
tree17ed367e99dfa4ae3f4535030e37b2567bc75f97 /src/Kotlin/KotlinAsJavaDocumentationBuilder.kt
parent53f6584797ea8898df937be0835e274a10a12f28 (diff)
downloaddokka-64946eac93632e615a48a72ab1bcb7d4978b6edf.tar.gz
dokka-64946eac93632e615a48a72ab1bcb7d4978b6edf.tar.bz2
dokka-64946eac93632e615a48a72ab1bcb7d4978b6edf.zip
update to Kotlin beta 2
Diffstat (limited to 'src/Kotlin/KotlinAsJavaDocumentationBuilder.kt')
-rw-r--r--src/Kotlin/KotlinAsJavaDocumentationBuilder.kt8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Kotlin/KotlinAsJavaDocumentationBuilder.kt b/src/Kotlin/KotlinAsJavaDocumentationBuilder.kt
index a802e06c..7a1d591c 100644
--- a/src/Kotlin/KotlinAsJavaDocumentationBuilder.kt
+++ b/src/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.KotlinLightElement
+import org.jetbrains.kotlin.asJava.KtLightElement
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.name.FqName
@@ -31,13 +31,13 @@ class KotlinAsJavaDocumentationBuilder
documentationBuilder.refGraph,
kotlinAsJavaDocumentationParser)
- psiPackage.classes.filter { it is KotlinLightElement<*, *> }.filter { it.isVisibleInDocumentation() }.forEach {
+ psiPackage.classes.filter { it is KtLightElement<*, *> }.filter { it.isVisibleInDocumentation() }.forEach {
javaDocumentationBuilder.appendClasses(packageNode, arrayOf(it))
}
}
fun PsiClass.isVisibleInDocumentation() : Boolean {
- val origin: KtDeclaration? = (this as KotlinLightElement<*, *>).getOrigin()
+ val origin: KtDeclaration? = (this as KtLightElement<*, *>).getOrigin()
return origin?.hasModifier(KtTokens.INTERNAL_KEYWORD) != true &&
origin?.hasModifier(KtTokens.PRIVATE_KEYWORD) != true
}
@@ -48,7 +48,7 @@ class KotlinAsJavaDocumentationParser
val descriptorDocumentationParser: DescriptorDocumentationParser) : JavaDocumentationParser
{
override fun parseDocumentation(element: PsiNamedElement): JavadocParseResult {
- val kotlinLightElement = element as? KotlinLightElement<*, *> ?: return JavadocParseResult.Empty
+ val kotlinLightElement = element as? KtLightElement<*, *> ?: return JavadocParseResult.Empty
val origin = kotlinLightElement.getOrigin() ?: return JavadocParseResult.Empty
if (origin is KtParameter) {
// LazyDeclarationResolver does not support setter parameters