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

[ide-console] Minor: change pathSeparator variable

Browse Source
This commit is contained in:
Dmitry Kovanikov
2015-09-18 14:01:41 +03:00
committed by Pavel V. Talanov
parent 30d675d49f
commit ad49272b3b
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleKeeper.kt
+2 -6
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.console package org.jetbrains.kotlin.console
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.execution.configurations.ParametersList
@@ -33,7 +32,6 @@ import com.intellij.openapi.vfs.VirtualFile
import com.intellij.util.SystemProperties import com.intellij.util.SystemProperties
import org.jetbrains.kotlin.console.actions.errorNotification import org.jetbrains.kotlin.console.actions.errorNotification
import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.PathUtil
import org.jetbrains.kotlin.utils.join
import java.io.File import java.io.File
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
@@ -105,11 +103,9 @@ public class KotlinConsoleKeeper(val project: Project) {
} }
private fun addPathToCompiledOutput(paramList: ParametersList, module: Module) { private fun addPathToCompiledOutput(paramList: ParametersList, module: Module) {
val pathSeparator = Platform.current().pathSeparator.toString() val compiledModulePath = CompilerPathsEx.getOutputPaths(arrayOf(module)).join(File.pathSeparator)
val compiledModulePath = CompilerPathsEx.getOutputPaths(arrayOf(module)).join(pathSeparator)
val moduleDependencies = OrderEnumerator.orderEntries(module).recursively().pathsList.pathsString val moduleDependencies = OrderEnumerator.orderEntries(module).recursively().pathsList.pathsString
val compiledOutputClasspath = "$compiledModulePath$pathSeparator$moduleDependencies" val compiledOutputClasspath = "$compiledModulePath${File.pathSeparator}$moduleDependencies"
paramList.add("-cp") paramList.add("-cp")
paramList.add(compiledOutputClasspath) paramList.add(compiledOutputClasspath)