Replace message collector with reporting lambda

to simplify usages and slightly reduce dependencies
This commit is contained in:
Ilya Chernikov
2019-04-24 12:41:10 +02:00
parent 61c1312f1a
commit a4c049d26e
6 changed files with 56 additions and 46 deletions
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionContributor
import org.jetbrains.kotlin.idea.core.script.loadDefinitionsFromTemplates
import org.jetbrains.kotlin.scripting.definitions.KotlinScriptDefinition
import org.jetbrains.kotlin.scripting.definitions.ScriptDefinitionsFromClasspathDiscoverySource
import org.jetbrains.kotlin.scripting.definitions.reporter
import kotlin.script.experimental.intellij.ScriptDefinitionsProvider
class BridgeScriptDefinitionsContributor(private val project: Project) : ScriptDefinitionContributor {
@@ -34,7 +35,7 @@ class BridgeScriptDefinitionsContributor(private val project: Project) : ScriptD
else ScriptDefinitionsFromClasspathDiscoverySource(
classPath,
emptyMap(),
messageCollector
messageCollector.reporter
).definitions
explicitDefinitions + discoveredDefinitions
}