diff options
| author | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-04-24 22:30:57 +0300 |
|---|---|---|
| committer | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-04-24 22:30:57 +0300 |
| commit | b1c8964f723cb864219847e775eb2ad2d114c52c (patch) | |
| tree | e6d494562e15210f5ea756c58e11398b980a0742 /core/src/main/kotlin | |
| parent | fccbf5536b44f6c12859b45358fdedab5c255b8d (diff) | |
| download | dokka-b1c8964f723cb864219847e775eb2ad2d114c52c.tar.gz dokka-b1c8964f723cb864219847e775eb2ad2d114c52c.tar.bz2 dokka-b1c8964f723cb864219847e775eb2ad2d114c52c.zip | |
Update bundled kotlin-compiler to 1.1.2
Diffstat (limited to 'core/src/main/kotlin')
| -rw-r--r-- | core/src/main/kotlin/Analysis/CoreProjectFileIndex.kt | 9 | ||||
| -rw-r--r-- | core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt | 2 |
2 files changed, 10 insertions, 1 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 |