Merge branch 'udalov-jet'

8 files changed, 44 insertions, 45 deletions

diff --git a/.gitignore b/.gitignore
index 278ea8d1..182d9c77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+/.idea/workspace.xml
 out
 doc
diff --git a/src/Analysis/AnalysisEnvironment.kt b/src/Analysis/AnalysisEnvironment.kt
index cc0e7184..1bf3575f 100644
--- a/src/Analysis/AnalysisEnvironment.kt
+++ b/src/Analysis/AnalysisEnvironment.kt
@@ -1,17 +1,17 @@
 package org.jetbrains.dokka
 
-import org.jetbrains.jet.cli.common.messages.*
+import org.jetbrains.kotlin.cli.common.messages.*
 import com.intellij.openapi.*
-import org.jetbrains.jet.cli.jvm.compiler.*
-import org.jetbrains.jet.lang.resolve.*
-import org.jetbrains.jet.lang.psi.*
+import org.jetbrains.kotlin.cli.jvm.compiler.*
+import org.jetbrains.kotlin.resolve.*
+import org.jetbrains.kotlin.psi.*
 import java.io.File
-import org.jetbrains.jet.config.*
-import org.jetbrains.jet.cli.common.*
-import org.jetbrains.jet.cli.jvm.*
+import org.jetbrains.kotlin.config.*
+import org.jetbrains.kotlin.cli.common.*
+import org.jetbrains.kotlin.cli.jvm.*
 import com.intellij.openapi.util.*
