From 24e8e7c40df847186aaa8d579264fe59bd3050da Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 2 May 2018 20:24:59 +0200 Subject: [PATCH] Eliminate script dependencies queries for non-scripts --- .../src/org/jetbrains/kotlin/resolve/lazy/FileScopeFactory.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeFactory.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeFactory.kt index 5809f57db6c..f2834aeabc1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeFactory.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeFactory.kt @@ -153,7 +153,7 @@ class FileScopeFactory( val result = FileScopes(lexicalScope, lazyImportingScope, importResolver) private fun createDefaultImportResolversForFile(): Pair { - val extraImports = file.originalFile.virtualFile?.let { vFile -> + val extraImports = file.takeIf { it.isScript() }?.originalFile?.virtualFile?.let { vFile -> val scriptExternalDependencies = getScriptExternalDependencies(vFile, file.project) ktImportsFactory.createImportDirectives(scriptExternalDependencies?.imports?.map { ImportPath.fromString(it) }.orEmpty()) }.orEmpty()