Pass script source directly instead of via configuration

This commit is contained in:
Ilya Chernikov
2018-03-27 20:12:44 +02:00
parent 29797ec264
commit 6ea41b425d
7 changed files with 27 additions and 17 deletions
@@ -69,6 +69,7 @@ class KJVMCompiledScript<out ScriptBase : Any>(
class KJVMCompilerImpl : KJVMCompilerProxy {
override fun compile(
script: ScriptSource,
scriptCompilerConfiguration: ScriptCompileConfiguration,
configurator: ScriptCompilationConfigurator?
): ResultWithDiagnostics<CompiledScript<*>> {
@@ -147,7 +148,7 @@ class KJVMCompilerImpl : KJVMCompilerProxy {
val analyzerWithCompilerReport = AnalyzerWithCompilerReport(messageCollector, environment.configuration.languageVersionSettings)
val psiFileFactory: PsiFileFactoryImpl = PsiFileFactory.getInstance(environment.project) as PsiFileFactoryImpl
val scriptText = scriptCompilerConfiguration[ScriptCompileConfigurationParams.scriptSourceFragments].getMergedScriptText()
val scriptText = getMergedScriptText(script, scriptCompilerConfiguration)
val scriptFileName = "script" // TODO: extract from file/url if available
val virtualFile = LightVirtualFile(
"$scriptFileName${KotlinParserDefinition.STD_SCRIPT_EXT}",