commit | 45aa7b3db5bc74660d8faca23b39ff34ebdedf45 | [log] [tgz] |
---|---|---|
author | Ilya Muradyan <ilya.muradyan@jetbrains.com> | Mon Feb 27 12:59:44 2023 +0100 |
committer | Ilya Muradyan <ilya.muradyan@jetbrains.com> | Mon Feb 27 12:59:44 2023 +0100 |
tree | 3689b6bc6275355e6bb0082d8645ec05555d8872 | |
parent | e82efa6a7cb3a9b15c0e3aa01fc8148e4b9260c8 [diff] |
Scripts: fix NPE on creating KtFileScriptSource from PSI copy
diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt index 6da7cb8..e51f38e 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt
@@ -79,7 +79,7 @@ * The implementation of the SourceCode for a script located in a KtFile */ open class KtFileScriptSource(val ktFile: KtFile, preloadedText: String? = null) : - VirtualFileScriptSource(ktFile.virtualFile ?: ktFile.originalFile.virtualFile, preloadedText) { + VirtualFileScriptSource(ktFile.virtualFile ?: ktFile.originalFile.virtualFile ?: ktFile.viewProvider.virtualFile, preloadedText) { override val text: String by lazy { preloadedText ?: ktFile.text } override val name: String? get() = ktFile.name