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

KT-6820 Find usages doesn't find delegated properties when searching get/set/propertyDelegated functions

Browse Source 
#KT-6820 fixed
This commit is contained in:
Evgeny Gerashchenko
2015-03-04 19:34:36 +03:00
parent 0a824edace
commit 8ba15937f9
12 changed files with 65 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java
+3 -4
View File
@@ -59,7 +59,7 @@ public class DelegatedPropertyResolver {
private CallResolver callResolver;
private KotlinBuiltIns builtIns;
private static final String PD_METHOD_NAME = "propertyDelegated";
public static final Name PROPERTY_DELEGATED_FUNCTION_NAME = Name.identifier("propertyDelegated");
@Inject
public void setExpressionTypingServices(@NotNull ExpressionTypingServices expressionTypingServices) {
@@ -147,13 +147,12 @@ public class DelegatedPropertyResolver {
List<JetExpression> arguments = Lists.newArrayList();
JetPsiFactory psiFactory = JetPsiFactory(delegateExpression);
arguments.add(createExpressionForPropertyMetadata(psiFactory, propertyDescriptor));
Name functionName = Name.identifier(PD_METHOD_NAME);
JetReferenceExpression fakeCalleeExpression = psiFactory.createSimpleName(functionName.asString());
JetReferenceExpression fakeCalleeExpression = psiFactory.createSimpleName(PROPERTY_DELEGATED_FUNCTION_NAME.asString());
ExpressionReceiver receiver = new ExpressionReceiver(delegateExpression, delegateType);
Call call = CallMaker.makeCallWithExpressions(fakeCalleeExpression, receiver, null, fakeCalleeExpression, arguments, Call.CallType.DEFAULT);
OverloadResolutionResults<FunctionDescriptor> functionResults =
callResolver.resolveCallWithGivenName(context, call, fakeCalleeExpression, functionName);
callResolver.resolveCallWithGivenName(context, call, fakeCalleeExpression, PROPERTY_DELEGATED_FUNCTION_NAME);
if (!functionResults.isSuccess()) {
String expectedFunction = renderCall(call, traceToResolvePDMethod.getBindingContext());