From 585a709bbde2d7f9199445a5c4dae328bc3d4105 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Thu, 13 Sep 2012 17:27:17 +0400 Subject: [PATCH] minor improvement --- .../references/StandardLibraryReferenceResolver.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java b/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java index 649a4139916..d4888d626f6 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java +++ b/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java @@ -136,10 +136,12 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent { if (memberScope == null) return null; String renderedOriginal = DescriptorRenderer.TEXT.render(originalDescriptor); - Collection descriptors = Lists.newArrayList(); - descriptors.addAll(memberScope.getAllDescriptors()); - if (containingDeclaration instanceof ClassDescriptor) { - descriptors.addAll(((ClassDescriptor) containingDeclaration).getConstructors()); + Collection descriptors; + if (originalDescriptor instanceof ConstructorDescriptor && containingDeclaration instanceof ClassDescriptor) { + descriptors = ((ClassDescriptor) containingDeclaration).getConstructors(); + } + else { + descriptors = memberScope.getAllDescriptors(); } for (DeclarationDescriptor member : descriptors) { if (renderedOriginal.equals(DescriptorRenderer.TEXT.render(member).replace(TUPLE0_FQ_NAME.getFqName(),