diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-09-07 20:57:17 +0200 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-09-07 20:57:17 +0200 |
| commit | 97257371e1594b25395c7c4baaaa92fb98a0ce97 (patch) | |
| tree | c04101d93fa6b20edb924d0cfe0ea9d3fe403327 /src/Analysis/AnalysisEnvironment.kt | |
| parent | 3d4cda549bdde68935cb0053dceddb8e64e1e20c (diff) | |
| download | dokka-97257371e1594b25395c7c4baaaa92fb98a0ce97.tar.gz dokka-97257371e1594b25395c7c4baaaa92fb98a0ce97.tar.bz2 dokka-97257371e1594b25395c7c4baaaa92fb98a0ce97.zip | |
work in progress on updating Dokka to latest Kotlin (compiles but does not run yet)
Diffstat (limited to 'src/Analysis/AnalysisEnvironment.kt')
| -rw-r--r-- | src/Analysis/AnalysisEnvironment.kt | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/Analysis/AnalysisEnvironment.kt b/src/Analysis/AnalysisEnvironment.kt index 39a05604..8fdb0b51 100644 --- a/src/Analysis/AnalysisEnvironment.kt +++ b/src/Analysis/AnalysisEnvironment.kt @@ -4,24 +4,25 @@ import com.intellij.core.CoreApplicationEnvironment import com.intellij.core.CoreModuleManager import com.intellij.mock.MockComponentManager import com.intellij.openapi.Disposable -import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleManager -import com.intellij.openapi.roots.ContentIterator -import com.intellij.openapi.roots.OrderEntry import com.intellij.openapi.roots.ProjectFileIndex import com.intellij.openapi.util.Disposer -import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.jps.model.module.JpsModuleSourceRootType import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment -import org.jetbrains.kotlin.cli.jvm.config.* -import org.jetbrains.kotlin.config.* +import org.jetbrains.kotlin.cli.jvm.config.JavaSourceRoot +import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot +import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots +import org.jetbrains.kotlin.cli.jvm.config.jvmClasspathRoots +import org.jetbrains.kotlin.config.CommonConfigurationKeys +import org.jetbrains.kotlin.config.CompilerConfiguration +import org.jetbrains.kotlin.config.ContentRoot +import org.jetbrains.kotlin.config.KotlinSourceRoot import org.jetbrains.kotlin.idea.caches.resolve.KotlinCacheService import org.jetbrains.kotlin.idea.caches.resolve.KotlinOutOfBlockCompletionModificationTracker import org.jetbrains.kotlin.idea.caches.resolve.LibraryModificationTracker -import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade +import org.jetbrains.kotlin.idea.resolve.ResolutionFacade import org.jetbrains.kotlin.resolve.lazy.ResolveSession import java.io.File @@ -51,15 +52,15 @@ public class AnalysisEnvironment(val messageCollector: MessageCollector, body: A val moduleManager = CoreModuleManager(environment.project, this) CoreApplicationEnvironment.registerComponentInstance(projectComponentManager.getPicoContainer(), - javaClass<ModuleManager>(), moduleManager) + ModuleManager::class.java, moduleManager) - projectComponentManager.registerService(javaClass<ProjectFileIndex>(), + projectComponentManager.registerService(ProjectFileIndex::class.java, CoreProjectFileIndex()) - projectComponentManager.registerService(javaClass<LibraryModificationTracker>(), + projectComponentManager.registerService(LibraryModificationTracker::class.java, LibraryModificationTracker(environment.project)) - projectComponentManager.registerService(javaClass<KotlinCacheService>(), + projectComponentManager.registerService(KotlinCacheService::class.java, KotlinCacheService(environment.project)) - projectComponentManager.registerService(javaClass<KotlinOutOfBlockCompletionModificationTracker>(), + projectComponentManager.registerService(KotlinOutOfBlockCompletionModificationTracker::class.java, KotlinOutOfBlockCompletionModificationTracker()) val sourceFiles = environment.getSourceFiles() |