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

Deprecate PropertyMetadata, use KProperty<*> for delegated properties instead

Browse Source
This commit is contained in:
Alexander Udalov
2015-10-12 21:42:18 +03:00
parent 3c74f48f91
commit ec1b4776fe
145 changed files with 536 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java
+4 -11
View File
@@ -127,15 +127,8 @@ public class DelegatedPropertyResolver {
}
@NotNull
private JetExpression createExpressionForPropertyMetadata(
@NotNull JetPsiFactory psiFactory,
@NotNull PropertyDescriptor propertyDescriptor
) {
return psiFactory.createExpression(builtIns.getPropertyMetadataImpl().getName().asString() +
"(\"" +
propertyDescriptor.getName().asString() +
"\") as " +
builtIns.getPropertyMetadata().getName().asString());
private static JetExpression createExpressionForProperty(@NotNull JetPsiFactory psiFactory) {
return psiFactory.createExpression("null as kotlin.reflect.KProperty<*>");
}
public void resolveDelegatedPropertyPDMethod(
@@ -151,7 +144,7 @@ public class DelegatedPropertyResolver {
DataFlowInfo.EMPTY, TypeUtils.NO_EXPECTED_TYPE);
JetPsiFactory psiFactory = JetPsiFactory(delegateExpression);
List<JetExpression> arguments = Collections.singletonList(createExpressionForPropertyMetadata(psiFactory, propertyDescriptor));
List<JetExpression> arguments = Collections.singletonList(createExpressionForProperty(psiFactory));
ExpressionReceiver receiver = new ExpressionReceiver(delegateExpression, delegateType);
Pair<Call, OverloadResolutionResults<FunctionDescriptor>> resolutionResult =
@@ -257,7 +250,7 @@ public class DelegatedPropertyResolver {
List<JetExpression> arguments = Lists.newArrayList();
JetPsiFactory psiFactory = JetPsiFactory(delegateExpression);
arguments.add(psiFactory.createExpression(hasThis ? "this" : "null"));
arguments.add(createExpressionForPropertyMetadata(psiFactory, propertyDescriptor));
arguments.add(createExpressionForProperty(psiFactory));
if (!isGet) {
JetReferenceExpression fakeArgument = (JetReferenceExpression) createFakeExpressionOfType(delegateExpression.getProject(), trace,