From 692840860ed2c85843da35e4f4d51053d893f770 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 17 May 2017 10:53:39 +0300 Subject: [PATCH] Use allScope when resolving classifiers of binary classes Otherwise it might lead to the problems when reading class files from the source scope (e.g. a groovy file or an already compiled java file) Note that it may be reproduced only with Maven because in JPS and Gradle we reading source java files even when they're shouldn't be recompiled, while in Maven we read class files in the case #KT-17897 Fixed --- .../kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt index 98e5d6b9f41..159d45b03fc 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt @@ -89,7 +89,7 @@ class KotlinCliJavaFileManagerImpl(private val myPsiManager: PsiManager) : CoreJ return@getOrPut outerClass?.findInnerClass(classId.shortClassName) } - val resolver = ClassifierResolutionContext { findClass(it, searchScope) } + val resolver = ClassifierResolutionContext { findClass(it, allScope) } BinaryJavaClass( virtualFile,