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

Return default configuration when refinement failed on resolving script descriptor

Browse Source 
also fixes appropriate IDE tests
This commit is contained in:
Ilya Chernikov
2019-07-10 10:25:05 +02:00
parent ab938efa68
commit 1396b3e682
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/dynamicConfigurations.kt
+3 -1
View File
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationResu
import kotlin.script.experimental.api.ScriptCompilationConfiguration import kotlin.script.experimental.api.ScriptCompilationConfiguration
import kotlin.script.experimental.api.ScriptDiagnostic import kotlin.script.experimental.api.ScriptDiagnostic
import kotlin.script.experimental.api.valueOr import kotlin.script.experimental.api.valueOr
import kotlin.script.experimental.api.valueOrNull
fun PsiFile.findScriptCompilationConfiguration(): ScriptCompilationConfiguration? { fun PsiFile.findScriptCompilationConfiguration(): ScriptCompilationConfiguration? {
// Do not use psiFile.script, see comments in findScriptDefinition // Do not use psiFile.script, see comments in findScriptDefinition
@@ -21,7 +22,8 @@ fun PsiFile.findScriptCompilationConfiguration(): ScriptCompilationConfiguration
if (file.isNonScript()) return null if (file.isNonScript()) return null
val provider = ScriptDependenciesProvider.getInstance(project) val provider = ScriptDependenciesProvider.getInstance(project)
return provider?.getScriptConfigurationResult(this)?.valueOrError()?.configuration // Ignoring the error here, assuming that it will be reported elsewhere anyway (this is important scenario in IDE)
return provider?.getScriptConfigurationResult(this)?.valueOrNull()?.configuration
?: findScriptDefinition()?.compilationConfiguration ?: findScriptDefinition()?.compilationConfiguration
} }