-import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
-import org.jetbrains.jet.lang.resolve.lazy.ResolveSession
+import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+import org.jetbrains.kotlin.resolve.lazy.ResolveSession
 
 /**
  * Kotlin as a service entry point
diff --git a/src/Analysis/CommentsAPI.kt b/src/Analysis/CommentsAPI.kt
index b195107a..ce453113 100644
--- a/src/Analysis/CommentsAPI.kt
+++ b/src/Analysis/CommentsAPI.kt
@@ -1,9 +1,8 @@
 package org.jetbrains.dokka
 
-import org.jetbrains.jet.lang.descriptors.*
-import org.jetbrains.jet.lang.resolve.*
-import org.jetbrains.jet.kdoc.psi.api.*
-import org.jetbrains.jet.lang.psi.*
+import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.resolve.*
+import org.jetbrains.kotlin.kdoc.psi.api.*
 
 /**
  * Retrieves PSI elements representing documentation from the [DeclarationDescriptor]
diff --git a/src/Analysis/CompilerAPI.kt b/src/Analysis/CompilerAPI.kt
index 8216c549..20e91e1d 100644
--- a/src/Analysis/CompilerAPI.kt
+++ b/src/Analysis/CompilerAPI.kt
@@ -1,19 +1,17 @@
 package org.jetbrains.dokka
 
-import org.jetbrains.jet.cli.common.arguments.*
-import org.jetbrains.jet.cli.jvm.compiler.*
-import org.jetbrains.jet.utils.*
+import org.jetbrains.kotlin.cli.common.arguments.*
+import org.jetbrains.kotlin.cli.jvm.compiler.*
+import org.jetbrains.kotlin.utils.*
 import java.io.*
-import org.jetbrains.jet.lang.resolve.java.*
-import org.jetbrains.jet.lang.resolve.*
-import org.jetbrains.jet.lang.psi.*
-import org.jetbrains.jet.analyzer.*
-import org.jetbrains.jet.lang.descriptors.*
-import org.jetbrains.jet.lang.resolve.scopes.*
-import org.jetbrains.jet.context.GlobalContext
+import org.jetbrains.kotlin.resolve.jvm.*
+import org.jetbrains.kotlin.analyzer.*
+import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.resolve.scopes.*
+import org.jetbrains.kotlin.context.GlobalContext
 import com.intellij.psi.search.GlobalSearchScope
-import org.jetbrains.jet.lang.resolve.name.Name
-import org.jetbrains.jet.lang.resolve.lazy.ResolveSession
+import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.resolve.lazy.ResolveSession
 
 private fun getAnnotationsPath(paths: KotlinPaths, arguments: K2JVMCompilerArguments): MutableList<File> {
     val annotationsPath = arrayListOf<File>()
diff --git a/src/Kotlin/ContentBuilder.kt b/src/Kotlin/ContentBuilder.kt
index 0143feed..0143a46e 100644
--- a/src/Kotlin/ContentBuilder.kt
+++ b/src/Kotlin/ContentBuilder.kt
@@ -1,10 +1,10 @@
 package org.jetbrains.dokka
 
 import java.util.ArrayDeque
-import org.jetbrains.jet.lang.descriptors.*
-import org.jetbrains.jet.lang.resolve.*
-import org.jetbrains.jet.lang.resolve.scopes.*
-import org.jetbrains.jet.lang.resolve.name.*
+import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.resolve.*
+import org.jetbrains.kotlin.resolve.scopes.*
+import org.jetbrains.kotlin.name.*
 import org.intellij.markdown.*
 
 public fun DocumentationBuilder.buildContent(tree: MarkdownNode, descriptor: DeclarationDescriptor): Content {
diff --git a/src/Kotlin/DocumentationBuilder.kt b/src/Kotlin/DocumentationBuilder.kt
index baa17b5c..8b6b19d3 100644
--- a/src/Kotlin/DocumentationBuilder.kt
+++ b/src/Kotlin/DocumentationBuilder.kt
@@ -1,17 +1,17 @@
 package org.jetbrains.dokka
 
-import org.jetbrains.jet.lang.descriptors.*
+import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.dokka.DocumentationNode.*
-import org.jetbrains.jet.lang.types.*
-import org.jetbrains.jet.lang.types.lang.*
-import org.jetbrains.jet.lang.resolve.name.*
-import org.jetbrains.jet.lang.resolve.lazy.*
-import org.jetbrains.jet.lang.descriptors.annotations.Annotated
-import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
-import org.jetbrains.jet.lang.resolve.DescriptorUtils
-import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant
+import org.jetbrains.kotlin.types.*
+import org.jetbrains.kotlin.builtins.*
+import org.jetbrains.kotlin.name.*
+import org.jetbrains.kotlin.resolve.lazy.*
+import org.jetbrains.kotlin.resolve.DescriptorUtils
+import org.jetbrains.kotlin.descriptors.annotations.Annotated
+import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
+import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant
 import com.intellij.openapi.util.text.StringUtil
-import org.jetbrains.jet.lang.descriptors.impl.EnumEntrySyntheticClassDescriptor
+import org.jetbrains.kotlin.descriptors.impl.EnumEntrySyntheticClassDescriptor
 
 public data class DocumentationOptions(val includeNonPublic: Boolean = false)
 
diff --git a/src/main.kt b/src/main.kt
index b496b1fd..24853be5 100644
--- a/src/main.kt
+++ b/src/main.kt
@@ -2,12 +2,12 @@ package org.jetbrains.dokka
 
 import com.sampullara.cli.*
 import com.intellij.openapi.util.*
-import org.jetbrains.jet.cli.common.messages.*
-import org.jetbrains.jet.cli.common.arguments.*
-import org.jetbrains.jet.utils.PathUtil
+import org.jetbrains.kotlin.cli.common.messages.*
+import org.jetbrains.kotlin.cli.common.arguments.*
+import org.jetbrains.kotlin.utils.PathUtil
 import java.io.File
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
-import org.jetbrains.jet.lang.resolve.name.FqName
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.name.FqName
 
 class DokkaArguments {
     Argument(value = "src", description = "Source file or directory (allows many paths separated by the system path separator)")
diff --git a/test/src/TestAPI.kt b/test/src/TestAPI.kt
index e559e337..901e78fc 100644
--- a/test/src/TestAPI.kt
+++ b/test/src/TestAPI.kt
@@ -1,9 +1,10 @@
 package org.jetbrains.dokka.tests
 
-import org.jetbrains.jet.cli.common.messages.*
+import org.jetbrains.kotlin.cli.common.messages.*
 import com.intellij.openapi.util.*
 import kotlin.test.fail
 import org.jetbrains.dokka.*
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import java.io.File
 import com.intellij.openapi.application.PathManager
 import org.junit.Assert