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

Got rid of code duplication.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-29 14:29:52 +04:00
parent c53450d528
commit c47704ab86
1 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java
+18 -23
View File
@@ -160,29 +160,11 @@ public class JetSourceNavigationHelper {
if (bindingContextAndNamespaceDescriptor == null) return null; if (bindingContextAndNamespaceDescriptor == null) return null;
BindingContext bindingContext = bindingContextAndNamespaceDescriptor.first; BindingContext bindingContext = bindingContextAndNamespaceDescriptor.first;
NamespaceDescriptor namespaceDescriptor = bindingContextAndNamespaceDescriptor.second; NamespaceDescriptor namespaceDescriptor = bindingContextAndNamespaceDescriptor.second;
if (receiverType == null) {
// non-extension member for (Descr candidate : navigationStrategy.getCandidateDescriptors(namespaceDescriptor.getMemberScope(), entityNameAsName)) {
for (Descr candidate : navigationStrategy.getCandidateDescriptors(namespaceDescriptor.getMemberScope(), entityNameAsName)) { if (receiversMatch(receiverType, candidate.getReceiverParameter())
if (candidate.getReceiverParameter() == null) { && navigationStrategy.declarationAndDescriptorMatch(decompiledDeclaration, candidate)) {
if (navigationStrategy.declarationAndDescriptorMatch(decompiledDeclaration, candidate)) { return (JetDeclaration) BindingContextUtils.descriptorToDeclaration(bindingContext, candidate);
return (JetDeclaration) BindingContextUtils.descriptorToDeclaration(bindingContext, candidate);
}
}
}
}
else {
// extension member
String expectedTypeString = receiverType.getText();
for (Descr candidate : navigationStrategy.getCandidateDescriptors(namespaceDescriptor.getMemberScope(), entityNameAsName)) {
ReceiverParameterDescriptor receiverParameter = candidate.getReceiverParameter();
if (receiverParameter != null) {
String thisReceiverType = DescriptorRenderer.TEXT.renderType(receiverParameter.getType());
if (expectedTypeString.equals(thisReceiverType)) {
if (navigationStrategy.declarationAndDescriptorMatch(decompiledDeclaration, candidate)) {
return (JetDeclaration) BindingContextUtils.descriptorToDeclaration(bindingContext, candidate);
}
}
}
} }
} }
} }
@@ -220,6 +202,19 @@ public class JetSourceNavigationHelper {
return null; return null;
} }
private static boolean receiversMatch(
@Nullable JetTypeReference receiverTypeRef,
@Nullable ReceiverParameterDescriptor receiverParameter
) {
if (receiverTypeRef == null && receiverParameter == null) {
return true;
}
if (receiverTypeRef != null && receiverParameter != null) {
return receiverTypeRef.getText().equals(DescriptorRenderer.TEXT.renderType(receiverParameter.getType()));
}
return false;
}
@Nullable @Nullable
public static JetDeclaration getSourceProperty(final @NotNull JetProperty decompiledProperty) { public static JetDeclaration getSourceProperty(final @NotNull JetProperty decompiledProperty) {
return getSourcePropertyOrFunction(decompiledProperty, new PropertyNavigationStrategy()); return getSourcePropertyOrFunction(decompiledProperty, new PropertyNavigationStrategy());