Move AndroidExpressionCodegenExtension to the separate file
This commit is contained in:
Yan Zhulanow
@@ -16,42 +16,22 @@
|
||||
|
||||
package org.jetbrains.kotlin.android
|
||||
|
||||
import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
|
||||
import com.intellij.mock.MockProject
|
||||
import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
|
||||
import com.intellij.openapi.components.ServiceManager
|
||||
import com.intellij.openapi.extensions.Extensions
|
||||
import com.intellij.openapi.project.Project
|
||||
import com.intellij.psi.impl.PsiTreeChangePreprocessor
|
||||
import org.jetbrains.kotlin.analyzer.ModuleInfo
|
||||
import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension
|
||||
import org.jetbrains.kotlin.compiler.plugin.CliOption
|
||||
import org.jetbrains.kotlin.compiler.plugin.CliOptionProcessingException
|
||||
import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider
|
||||
import com.intellij.openapi.components.ServiceManager
|
||||
import com.intellij.openapi.project.Project
|
||||
import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension
|
||||
import org.jetbrains.org.objectweb.asm.Type
|
||||
import org.jetbrains.org.objectweb.asm.Opcodes.*
|
||||
import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
|
||||
import org.jetbrains.org.objectweb.asm.Label
|
||||
import org.jetbrains.kotlin.analyzer.ModuleInfo
|
||||
import org.jetbrains.kotlin.psi.JetFile
|
||||
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
|
||||
import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaClassDescriptor
|
||||
import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassDescriptor
|
||||
import org.jetbrains.kotlin.psi.JetClassOrObject
|
||||
import org.jetbrains.kotlin.psi.JetClass
|
||||
import org.jetbrains.kotlin.psi.JetClassBody
|
||||
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
|
||||
import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
|
||||
import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
|
||||
import org.jetbrains.kotlin.config.CompilerConfiguration
|
||||
import org.jetbrains.kotlin.config.CompilerConfigurationKey
|
||||
import org.jetbrains.kotlin.resolve.scopes.receivers.ClassReceiver
|
||||
import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
|
||||
import org.jetbrains.kotlin.psi.JetThisExpression
|
||||
import org.jetbrains.kotlin.resolve.source.KotlinSourceElement
|
||||
import org.jetbrains.kotlin.resolve.scopes.receivers.ExtensionReceiver
|
||||
import org.jetbrains.kotlin.descriptors.*
|
||||
import org.jetbrains.kotlin.codegen.state.*
|
||||
import org.jetbrains.kotlin.codegen.*
|
||||
import org.jetbrains.kotlin.resolve.*
|
||||
import com.intellij.openapi.extensions.*
|
||||
import com.intellij.psi.impl.*
|
||||
import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider
|
||||
import org.jetbrains.kotlin.lang.resolve.android.*
|
||||
import org.jetbrains.kotlin.psi.JetFile
|
||||
|
||||
public object AndroidConfigurationKeys {
|
||||
|
||||
@@ -88,151 +68,6 @@ public class CliAndroidDeclarationsProvider(private val project: Project) : Exte
|
||||
}
|
||||
}
|
||||
|
||||
public class AndroidExpressionCodegenExtension : ExpressionCodegenExtension {
|
||||
default object {
|
||||
private val PROPERTY_NAME = "_\$_findViewCache"
|
||||
private val METHOD_NAME = "_\$_findCachedViewById"
|
||||
}
|
||||
|
||||
override fun apply(receiver: StackValue, resolvedCall: ResolvedCall<*>, c: ExpressionCodegenExtension.Context): StackValue? {
|
||||
if (resolvedCall.getResultingDescriptor() !is PropertyDescriptor) return null
|
||||
|
||||
val propertyDescriptor = resolvedCall.getResultingDescriptor() as PropertyDescriptor
|
||||
|
||||
val file = DescriptorToSourceUtils.getContainingFile(propertyDescriptor)
|
||||
if (file == null) return null
|
||||
|
||||
val androidPackage = file.getUserData<String>(AndroidConst.ANDROID_USER_PACKAGE)
|
||||
if (androidPackage == null) return null
|
||||
|
||||
val retType = c.typeMapper.mapType(propertyDescriptor.getReturnType()!!)
|
||||
|
||||
val extensionReceiver = resolvedCall.getExtensionReceiver()
|
||||
val declarationDescriptor = extensionReceiver.getType().getConstructor().getDeclarationDescriptor()
|
||||
|
||||
val supportsCache = when {
|
||||
extensionReceiver is ClassReceiver && declarationDescriptor != null -> true
|
||||
else -> {
|
||||
val source = declarationDescriptor?.getSource()
|
||||
if (source is KotlinSourceElement) true else false
|
||||
}
|
||||
}
|
||||
|
||||
if (supportsCache) {
|
||||
val className = DescriptorUtils.getFqName(declarationDescriptor!!).toString()
|
||||
val bytecodeClassName = className.replace('.', '/')
|
||||
|
||||
receiver.put(Type.getType("L$bytecodeClassName;"), c.v)
|
||||
c.v.getstatic(androidPackage.replace(".", "/") + "/R\$id", propertyDescriptor.getName().asString(), "I")
|
||||
c.v.invokevirtual(bytecodeClassName, METHOD_NAME, "(I)Landroid/view/View;", false)
|
||||
} else {
|
||||
receiver.put(Type.getType("Landroid/app/Activity;"), c.v)
|
||||
c.v.getstatic(androidPackage.replace(".", "/") + "/R\$id", propertyDescriptor.getName().asString(), "I")
|
||||
c.v.invokevirtual("android/app/Activity", "findViewById", "(I)" + "Landroid/view/View;", false)
|
||||
}
|
||||
|
||||
c.v.checkcast(retType)
|
||||
return StackValue.onStack(retType)
|
||||
}
|
||||
|
||||
private fun isClassSupported(descriptor: ClassifierDescriptor): Boolean {
|
||||
fun classNameSupported(name: String): Boolean = when (name) {
|
||||
"android.app.Activity" -> true
|
||||
else -> false
|
||||
}
|
||||
|
||||
if (descriptor is LazyJavaClassDescriptor) {
|
||||
if (classNameSupported(descriptor.fqName.asString()))
|
||||
return true
|
||||
} else if (descriptor is LazyClassDescriptor) { // For tests (FakeActivity)
|
||||
if (classNameSupported(DescriptorUtils.getFqName(descriptor).toString()))
|
||||
return true
|
||||
}
|
||||
|
||||
return descriptor.getTypeConstructor().getSupertypes().any {
|
||||
val declarationDescriptor = it.getConstructor().getDeclarationDescriptor()
|
||||
declarationDescriptor != null && isClassSupported(declarationDescriptor)
|
||||
}
|
||||
}
|
||||
|
||||
override fun generateClassSyntheticParts(
|
||||
classBuilder: ClassBuilder,
|
||||
bindingContext: BindingContext,
|
||||
classOrObject: JetClassOrObject,
|
||||
descriptor: ClassDescriptor
|
||||
) {
|
||||
if (descriptor.getKind() != ClassKind.CLASS || descriptor.isInner() || DescriptorUtils.isLocal(descriptor)) return
|
||||
|
||||
// Do not generate anything if class is not supported
|
||||
if (!isClassSupported(descriptor)) return
|
||||
|
||||
val classType = JetTypeMapper(bindingContext, ClassBuilderMode.FULL).mapClass(descriptor)
|
||||
val className = classType.getInternalName()
|
||||
|
||||
val viewType = Type.getObjectType("android/view/View")
|
||||
|
||||
classBuilder.newField(JvmDeclarationOrigin.NO_ORIGIN, ACC_PRIVATE, PROPERTY_NAME, "Ljava/util/HashMap;", null, null)
|
||||
|
||||
val methodVisitor = classBuilder.newMethod(
|
||||
JvmDeclarationOrigin.NO_ORIGIN, ACC_PUBLIC, METHOD_NAME, "(I)Landroid/view/View;", null, null)
|
||||
methodVisitor.visitCode()
|
||||
val iv = InstructionAdapter(methodVisitor)
|
||||
|
||||
fun loadCache() {
|
||||
iv.load(0, classType)
|
||||
iv.getfield(className, PROPERTY_NAME, "Ljava/util/HashMap;")
|
||||
}
|
||||
|
||||
fun loadId() = iv.load(1, Type.INT_TYPE)
|
||||
|
||||
// Get cache property
|
||||
loadCache()
|
||||
|
||||
val lCacheNonNull = Label()
|
||||
iv.ifnonnull(lCacheNonNull)
|
||||
|
||||
// Init cache if null
|
||||
iv.load(0, classType)
|
||||
iv.anew(Type.getType("Ljava/util/HashMap;"))
|
||||
iv.dup()
|
||||
iv.invokespecial("java/util/HashMap", "<init>", "()V", false)
|
||||
iv.putfield(className, PROPERTY_NAME, "Ljava/util/HashMap;")
|
||||
|
||||
// Get View from cache
|
||||
iv.visitLabel(lCacheNonNull)
|
||||
loadCache()
|
||||
loadId()
|
||||
iv.invokestatic("java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;", false)
|
||||
iv.invokevirtual("java/util/HashMap", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", false)
|
||||
iv.checkcast(viewType)
|
||||
iv.store(2, viewType)
|
||||
|
||||
val lViewNonNull = Label()
|
||||
iv.load(2, viewType)
|
||||
iv.ifnonnull(lViewNonNull)
|
||||
|
||||
// Resolve View via findViewById if not in cache
|
||||
iv.load(0, classType)
|
||||
loadId()
|
||||
iv.invokevirtual(className, "findViewById", "(I)Landroid/view/View;", false)
|
||||
iv.store(2, viewType)
|
||||
|
||||
// Store resolved View in cache
|
||||
loadCache()
|
||||
loadId()
|
||||
iv.invokestatic("java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;", false)
|
||||
iv.load(2, viewType)
|
||||
iv.invokevirtual("java/util/HashMap", "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", false)
|
||||
iv.pop()
|
||||
|
||||
iv.visitLabel(lViewNonNull)
|
||||
iv.load(2, viewType)
|
||||
iv.areturn(viewType)
|
||||
|
||||
FunctionCodegen.endVisit(methodVisitor, METHOD_NAME, classOrObject)
|
||||
}
|
||||
}
|
||||
|
||||
public class AndroidComponentRegistrar : ComponentRegistrar {
|
||||
|
||||
public override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
|
||||
|
||||
@@ -0,0 +1,188 @@
|
||||
/*
|
||||
* Copyright 2010-2015 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.kotlin.android
|
||||
|
||||
import org.jetbrains.kotlin.codegen.ClassBuilder
|
||||
import org.jetbrains.kotlin.codegen.ClassBuilderMode
|
||||
import org.jetbrains.kotlin.codegen.FunctionCodegen
|
||||
import org.jetbrains.kotlin.codegen.StackValue
|
||||
import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension
|
||||
import org.jetbrains.kotlin.codegen.state.JetTypeMapper
|
||||
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
||||
import org.jetbrains.kotlin.descriptors.ClassKind
|
||||
import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
|
||||
import org.jetbrains.kotlin.descriptors.PropertyDescriptor
|
||||
import org.jetbrains.kotlin.lang.resolve.android.AndroidConst
|
||||
import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaClassDescriptor
|
||||
import org.jetbrains.kotlin.psi.JetClassOrObject
|
||||
import org.jetbrains.kotlin.resolve.BindingContext
|
||||
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
|
||||
import org.jetbrains.kotlin.resolve.DescriptorUtils
|
||||
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
|
||||
import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassDescriptor
|
||||
import org.jetbrains.kotlin.resolve.scopes.receivers.ClassReceiver
|
||||
import org.jetbrains.kotlin.resolve.source.KotlinSourceElement
|
||||
import org.jetbrains.org.objectweb.asm.Label
|
||||
import org.jetbrains.org.objectweb.asm.Opcodes.ACC_PRIVATE
|
||||
import org.jetbrains.org.objectweb.asm.Opcodes.ACC_PUBLIC
|
||||
import org.jetbrains.org.objectweb.asm.Type
|
||||
import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
|
||||
|
||||
public class AndroidExpressionCodegenExtension : ExpressionCodegenExtension {
|
||||
default object {
|
||||
private val PROPERTY_NAME = "_\$_findViewCache"
|
||||
private val METHOD_NAME = "_\$_findCachedViewById"
|
||||
}
|
||||
|
||||
override fun apply(receiver: StackValue, resolvedCall: ResolvedCall<*>, c: ExpressionCodegenExtension.Context): StackValue? {
|
||||
if (resolvedCall.getResultingDescriptor() !is PropertyDescriptor) return null
|
||||
|
||||
val propertyDescriptor = resolvedCall.getResultingDescriptor() as PropertyDescriptor
|
||||
|
||||
val file = DescriptorToSourceUtils.getContainingFile(propertyDescriptor)
|
||||
if (file == null) return null
|
||||
|
||||
val androidPackage = file.getUserData<String>(AndroidConst.ANDROID_USER_PACKAGE)
|
||||
if (androidPackage == null) return null
|
||||
|
||||
val retType = c.typeMapper.mapType(propertyDescriptor.getReturnType()!!)
|
||||
|
||||
val extensionReceiver = resolvedCall.getExtensionReceiver()
|
||||
val declarationDescriptor = extensionReceiver.getType().getConstructor().getDeclarationDescriptor()
|
||||
|
||||
val supportsCache = when {
|
||||
extensionReceiver is ClassReceiver && declarationDescriptor != null -> true
|
||||
else -> {
|
||||
val source = declarationDescriptor?.getSource()
|
||||
if (source is KotlinSourceElement) true else false
|
||||
}
|
||||
}
|
||||
|
||||
if (supportsCache) {
|
||||
val className = DescriptorUtils.getFqName(declarationDescriptor!!).toString()
|
||||
val bytecodeClassName = className.replace('.', '/')
|
||||
|
||||
receiver.put(Type.getType("L$bytecodeClassName;"), c.v)
|
||||
c.v.getstatic(androidPackage.replace(".", "/") + "/R\$id", propertyDescriptor.getName().asString(), "I")
|
||||
c.v.invokevirtual(bytecodeClassName, METHOD_NAME, "(I)Landroid/view/View;", false)
|
||||
} else {
|
||||
receiver.put(Type.getType("Landroid/app/Activity;"), c.v)
|
||||
c.v.getstatic(androidPackage.replace(".", "/") + "/R\$id", propertyDescriptor.getName().asString(), "I")
|
||||
c.v.invokevirtual("android/app/Activity", "findViewById", "(I)" + "Landroid/view/View;", false)
|
||||
}
|
||||
|
||||
c.v.checkcast(retType)
|
||||
return StackValue.onStack(retType)
|
||||
}
|
||||
|
||||
private fun isClassSupported(descriptor: ClassifierDescriptor): Boolean {
|
||||
fun classNameSupported(name: String): Boolean = when (name) {
|
||||
"android.app.Activity" -> true
|
||||
else -> false
|
||||
}
|
||||
|
||||
if (descriptor is LazyJavaClassDescriptor) {
|
||||
if (classNameSupported(descriptor.fqName.asString()))
|
||||
return true
|
||||
} else if (descriptor is LazyClassDescriptor) { // For tests (FakeActivity)
|
||||
if (classNameSupported(DescriptorUtils.getFqName(descriptor).toString()))
|
||||
return true
|
||||
}
|
||||
|
||||
return descriptor.getTypeConstructor().getSupertypes().any {
|
||||
val declarationDescriptor = it.getConstructor().getDeclarationDescriptor()
|
||||
declarationDescriptor != null && isClassSupported(declarationDescriptor)
|
||||
}
|
||||
}
|
||||
|
||||
override fun generateClassSyntheticParts(
|
||||
classBuilder: ClassBuilder,
|
||||
bindingContext: BindingContext,
|
||||
classOrObject: JetClassOrObject,
|
||||
descriptor: ClassDescriptor
|
||||
) {
|
||||
if (descriptor.getKind() != ClassKind.CLASS || descriptor.isInner() || DescriptorUtils.isLocal(descriptor)) return
|
||||
|
||||
// Do not generate anything if class is not supported
|
||||
if (!isClassSupported(descriptor)) return
|
||||
|
||||
val classType = JetTypeMapper(bindingContext, ClassBuilderMode.FULL).mapClass(descriptor)
|
||||
val className = classType.getInternalName()
|
||||
|
||||
val viewType = Type.getObjectType("android/view/View")
|
||||
|
||||
classBuilder.newField(org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.Default.NO_ORIGIN, ACC_PRIVATE, PROPERTY_NAME, "Ljava/util/HashMap;", null, null)
|
||||
|
||||
val methodVisitor = classBuilder.newMethod(
|
||||
org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.Default.NO_ORIGIN, ACC_PUBLIC, METHOD_NAME, "(I)Landroid/view/View;", null, null)
|
||||
methodVisitor.visitCode()
|
||||
val iv = InstructionAdapter(methodVisitor)
|
||||
|
||||
fun loadCache() {
|
||||
iv.load(0, classType)
|
||||
iv.getfield(className, PROPERTY_NAME, "Ljava/util/HashMap;")
|
||||
}
|
||||
|
||||
fun loadId() = iv.load(1, Type.INT_TYPE)
|
||||
|
||||
// Get cache property
|
||||
loadCache()
|
||||
|
||||
val lCacheNonNull = Label()
|
||||
iv.ifnonnull(lCacheNonNull)
|
||||
|
||||
// Init cache if null
|
||||
iv.load(0, classType)
|
||||
iv.anew(Type.getType("Ljava/util/HashMap;"))
|
||||
iv.dup()
|
||||
iv.invokespecial("java/util/HashMap", "<init>", "()V", false)
|
||||
iv.putfield(className, PROPERTY_NAME, "Ljava/util/HashMap;")
|
||||
|
||||
// Get View from cache
|
||||
iv.visitLabel(lCacheNonNull)
|
||||
loadCache()
|
||||
loadId()
|
||||
iv.invokestatic("java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;", false)
|
||||
iv.invokevirtual("java/util/HashMap", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", false)
|
||||
iv.checkcast(viewType)
|
||||
iv.store(2, viewType)
|
||||
|
||||
val lViewNonNull = Label()
|
||||
iv.load(2, viewType)
|
||||
iv.ifnonnull(lViewNonNull)
|
||||
|
||||
// Resolve View via findViewById if not in cache
|
||||
iv.load(0, classType)
|
||||
loadId()
|
||||
iv.invokevirtual(className, "findViewById", "(I)Landroid/view/View;", false)
|
||||
iv.store(2, viewType)
|
||||
|
||||
// Store resolved View in cache
|
||||
loadCache()
|
||||
loadId()
|
||||
iv.invokestatic("java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;", false)
|
||||
iv.load(2, viewType)
|
||||
iv.invokevirtual("java/util/HashMap", "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", false)
|
||||
iv.pop()
|
||||
|
||||
iv.visitLabel(lViewNonNull)
|
||||
iv.load(2, viewType)
|
||||
iv.areturn(viewType)
|
||||
|
||||
FunctionCodegen.endVisit(methodVisitor, METHOD_NAME, classOrObject)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user