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

Fix classpah update moment on script dependencies calculations

Browse Source
This commit is contained in:
Ilya Chernikov
2016-12-02 14:28:21 +01:00
parent c01959333a
commit eb3d8a1a4a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericRepl.kt
+4 -1
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.vfs.CharsetToolkit
import com.intellij.psi.PsiFileFactory import com.intellij.psi.PsiFileFactory
import com.intellij.psi.impl.PsiFileFactoryImpl import com.intellij.psi.impl.PsiFileFactoryImpl
import com.intellij.testFramework.LightVirtualFile import com.intellij.testFramework.LightVirtualFile
import java.io.File
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.MessageCollector
@@ -130,8 +131,10 @@ open class GenericReplCompiler(
} }
val newDependencies = scriptDefinition.getDependenciesFor(psiFile, environment.project, lastDependencies) val newDependencies = scriptDefinition.getDependenciesFor(psiFile, environment.project, lastDependencies)
var classpathAddendum: List<File>? = null
if (lastDependencies != newDependencies) { if (lastDependencies != newDependencies) {
lastDependencies = newDependencies lastDependencies = newDependencies
classpathAddendum = newDependencies?.let { environment.updateClasspath(it.classpath.map(::JvmClasspathRoot)) }
} }
val analysisResult = analyzerEngine.analyzeReplLine(psiFile, codeLine.no) val analysisResult = analyzerEngine.analyzeReplLine(psiFile, codeLine.no)
@@ -164,7 +167,7 @@ open class GenericReplCompiler(
return ReplCompileResult.CompiledClasses(descriptorsHistory.lines, return ReplCompileResult.CompiledClasses(descriptorsHistory.lines,
state.factory.asList().map { CompiledClassData(it.relativePath, it.asByteArray()) }, state.factory.asList().map { CompiledClassData(it.relativePath, it.asByteArray()) },
state.replSpecific.hasResult, state.replSpecific.hasResult,
newDependencies?.let { environment.updateClasspath(it.classpath.map(::JvmClasspathRoot)) } ?: emptyList()) classpathAddendum ?: emptyList())
} }
companion object { companion object {