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

Minor. Renamed variable.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-29 14:33:56 +04:00
parent 7e96501b81
commit f12b678234
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java
+5 -5
View File
@@ -144,9 +144,9 @@ public class JetSourceNavigationHelper {
final @NotNull Decl decompiledDeclaration, final @NotNull Decl decompiledDeclaration,
NavigationStrategy<Decl, Descr> navigationStrategy NavigationStrategy<Decl, Descr> navigationStrategy
) { ) {
String entityName = decompiledDeclaration.getName(); String memberNameAsString = decompiledDeclaration.getName();
assert entityName != null; assert memberNameAsString != null;
Name entityNameAsName = Name.identifier(entityName); Name memberName = Name.identifier(memberNameAsString);
JetTypeReference receiverType = navigationStrategy.getReceiverType(decompiledDeclaration); JetTypeReference receiverType = navigationStrategy.getReceiverType(decompiledDeclaration);
@@ -158,7 +158,7 @@ public class JetSourceNavigationHelper {
BindingContext bindingContext = bindingContextAndNamespaceDescriptor.first; BindingContext bindingContext = bindingContextAndNamespaceDescriptor.first;
NamespaceDescriptor namespaceDescriptor = bindingContextAndNamespaceDescriptor.second; NamespaceDescriptor namespaceDescriptor = bindingContextAndNamespaceDescriptor.second;
for (Descr candidate : navigationStrategy.getCandidateDescriptors(namespaceDescriptor.getMemberScope(), entityNameAsName)) { for (Descr candidate : navigationStrategy.getCandidateDescriptors(namespaceDescriptor.getMemberScope(), memberName)) {
if (receiversMatch(receiverType, candidate.getReceiverParameter()) if (receiversMatch(receiverType, candidate.getReceiverParameter())
&& navigationStrategy.declarationAndDescriptorMatch(decompiledDeclaration, candidate)) { && navigationStrategy.declarationAndDescriptorMatch(decompiledDeclaration, candidate)) {
return (JetDeclaration) BindingContextUtils.descriptorToDeclaration(bindingContext, candidate); return (JetDeclaration) BindingContextUtils.descriptorToDeclaration(bindingContext, candidate);
@@ -183,7 +183,7 @@ public class JetSourceNavigationHelper {
} }
ClassDescriptor expectedContainer = isClassObject ? classDescriptor.getClassObjectDescriptor() : classDescriptor; ClassDescriptor expectedContainer = isClassObject ? classDescriptor.getClassObjectDescriptor() : classDescriptor;
for (Descr candidate : navigationStrategy.getCandidateDescriptors(memberScope, entityNameAsName)) { for (Descr candidate : navigationStrategy.getCandidateDescriptors(memberScope, memberName)) {
if (candidate.getContainingDeclaration() == expectedContainer) { if (candidate.getContainingDeclaration() == expectedContainer) {
JetDeclaration property = (JetDeclaration) BindingContextUtils.descriptorToDeclaration(bindingContext, candidate); JetDeclaration property = (JetDeclaration) BindingContextUtils.descriptorToDeclaration(bindingContext, candidate);
if (property != null) { if (property != null) {