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

[minor] Fix potential problems with sequence, add a todo

Browse Source
This commit is contained in:
Ilya Chernikov
2019-08-27 14:47:24 +02:00
parent c9b25cad01
commit 947867286c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/jvm/src/kotlin/script/experimental/jvm/impl/KJvmCompiledScript.kt
+3 -3
View File
@@ -154,10 +154,10 @@ private fun CompiledScript<*>.makeClassLoaderFromDependencies(baseClassLoader: C
(dep as? JvmDependency)?.classpath?.asSequence()?.map { it.toURI().toURL() } ?: emptySequence() (dep as? JvmDependency)?.classpath?.asSequence()?.map { it.toURI().toURL() } ?: emptySequence()
} }
?: emptySequence() ?: emptySequence()
}.distinct() }.distinct().toList()
// TODO: previous dependencies and classloaders should be taken into account here // TODO: previous dependencies and classloaders should be taken into account here
return if (dependencies.none()) baseClassLoader return if (dependencies.isEmpty()) baseClassLoader
else URLClassLoader(dependencies.toList().toTypedArray(), baseClassLoader) else URLClassLoader(dependencies.toTypedArray(), baseClassLoader)
} }
const val KOTLIN_SCRIPT_METADATA_PATH = "META-INF/kotlin/script" const val KOTLIN_SCRIPT_METADATA_PATH = "META-INF/kotlin/script"
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/jvmCompilationUtil.kt
+1 -1
View File
@@ -89,7 +89,7 @@ internal fun getScriptKtFile(
val scriptText = getMergedScriptText(script, scriptCompilationConfiguration) val scriptText = getMergedScriptText(script, scriptCompilationConfiguration)
val virtualFile = ScriptLightVirtualFile( val virtualFile = ScriptLightVirtualFile(
script.scriptFileName(script, scriptCompilationConfiguration), script.scriptFileName(script, scriptCompilationConfiguration),
(script as? FileBasedScriptSource)?.file?.path, (script as? FileBasedScriptSource)?.file?.path, // TODO: should be absolute path here
scriptText scriptText
) )
val ktFile = psiFileFactory.trySetupPsiForFile(virtualFile, KotlinLanguage.INSTANCE, true, false) as KtFile? val ktFile = psiFileFactory.trySetupPsiForFile(virtualFile, KotlinLanguage.INSTANCE, true, false) as KtFile?