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

Android Extensions: Use smart pointers in 'AndroidResource'

Browse Source
This commit is contained in:
Yan Zhulanow
2018-11-01 14:42:07 +09:00
parent 3d2a3cddff
commit 12a05e0006
3 changed files with 15 additions and 8 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/res/AndroidLayoutXmlFileManager.kt
+5 -3
View File
@@ -27,6 +27,7 @@ import com.intellij.psi.PsiManager
import org.jetbrains.kotlin.android.synthetic.AndroidConst
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.PropertyDescriptor
import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer
import java.util.*
class AndroidVariantData(val variant: AndroidVariant, val layouts: Map<String, List<PsiFile>>)
@@ -93,10 +94,11 @@ abstract class AndroidLayoutXmlFileManager(val project: Project) {
protected abstract fun doExtractResources(layoutGroup: AndroidLayoutGroupData, module: ModuleDescriptor): AndroidLayoutGroup
protected fun parseAndroidResource(id: ResourceIdentifier, tag: String, sourceElement: PsiElement?): AndroidResource {
val sourceElementPointer = sourceElement?.createSmartPointer()
return when (tag) {
"fragment" -> AndroidResource.Fragment(id, sourceElement)
"include" -> AndroidResource.Widget(id, AndroidConst.VIEW_FQNAME, sourceElement)
else -> AndroidResource.Widget(id, tag, sourceElement)
"fragment" -> AndroidResource.Fragment(id, sourceElementPointer)
"include" -> AndroidResource.Widget(id, AndroidConst.VIEW_FQNAME, sourceElementPointer)
else -> AndroidResource.Widget(id, tag, sourceElementPointer)
}
}
plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/androidResources.kt
+8 -3
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.android.synthetic.res
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElement
import com.intellij.psi.SmartPsiElementPointer
import com.intellij.psi.util.CachedValue
import com.intellij.psi.util.CachedValueProvider
import com.intellij.psi.util.CachedValuesManager
@@ -65,14 +66,18 @@ class AndroidLayoutGroup(val name: String, val layouts: List<AndroidLayout>)
class AndroidLayout(val resources: List<AndroidResource>)
sealed class AndroidResource(val id: ResourceIdentifier, val sourceElement: PsiElement?, val partiallyDefined: Boolean) {
sealed class AndroidResource(
val id: ResourceIdentifier,
val sourceElement: SmartPsiElementPointer<PsiElement>?,
val partiallyDefined: Boolean
) {
open fun sameClass(other: AndroidResource): Boolean = false
open fun partiallyDefined(): AndroidResource = this
class Widget(
id: ResourceIdentifier,
val xmlType: String,
sourceElement: PsiElement?,
sourceElement: SmartPsiElementPointer<PsiElement>?,
partiallyDefined: Boolean = false
) : AndroidResource(id, sourceElement, partiallyDefined) {
override fun sameClass(other: AndroidResource) = other is Widget
@@ -81,7 +86,7 @@ sealed class AndroidResource(val id: ResourceIdentifier, val sourceElement: PsiE
class Fragment(
id: ResourceIdentifier,
sourceElement: PsiElement?,
sourceElement: SmartPsiElementPointer<PsiElement>?,
partiallyDefined: Boolean = false
) : AndroidResource(id, sourceElement, partiallyDefined) {
override fun sameClass(other: AndroidResource) = other is Fragment
plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/syntheticDescriptorGeneration.kt
+2 -2
View File
@@ -59,7 +59,7 @@ internal fun genPropertyForWidget(
resolvedWidget: ResolvedWidget,
context: SyntheticElementResolveContext
): PropertyDescriptor {
val sourceEl = resolvedWidget.widget.sourceElement?.let(::XmlSourceElement) ?: SourceElement.NO_SOURCE
val sourceEl = resolvedWidget.widget.sourceElement?.element?.let(::XmlSourceElement) ?: SourceElement.NO_SOURCE
val classDescriptor = resolvedWidget.viewClassDescriptor
val type = classDescriptor?.let {
@@ -83,7 +83,7 @@ internal fun genPropertyForFragment(
type: SimpleType,
fragment: AndroidResource.Fragment
): PropertyDescriptor {
val sourceElement = fragment.sourceElement?.let(::XmlSourceElement) ?: SourceElement.NO_SOURCE
val sourceElement = fragment.sourceElement?.element?.let(::XmlSourceElement) ?: SourceElement.NO_SOURCE
return genProperty(fragment, receiverType, type, packageFragmentDescriptor, sourceElement, null)
}