From f12b6782341d8e38a36cd2ec3bc34ff8d99623e8 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Sat, 29 Dec 2012 14:33:56 +0400 Subject: [PATCH] Minor. Renamed variable. --- .../plugin/libraries/JetSourceNavigationHelper.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java index 889c9c7badf..b55a957d466 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java @@ -144,9 +144,9 @@ public class JetSourceNavigationHelper { final @NotNull Decl decompiledDeclaration, NavigationStrategy navigationStrategy ) { - String entityName = decompiledDeclaration.getName(); - assert entityName != null; - Name entityNameAsName = Name.identifier(entityName); + String memberNameAsString = decompiledDeclaration.getName(); + assert memberNameAsString != null; + Name memberName = Name.identifier(memberNameAsString); JetTypeReference receiverType = navigationStrategy.getReceiverType(decompiledDeclaration); @@ -158,7 +158,7 @@ public class JetSourceNavigationHelper { BindingContext bindingContext = bindingContextAndNamespaceDescriptor.first; 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()) && navigationStrategy.declarationAndDescriptorMatch(decompiledDeclaration, candidate)) { return (JetDeclaration) BindingContextUtils.descriptorToDeclaration(bindingContext, candidate); @@ -183,7 +183,7 @@ public class JetSourceNavigationHelper { } ClassDescriptor expectedContainer = isClassObject ? classDescriptor.getClassObjectDescriptor() : classDescriptor; - for (Descr candidate : navigationStrategy.getCandidateDescriptors(memberScope, entityNameAsName)) { + for (Descr candidate : navigationStrategy.getCandidateDescriptors(memberScope, memberName)) { if (candidate.getContainingDeclaration() == expectedContainer) { JetDeclaration property = (JetDeclaration) BindingContextUtils.descriptorToDeclaration(bindingContext, candidate); if (property != null) {