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

minor improvement

Browse Source
This commit is contained in:
Svetlana Isakova
2012-09-13 17:27:17 +04:00
parent b7b15f8379
commit 585a709bbd
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java
+6 -4
View File
@@ -136,10 +136,12 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent {
if (memberScope == null) return null; if (memberScope == null) return null;
String renderedOriginal = DescriptorRenderer.TEXT.render(originalDescriptor); String renderedOriginal = DescriptorRenderer.TEXT.render(originalDescriptor);
Collection<DeclarationDescriptor> descriptors = Lists.newArrayList(); Collection<? extends DeclarationDescriptor> descriptors;
descriptors.addAll(memberScope.getAllDescriptors()); if (originalDescriptor instanceof ConstructorDescriptor && containingDeclaration instanceof ClassDescriptor) {
if (containingDeclaration instanceof ClassDescriptor) { descriptors = ((ClassDescriptor) containingDeclaration).getConstructors();
descriptors.addAll(((ClassDescriptor) containingDeclaration).getConstructors()); }
else {
descriptors = memberScope.getAllDescriptors();
} }
for (DeclarationDescriptor member : descriptors) { for (DeclarationDescriptor member : descriptors) {
if (renderedOriginal.equals(DescriptorRenderer.TEXT.render(member).replace(TUPLE0_FQ_NAME.getFqName(), if (renderedOriginal.equals(DescriptorRenderer.TEXT.render(member).replace(TUPLE0_FQ_NAME.getFqName(),