azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ide-console] Add all paths of compiled module (production, test)

Browse Source
This commit is contained in:
Dmitry Kovanikov
2015-09-09 19:48:39 +03:00
committed by Pavel V. Talanov
parent ac6a9d95af
commit 1f4fab0047
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleKeeper.kt
+10 -8
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.console
import com.intellij.execution.Platform import com.intellij.execution.Platform
import com.intellij.execution.configurations.GeneralCommandLine import com.intellij.execution.configurations.GeneralCommandLine
import com.intellij.execution.configurations.JavaParameters import com.intellij.execution.configurations.JavaParameters
import com.intellij.execution.configurations.ParametersList
import com.intellij.openapi.compiler.ex.CompilerPathsEx import com.intellij.openapi.compiler.ex.CompilerPathsEx
import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
@@ -80,9 +81,7 @@ public class KotlinConsoleKeeper(val project: Project) {
// path to compiler and his options // path to compiler and his options
paramList.add("org.jetbrains.kotlin.cli.jvm.K2JVMCompiler") paramList.add("org.jetbrains.kotlin.cli.jvm.K2JVMCompiler")
// add path to compiled output in kompiler classpath addPathToCompiledOutput(paramList, module)
paramList.add("-cp")
paramList.add(pathToCompiledOutput(module))
return commandLine return commandLine
} }
@@ -103,12 +102,15 @@ public class KotlinConsoleKeeper(val project: Project) {
return params return params
} }
private fun pathToCompiledOutput(module: Module): String { private fun addPathToCompiledOutput(paramList: ParametersList, module: Module) {
val outPaths = CompilerPathsEx.getOutputPaths(arrayOf(module)) val pathSeparator = Platform.current().pathSeparator.toString()
val compiledModulePath = outPaths.find { "production" in it } ?: return "<module is not compiled>"
val moduleDependencies = OrderEnumerator.orderEntries(module).recursively().pathsList.pathsString
return "$compiledModulePath${Platform.current().pathSeparator}$moduleDependencies" val compiledModulePath = CompilerPathsEx.getOutputPaths(arrayOf(module)).join(pathSeparator)
val moduleDependencies = OrderEnumerator.orderEntries(module).recursively().pathsList.pathsString
val compiledOutputClasspath = "$compiledModulePath$pathSeparator$moduleDependencies"
paramList.add("-cp")
paramList.add(compiledOutputClasspath)
} }
companion object { companion object {