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

Insert KProperty<*> when creating property delegate methods in IDE

Browse Source
This commit is contained in:
Alexander Udalov
2015-10-13 13:00:51 +03:00
parent ec1b4776fe
commit a6846b3967
11 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class DelegatedPropertyResolver {
@NotNull
private static JetExpression createExpressionForProperty(@NotNull JetPsiFactory psiFactory) {
return psiFactory.createExpression("null as kotlin.reflect.KProperty<*>");
return psiFactory.createExpression("null as " + KotlinBuiltIns.FQ_NAMES.kProperty.asSingleFqName().asString() + "<*>");
}
public void resolveDelegatedPropertyPDMethod(
core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+9 -6
View File
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.descriptors.annotations.*;
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl;
import org.jetbrains.kotlin.incremental.components.NoLookupLocation;
import org.jetbrains.kotlin.name.ClassId;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.name.FqNameUnsafe;
import org.jetbrains.kotlin.name.Name;
@@ -157,7 +158,9 @@ public abstract class KotlinBuiltIns {
public final FqName mutableSet = fqName("MutableSet");
public final FqName mutableMap = fqName("MutableMap");
public final FqNameUnsafe kClass = new FqName("kotlin.reflect.KClass").toUnsafe();
public final FqNameUnsafe kClass = reflect("KClass");
public final FqNameUnsafe kCallable = reflect("KCallable");
public final ClassId kProperty = ClassId.topLevel(reflect("KProperty").toSafe());
public final Map<FqNameUnsafe, PrimitiveType> fqNameToPrimitiveType;
public final Map<FqNameUnsafe, PrimitiveType> arrayClassFqNameToPrimitiveType;
@@ -180,6 +183,11 @@ public abstract class KotlinBuiltIns {
return BUILT_INS_PACKAGE_FQ_NAME.child(Name.identifier(simpleName));
}
@NotNull
private static FqNameUnsafe reflect(@NotNull String simpleName) {
return ReflectionTypesKt.getKOTLIN_REFLECT_FQ_NAME().child(Name.identifier(simpleName)).toUnsafe();
}
@NotNull
private static FqName annotationName(@NotNull String simpleName) {
return ANNOTATION_PACKAGE_FQ_NAME.child(Name.identifier(simpleName));
@@ -697,11 +705,6 @@ public abstract class KotlinBuiltIns {
return getAnnotation().getDefaultType();
}
@NotNull
public ClassDescriptor getPropertyMetadata() {
return getBuiltInClassByName("PropertyMetadata");
}
@NotNull
public AnnotationDescriptor createExtensionAnnotation() {
return new AnnotationDescriptorImpl(getBuiltInClassByName(FQ_NAMES.extension.shortName()).getDefaultType(),
core/descriptors/src/org/jetbrains/kotlin/builtins/ReflectionTypes.kt
+10 -4
View File
@@ -22,10 +22,10 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
import org.jetbrains.kotlin.descriptors.annotations.Annotations
import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.FqNameUnsafe
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.scopes.JetScope
import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies
import org.jetbrains.kotlin.types.*
import java.util.*
@@ -115,8 +115,6 @@ public class ReflectionTypes(private val module: ModuleDescriptor) {
return containingPackage != null && containingPackage.fqName == KOTLIN_REFLECT_FQ_NAME
}
private val K_CALLABLE_FQ_NAME = FqNameUnsafe("kotlin.reflect.KCallable")
public fun isCallableType(type: JetType): Boolean =
KotlinBuiltIns.isFunctionOrExtensionFunctionType(type) || isKCallableType(type)
@@ -126,7 +124,15 @@ public class ReflectionTypes(private val module: ModuleDescriptor) {
private fun isExactKCallableType(type: JetType): Boolean {
val descriptor = type.constructor.declarationDescriptor
return descriptor is ClassDescriptor && DescriptorUtils.getFqName(descriptor) == K_CALLABLE_FQ_NAME
return descriptor is ClassDescriptor && DescriptorUtils.getFqName(descriptor) == KotlinBuiltIns.FQ_NAMES.kCallable
}
public fun createKPropertyStarType(module: ModuleDescriptor): JetType? {
val kPropertyClass = module.findClassAcrossModuleDependencies(KotlinBuiltIns.FQ_NAMES.kProperty) ?: return null
return JetTypeImpl.create(
Annotations.EMPTY, kPropertyClass, false,
listOf(StarProjectionImpl(kPropertyClass.typeConstructor.parameters.single()))
)
}
}
}
core/descriptors/src/org/jetbrains/kotlin/util/OperatorChecker.kt
+2 -7
View File
@@ -17,17 +17,15 @@
package org.jetbrains.kotlin.util
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.builtins.ReflectionTypes
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
import org.jetbrains.kotlin.resolve.descriptorUtil.hasDefaultValue
import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension
import org.jetbrains.kotlin.resolve.descriptorUtil.module
import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies
import org.jetbrains.kotlin.types.typeUtil.*
import org.jetbrains.kotlin.util.OperatorNameConventions.GET
import org.jetbrains.kotlin.util.OperatorNameConventions.SET
@@ -103,10 +101,7 @@ object OperatorChecks {
}
private val ValueParameterDescriptor.isKProperty: Boolean
get() {
val kProperty = module.findClassAcrossModuleDependencies(ClassId.topLevel(FqName("kotlin.reflect.KProperty")))
return kProperty!!.defaultType.isSubtypeOf(type.makeNotNullable())
}
get() = ReflectionTypes.createKPropertyStarType(module)?.isSubtypeOf(type.makeNotNullable()) ?: false
private val FunctionDescriptor.isMember: Boolean
get() = containingDeclaration is ClassDescriptor
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreatePropertyDelegateAccessorsActionFactory.kt
+4 -2
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createCallable
import com.intellij.util.SmartList
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.builtins.ReflectionTypes
import org.jetbrains.kotlin.descriptors.PropertyAccessorDescriptor
import org.jetbrains.kotlin.descriptors.PropertyDescriptor
import org.jetbrains.kotlin.diagnostics.Diagnostic
@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.psi.JetProperty
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
import org.jetbrains.kotlin.resolve.descriptorUtil.module
import org.jetbrains.kotlin.types.Variance
object CreatePropertyDelegateAccessorsActionFactory : CreateCallableMemberFromUsageFactory<JetExpression>() {
@@ -54,7 +55,8 @@ object CreatePropertyDelegateAccessorsActionFactory : CreateCallableMemberFromUs
val accessorReceiverType = TypeInfo(element, Variance.IN_VARIANCE)
val builtIns = propertyDescriptor.builtIns
val thisRefParam = ParameterInfo(TypeInfo(propertyReceiver?.type ?: builtIns.nullableNothingType, Variance.IN_VARIANCE))
val metadataParam = ParameterInfo(TypeInfo(builtIns.propertyMetadata.defaultType, Variance.IN_VARIANCE))
val kPropertyStarType = ReflectionTypes.createKPropertyStarType(propertyDescriptor.module) ?: return emptyList()
val metadataParam = ParameterInfo(TypeInfo(kPropertyStarType, Variance.IN_VARIANCE), "property")
val callableInfos = SmartList<CallableInfo>()
idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
import kotlin.reflect.KProperty
// "Create member function 'getValue'" "true"
class F {
fun getValue(x: X, propertyMetadata: PropertyMetadata): Int {
fun getValue(x: X, property: KProperty<*>): Int {
throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
}
idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after
Vendored
+4 -2
View File
@@ -1,10 +1,12 @@
import kotlin.reflect.KProperty
// "Create member function 'getValue', function 'setValue'" "true"
class F {
fun getValue(x: X, propertyMetadata: PropertyMetadata): Int {
fun getValue(x: X, property: KProperty<*>): Int {
throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
}
fun setValue(x: X, propertyMetadata: PropertyMetadata, i: Int) {
fun setValue(x: X, property: KProperty<*>, i: Int) {
throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
}
idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
// "Create member function 'getValue'" "true"
import kotlin.reflect.KProperty
class F {
fun setValue(x: X, propertyMetadata: PropertyMetadata, i: Int) { }
fun setValue(x: X, property: KProperty<*>, i: Int) { }
}
class X {
idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after
Vendored
+5 -3
View File
@@ -1,8 +1,10 @@
// "Create member function 'getValue'" "true"
class F {
fun setValue(x: X, propertyMetadata: PropertyMetadata, i: Int) { }
import kotlin.reflect.KProperty
fun getValue(x: X, propertyMetadata: PropertyMetadata): Int {
class F {
fun setValue(x: X, property: KProperty<*>, i: Int) { }
fun getValue(x: X, property: KProperty<*>): Int {
throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
}
}
idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt
Vendored
+3 -1
View File
@@ -1,6 +1,8 @@
// "Create member function 'setValue'" "true"
import kotlin.reflect.KProperty
class F {
fun getValue(x: X, propertyMetadata: PropertyMetadata): Int = 1
fun getValue(x: X, property: KProperty<*>): Int = 1
}
class X {
idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after
Vendored
+5 -3
View File
@@ -1,8 +1,10 @@
// "Create member function 'setValue'" "true"
class F {
fun getValue(x: X, propertyMetadata: PropertyMetadata): Int = 1
import kotlin.reflect.KProperty
fun setValue(x: X, propertyMetadata: PropertyMetadata, i: Int) {
class F {
fun getValue(x: X, property: KProperty<*>): Int = 1
fun setValue(x: X, property: KProperty<*>, i: Int) {
throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
}
}