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

Android Extensions: Use lazy package fragment descriptors only in IDE

Browse Source
This commit is contained in:
Yan Zhulanow
2018-11-16 20:39:20 +09:00
parent 4f3f813b32
commit 5636227857
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/descriptors/PredefinedPackageFragmentDescriptor.kt
+1 -2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.android.synthetic.descriptors
import com.intellij.openapi.util.ClearableLazyValue
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
import org.jetbrains.kotlin.descriptors.PropertyDescriptor
@@ -38,7 +37,7 @@ class PredefinedPackageFragmentDescriptor(
private val functions: (PredefinedPackageFragmentDescriptor) -> Collection<SimpleFunctionDescriptor> = { emptyList() }
) : PackageFragmentDescriptorImpl(module, fqName) {
class LazyAndroidExtensionsPackageFragmentDescriptor(
val descriptor: ClearableLazyValue<PackageFragmentDescriptor>,
val descriptor: () -> PackageFragmentDescriptor,
val isDeprecated: Boolean
)
plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/AndroidPackageFragmentProviderExtension.kt
+13 -8
View File
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.android.synthetic.res
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.ClearableLazyValue
import org.jetbrains.kotlin.analyzer.ModuleInfo
import org.jetbrains.kotlin.android.synthetic.AndroidConst
import org.jetbrains.kotlin.android.synthetic.descriptors.AndroidSyntheticPackageData
@@ -41,6 +40,12 @@ abstract class AndroidPackageFragmentProviderExtension : PackageFragmentProvider
protected abstract fun isExperimental(moduleInfo: ModuleInfo?): Boolean
protected open fun <T> createLazyValue(value: () -> T): () -> T {
// The default (CLI) implementation is not lazy
val evaluatedValue = value()
return { evaluatedValue }
}
override fun getPackageFragmentProvider(
project: Project,
module: ModuleDescriptor,
@@ -57,7 +62,7 @@ abstract class AndroidPackageFragmentProviderExtension : PackageFragmentProvider
val lazyContext = LazySyntheticElementResolveContext(module, storageManager)
val packages = mutableMapOf<FqName, ClearableLazyValue<PackageFragmentDescriptor>>()
val packages = mutableMapOf<FqName, () -> PackageFragmentDescriptor>()
val packagesToLookupInCompletion = mutableListOf<LazyAndroidExtensionsPackageFragmentDescriptor>()
// Packages with synthetic properties
@@ -66,7 +71,7 @@ abstract class AndroidPackageFragmentProviderExtension : PackageFragmentProvider
fun createPackageFragment(fqNameString: String, forView: Boolean, isDeprecated: Boolean = false) {
val fqName = FqName(fqNameString)
val lazyPackageDescriptor = ClearableLazyValue.create<PackageFragmentDescriptor> {
val lazyPackageDescriptor = createLazyValue {
val packageData = AndroidSyntheticPackageData(moduleData, forView, isDeprecated) {
layoutXmlFileManager.extractResources(AndroidLayoutGroupData(layoutName, layouts), module)
}
@@ -90,14 +95,14 @@ abstract class AndroidPackageFragmentProviderExtension : PackageFragmentProvider
// Empty middle packages
AndroidConst.SYNTHETIC_SUBPACKAGES.forEachUntilLast { fqNameString ->
val fqName = FqName(fqNameString)
packages[fqName] = ClearableLazyValue.create<PackageFragmentDescriptor> {
packages[fqName] = createLazyValue {
PredefinedPackageFragmentDescriptor(fqName, module, storageManager)
}
}
for (variantData in moduleData.variants) {
val fqName = FqName(AndroidConst.SYNTHETIC_PACKAGE + '.' + variantData.variant.name)
packages[fqName] = ClearableLazyValue.create<PackageFragmentDescriptor> {
packages[fqName] = createLazyValue {
PredefinedPackageFragmentDescriptor(fqName, module, storageManager)
}
}
@@ -105,7 +110,7 @@ abstract class AndroidPackageFragmentProviderExtension : PackageFragmentProvider
// Package with clearFindViewByIdCache()
AndroidConst.SYNTHETIC_SUBPACKAGES.last().let { fqNameString ->
val fqName = FqName(fqNameString)
val lazyPackageDescriptor = ClearableLazyValue.create<PackageFragmentDescriptor> {
val lazyPackageDescriptor = createLazyValue {
PredefinedPackageFragmentDescriptor(fqName, module, storageManager, packagesToLookupInCompletion) { descriptor ->
val widgetReceivers = lazyContext().getWidgetReceivers(forView = false, isExperimental = isExperimental) +
lazyContext().getWidgetReceivers(forView = true, isExperimental = isExperimental)
@@ -125,9 +130,9 @@ abstract class AndroidPackageFragmentProviderExtension : PackageFragmentProvider
}
class AndroidSyntheticPackageFragmentProvider(
val packages: Map<FqName, ClearableLazyValue<PackageFragmentDescriptor>>
val packages: Map<FqName, () -> PackageFragmentDescriptor>
) : PackageFragmentProvider {
override fun getPackageFragments(fqName: FqName) = listOfNotNull(packages[fqName]?.value)
override fun getPackageFragments(fqName: FqName) = listOfNotNull(packages[fqName]?.invoke())
override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean): List<FqName> {
return packages.asSequence()