diff options
| -rw-r--r-- | core/src/main/kotlin/Analysis/CoreProjectFileIndex.kt | 9 | ||||
| -rw-r--r-- | core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt | 2 | ||||
| -rw-r--r-- | core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt | 3 | ||||
| -rw-r--r-- | core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt | 3 | ||||
| -rw-r--r-- | core/src/test/kotlin/format/MarkdownFormatTest.kt | 1 | ||||
| -rw-r--r-- | gradle.properties | 2 | ||||
| -rw-r--r-- | lib/asm-all.jar | bin | 410014 -> 434786 bytes | |||
| -rw-r--r-- | lib/intellij-core-analysis.jar | bin | 38693094 -> 40312313 bytes | |||
| -rw-r--r-- | lib/jdom.jar | bin | 324832 -> 324832 bytes | |||
| -rw-r--r-- | lib/jps-model.jar | bin | 1018680 -> 1033099 bytes | |||
| -rw-r--r-- | lib/kotlin-compiler.jar | bin | 22544590 -> 23210095 bytes | |||
| -rw-r--r-- | lib/kotlin-ide-common.jar | bin | 449435 -> 454987 bytes | |||
| -rw-r--r-- | lib/kotlin-script-runtime.jar | bin | 3299 -> 18356 bytes | |||
| -rw-r--r-- | lib/markdown.jar | bin | 375565 -> 374889 bytes | |||
| -rw-r--r-- | lib/picocontainer.jar | bin | 231869 -> 231869 bytes | |||
| -rw-r--r-- | lib/trove4j.jar | bin | 1167879 -> 1172429 bytes |
16 files changed, 13 insertions, 7 deletions
diff --git a/core/src/main/kotlin/Analysis/CoreProjectFileIndex.kt b/core/src/main/kotlin/Analysis/CoreProjectFileIndex.kt index b01fe746..21f7e2da 100644 --- a/core/src/main/kotlin/Analysis/CoreProjectFileIndex.kt +++ b/core/src/main/kotlin/Analysis/CoreProjectFileIndex.kt @@ -16,6 +16,7 @@ import com.intellij.openapi.util.Key import com.intellij.openapi.util.UserDataHolderBase import com.intellij.openapi.vfs.StandardFileSystems import com.intellij.openapi.vfs.VirtualFile +import com.intellij.openapi.vfs.VirtualFileFilter import com.intellij.psi.search.GlobalSearchScope import com.intellij.util.messages.MessageBus import org.jetbrains.jps.model.module.JpsModuleSourceRootType @@ -31,6 +32,14 @@ import java.io.File * classes from projectModel-{api,impl}. */ class CoreProjectFileIndex(private val project: Project, contentRoots: List<ContentRoot>) : ProjectFileIndex, ModuleFileIndex { + override fun iterateContentUnderDirectory(p0: VirtualFile, p1: ContentIterator, p2: VirtualFileFilter): Boolean { + throw UnsupportedOperationException() + } + + override fun isInLibrary(p0: VirtualFile): Boolean { + throw UnsupportedOperationException() + } + val sourceRoots = contentRoots.filter { it !is JvmClasspathRoot } val classpathRoots = contentRoots.filterIsInstance<JvmClasspathRoot>() diff --git a/core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt b/core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt index 13b9f2de..4dd0bc7f 100644 --- a/core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt +++ b/core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt @@ -97,7 +97,7 @@ open class KotlinWebsiteSampleProcessingService return sampleBuilder.text } - val importsToIgnore = arrayOf("samples.*").map(::ImportPath) + val importsToIgnore = arrayOf("samples.*").map { ImportPath.fromString(it) } override fun processImports(psiElement: PsiElement): ContentBlockCode { val psiFile = psiElement.containingFile diff --git a/core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt b/core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt index fecdeee3..cc172762 100644 --- a/core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt +++ b/core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt @@ -1,7 +1,6 @@ package org.jetbrains.dokka.tests import org.jetbrains.dokka.* -import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList import org.junit.Ignore import org.junit.Test @@ -30,7 +29,7 @@ class KotlinWebSiteFormatTest { val path = "dataTagsInGroupNode" val module = buildMultiplePlatforms(path) verifyModelOutput(module, ".md", "testdata/format/website/$path/multiplatform.kt") { model, output -> - kwsService.createOutputBuilder(output, tempLocation).appendNodes(model.members.single().members.find { it.kind == NodeKind.GroupNode }.singletonOrEmptyList()) + kwsService.createOutputBuilder(output, tempLocation).appendNodes(listOfNotNull(model.members.single().members.find { it.kind == NodeKind.GroupNode })) } verifyMultiplatformPackage(module, path) } diff --git a/core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt b/core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt index 5c2fbe75..6178118a 100644 --- a/core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt +++ b/core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt @@ -1,7 +1,6 @@ package org.jetbrains.dokka.tests import org.jetbrains.dokka.* -import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList import org.junit.Test class KotlinWebSiteHtmlFormatTest { @@ -45,7 +44,7 @@ class KotlinWebSiteHtmlFormatTest { val path = "dataTagsInGroupNode" val module = buildMultiplePlatforms(path) verifyModelOutput(module, ".html", "testdata/format/website-html/$path/multiplatform.kt") { model, output -> - kwsService.createOutputBuilder(output, tempLocation).appendNodes(model.members.single().members.find { it.kind == NodeKind.GroupNode }.singletonOrEmptyList()) + kwsService.createOutputBuilder(output, tempLocation).appendNodes(listOfNotNull(model.members.single().members.find { it.kind == NodeKind.GroupNode })) } verifyMultiplatformPackage(module, path) } diff --git a/core/src/test/kotlin/format/MarkdownFormatTest.kt b/core/src/test/kotlin/format/MarkdownFormatTest.kt index 21298520..16a81165 100644 --- a/core/src/test/kotlin/format/MarkdownFormatTest.kt +++ b/core/src/test/kotlin/format/MarkdownFormatTest.kt @@ -1,7 +1,6 @@ package org.jetbrains.dokka.tests import org.jetbrains.dokka.* -import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList import org.junit.Test class MarkdownFormatTest { diff --git a/gradle.properties b/gradle.properties index 49153ef4..02c2ec2c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ dokka_version=0.9.14 dokka_publication_channel=dokka #Kotlin compiler and plugin -kotlin_version=1.1.0 +kotlin_version=1.1.2 kotlin_for_gradle_version=1.0.6 ant_version=1.9.6 diff --git a/lib/asm-all.jar b/lib/asm-all.jar Binary files differindex b2f2849b..a64a5929 100644 --- a/lib/asm-all.jar +++ b/lib/asm-all.jar diff --git a/lib/intellij-core-analysis.jar b/lib/intellij-core-analysis.jar Binary files differindex bb89df3a..38ddc95b 100644 --- a/lib/intellij-core-analysis.jar +++ b/lib/intellij-core-analysis.jar diff --git a/lib/jdom.jar b/lib/jdom.jar Binary files differindex 8de217d2..b16dbde2 100644 --- a/lib/jdom.jar +++ b/lib/jdom.jar diff --git a/lib/jps-model.jar b/lib/jps-model.jar Binary files differindex 359433a4..538031e0 100644 --- a/lib/jps-model.jar +++ b/lib/jps-model.jar diff --git a/lib/kotlin-compiler.jar b/lib/kotlin-compiler.jar Binary files differindex dc82213b..3a7427b2 100644 --- a/lib/kotlin-compiler.jar +++ b/lib/kotlin-compiler.jar diff --git a/lib/kotlin-ide-common.jar b/lib/kotlin-ide-common.jar Binary files differindex 8e14e48c..458b7646 100644 --- a/lib/kotlin-ide-common.jar +++ b/lib/kotlin-ide-common.jar diff --git a/lib/kotlin-script-runtime.jar b/lib/kotlin-script-runtime.jar Binary files differindex 547ed51d..2b4ab1f0 100644 --- a/lib/kotlin-script-runtime.jar +++ b/lib/kotlin-script-runtime.jar diff --git a/lib/markdown.jar b/lib/markdown.jar Binary files differindex a9011fea..683cc22f 100644 --- a/lib/markdown.jar +++ b/lib/markdown.jar diff --git a/lib/picocontainer.jar b/lib/picocontainer.jar Binary files differindex 8cc07156..b0f0f56b 100644 --- a/lib/picocontainer.jar +++ b/lib/picocontainer.jar diff --git a/lib/trove4j.jar b/lib/trove4j.jar Binary files differindex cf6ef6af..a02528f1 100644 --- a/lib/trove4j.jar +++ b/lib/trove4j.jar |