From 78e249c2d5bb0cbdeaf956e853fa10d48fbc2b83 Mon Sep 17 00:00:00 2001 From: Igor Yakovlev Date: Thu, 15 Jul 2021 17:54:02 +0200 Subject: [PATCH] [FIR IDE] Fix creating fir light classes for NotUnderContentRootModuleInfo module content --- .../src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt | 1 + .../jetbrains/kotlin/idea/asJava/IDEKotlinAsJavaFirSupport.kt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt index eb055c34193..a6aa5a8a8e2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt @@ -118,6 +118,7 @@ interface TrackableModuleInfo : ModuleInfo { } interface LibraryModuleSourceInfoBase : ModuleInfo +interface NonSourceModuleInfoBase : ModuleInfo interface LibraryModuleInfo : ModuleInfo { override val platform: TargetPlatform diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/IDEKotlinAsJavaFirSupport.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/IDEKotlinAsJavaFirSupport.kt index 0f775e8cba7..b12d56e2b04 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/IDEKotlinAsJavaFirSupport.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/IDEKotlinAsJavaFirSupport.kt @@ -12,6 +12,7 @@ import com.intellij.psi.search.GlobalSearchScope import com.intellij.util.SmartList import org.jetbrains.kotlin.analyzer.LibraryModuleInfo import org.jetbrains.kotlin.analyzer.LibraryModuleSourceInfoBase +import org.jetbrains.kotlin.analyzer.NonSourceModuleInfoBase import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport import org.jetbrains.kotlin.asJava.classes.KtFakeLightClass import org.jetbrains.kotlin.asJava.classes.KtLightClass @@ -73,6 +74,7 @@ class IDEKotlinAsJavaFirSupport(private val project: Project) : KotlinAsJavaSupp //TODO Do not return LC came from LibrarySources when (it.getModuleInfo()) { is LibraryModuleSourceInfoBase -> it.containingKtFile.isCompiled + is NonSourceModuleInfoBase -> false else -> true } }.toSet()