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

Remove unnecessary fallback LigthClasses from UL

Browse Source
This commit is contained in:
Igor Yakovlev
2019-10-02 16:52:06 +03:00
parent d5e4227a1d
commit d252e795be
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
+11 -10
View File
@@ -62,16 +62,20 @@ import java.util.concurrent.ConcurrentMap
class IDELightClassGenerationSupport(private val project: Project) : LightClassGenerationSupport() { class IDELightClassGenerationSupport(private val project: Project) : LightClassGenerationSupport() {
private inner class KtUltraLightSupportImpl(private val element: KtElement, private val module: Module) : KtUltraLightSupport { private inner class KtUltraLightSupportImpl(private val element: KtElement) : KtUltraLightSupport {
private val module = ModuleUtilCore.findModuleForPsiElement(element)
override val isReleasedCoroutine override val isReleasedCoroutine
get() = module.languageVersionSettings.supportsFeature(LanguageFeature.ReleaseCoroutines) get() = module?.languageVersionSettings?.supportsFeature(LanguageFeature.ReleaseCoroutines) ?: true
private fun KtDeclaration.mayBeModifiedByCompilerPlugins(): Boolean { private fun KtDeclaration.mayBeModifiedByCompilerPlugins(): Boolean {
val facet = KotlinFacet.get(module) module?.let {
val pluginClasspaths = facet?.configuration?.settings?.compilerArguments?.pluginClasspaths val facet = KotlinFacet.get(it)
if (pluginClasspaths.isNullOrEmpty()) return false val pluginClasspaths = facet?.configuration?.settings?.compilerArguments?.pluginClasspaths
if (pluginClasspaths.isNullOrEmpty()) return false
}
val resolvedDescriptor = lazy(LazyThreadSafetyMode.NONE) { val resolvedDescriptor = lazy(LazyThreadSafetyMode.NONE) {
resolveToDescriptorIfAny( resolveToDescriptorIfAny(
@@ -157,8 +161,7 @@ class IDELightClassGenerationSupport(private val project: Project) : LightClassG
if (files.any { it.isScript() }) return null if (files.any { it.isScript() }) return null
val filesToSupports: List<Pair<KtFile, KtUltraLightSupport>> = files.map { val filesToSupports: List<Pair<KtFile, KtUltraLightSupport>> = files.map {
val module = ModuleUtilCore.findModuleForPsiElement(it) ?: return null it to KtUltraLightSupportImpl(it)
it to KtUltraLightSupportImpl(it, module)
} }
return KtUltraLightClassForFacade( return KtUltraLightClassForFacade(
@@ -178,9 +181,7 @@ class IDELightClassGenerationSupport(private val project: Project) : LightClassG
return null return null
} }
val module = ModuleUtilCore.findModuleForPsiElement(element) ?: return null return KtUltraLightSupportImpl(element).let { support ->
return KtUltraLightSupportImpl(element, module).let { support ->
when { when {
element is KtObjectDeclaration && element.isObjectLiteral() -> element is KtObjectDeclaration && element.isObjectLiteral() ->
KtUltraLightClassForAnonymousDeclaration(element, support) KtUltraLightClassForAnonymousDeclaration(element, support)