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

Fix a pack of broken IDE action tests

Browse Source 
Related to KT-20281.
For Java resolve we can use also resolve with 'null' platform,
which is possible situation in tests.
This commit is contained in:
Mikhail Glukhikh
2018-02-06 15:01:21 +03:00
parent 09d167eafb
commit 81122ed236
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt
+3 -1
View File
@@ -70,7 +70,9 @@ object JvmAnalyzerFacade : AnalyzerFacade() {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
val resolverForReferencedModule = referencedClassModule?.let { resolverForProject.tryGetResolverForModule(it as M) } val resolverForReferencedModule = referencedClassModule?.let { resolverForProject.tryGetResolverForModule(it as M) }
val resolverForModule = resolverForReferencedModule?.takeIf { referencedClassModule.platform == JvmPlatform } ?: run { val resolverForModule = resolverForReferencedModule?.takeIf {
referencedClassModule.platform == JvmPlatform || referencedClassModule.platform == null
} ?: run {
// in case referenced class lies outside of our resolver, resolve the class as if it is inside our module // in case referenced class lies outside of our resolver, resolve the class as if it is inside our module
// this leads to java class being resolved several times // this leads to java class being resolved several times
resolverForProject.resolverForModule(moduleInfo) resolverForProject.resolverForModule(moduleInfo)