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

Do not resolve services in non-default ctors

Browse Source
This commit is contained in:
Vladimir Dolzhenko
2019-09-24 09:11:20 +02:00
parent 0e1e1e350f
commit 8b0aeb9a55
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManager.kt
+2 -5
View File
@@ -38,10 +38,7 @@ import kotlin.script.experimental.api.makeFailureResult
// NOTE: this service exists exclusively because ScriptDependencyManager
// cannot be registered as implementing two services (state would be duplicated)
class IdeScriptDependenciesProvider(
private val scriptConfigurationManager: ScriptConfigurationManager,
project: Project
) : ScriptDependenciesProvider(project) {
class IdeScriptDependenciesProvider(project: Project) : ScriptDependenciesProvider(project) {
override fun getScriptConfigurationResult(file: KtFile): ScriptCompilationConfigurationResult? {
val configuration = getScriptConfiguration(file)
val reports = IdeScriptReportSink.getReports(file)
@@ -52,7 +49,7 @@ class IdeScriptDependenciesProvider(
}
override fun getScriptConfiguration(file: KtFile): ScriptCompilationConfigurationWrapper? {
return scriptConfigurationManager.getConfiguration(file)
return ScriptConfigurationManager.getInstance(project).getConfiguration(file)
}
}