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

Unnecessary copy eliminated

Browse Source
This commit is contained in:
Andrey Breslav
2013-04-16 13:38:55 +04:00
parent bab8b63fcb
commit e354d3d629
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java
+2 -3
View File
@@ -16,7 +16,6 @@
package org.jetbrains.jet.lang.resolve.lazy.descriptors; package org.jetbrains.jet.lang.resolve.lazy.descriptors;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Computable;
import com.intellij.util.Function; import com.intellij.util.Function;
@@ -109,7 +108,7 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
private List<ClassDescriptor> resolveClassOrObjectDescriptor(@NotNull final Name name, final boolean object) { private List<ClassDescriptor> resolveClassOrObjectDescriptor(@NotNull final Name name, final boolean object) {
Collection<JetClassOrObject> classOrObjectDeclarations = declarationProvider.getClassOrObjectDeclarations(name); Collection<JetClassOrObject> classOrObjectDeclarations = declarationProvider.getClassOrObjectDeclarations(name);
return Lists.newArrayList(ContainerUtil.mapNotNull(classOrObjectDeclarations, new Function<JetClassOrObject, ClassDescriptor>() { return ContainerUtil.mapNotNull(classOrObjectDeclarations, new Function<JetClassOrObject, ClassDescriptor>() {
@Override @Override
public ClassDescriptor fun(JetClassOrObject classOrObject) { public ClassDescriptor fun(JetClassOrObject classOrObject) {
if (object != declaresObjectOrEnumConstant(classOrObject)) return null; if (object != declaresObjectOrEnumConstant(classOrObject)) return null;
@@ -117,7 +116,7 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
return new LazyClassDescriptor(resolveSession, thisDescriptor, name, return new LazyClassDescriptor(resolveSession, thisDescriptor, name,
JetClassInfoUtil.createClassLikeInfo(classOrObject)); JetClassInfoUtil.createClassLikeInfo(classOrObject));
} }
})); });
} }
private static boolean declaresObjectOrEnumConstant(JetClassOrObject declaration) { private static boolean declaresObjectOrEnumConstant(JetClassOrObject declaration) {