Fix legacy definitions error propagation
also fixes script-util test with resolving errors
This commit is contained in:
+13
-11
@@ -170,21 +170,23 @@ done
|
||||
|
||||
val environment = KotlinCoreEnvironment.createForTests(rootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
|
||||
|
||||
try {
|
||||
return KotlinToJVMBytecodeCompiler.compileScript(environment)
|
||||
}
|
||||
catch (e: CompilationException) {
|
||||
messageCollector.report(CompilerMessageSeverity.EXCEPTION, OutputMessageUtil.renderException(e),
|
||||
MessageUtil.psiElementToMessageLocation(e.element))
|
||||
return null
|
||||
}
|
||||
catch (t: Throwable) {
|
||||
return try {
|
||||
KotlinToJVMBytecodeCompiler.compileScript(environment)
|
||||
} catch (e: CompilationException) {
|
||||
messageCollector.report(
|
||||
CompilerMessageSeverity.EXCEPTION, OutputMessageUtil.renderException(e),
|
||||
MessageUtil.psiElementToMessageLocation(e.element)
|
||||
)
|
||||
null
|
||||
} catch (e: IllegalStateException) {
|
||||
messageCollector.report(CompilerMessageSeverity.EXCEPTION, OutputMessageUtil.renderException(e))
|
||||
null
|
||||
} catch (t: Throwable) {
|
||||
MessageCollectorUtil.reportException(messageCollector, t)
|
||||
throw t
|
||||
}
|
||||
|
||||
}
|
||||
finally {
|
||||
} finally {
|
||||
Disposer.dispose(rootDisposable)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user