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

Revert "Add method for getting all classifiers with given name from the scope"

Browse Source 
This reverts commit 97759f5bb7.
This commit is contained in:
Nikolay Krasko
2014-01-15 19:13:05 +04:00
parent 0d141d959a
commit 72d3b46fc6
12 changed files with 6 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java
-7
View File
@@ -160,13 +160,6 @@ public abstract class DeserializedMemberScope implements JetScope {
return getClassDescriptor(name);
}
@NotNull
@Override
public final Collection<ClassifierDescriptor> getClassifiers(@NotNull Name name) {
ClassifierDescriptor classifier = getClassifier(name);
return classifier != null ? Collections.singleton(classifier) : Collections.<ClassifierDescriptor>emptyList();
}
@Nullable
protected abstract ClassifierDescriptor getClassDescriptor(@NotNull Name name);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java
-6
View File
@@ -244,12 +244,6 @@ public class LazyImportScope implements JetScope {
return selectFirstFromImports(name, LookupMode.ONLY_CLASSES, JetScopeSelectorUtil.CLASSIFIER_DESCRIPTOR_SCOPE_SELECTOR);
}
@NotNull
@Override
public Collection<ClassifierDescriptor> getClassifiers(@NotNull Name name) {
return collectFromImports(name, LookupMode.ONLY_CLASSES, JetScopeSelectorUtil.NAMED_CLASSIFIERS_SCOPE_SELECTOR);
}
@Nullable
@Override
public PackageViewDescriptor getPackage(@NotNull Name name) {
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java
+6 -12
View File
@@ -46,7 +46,7 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
protected final DP declarationProvider;
protected final D thisDescriptor;
private final MemoizedFunctionToNotNull<Name, List<ClassifierDescriptor>> classDescriptors;
private final MemoizedFunctionToNotNull<Name, List<ClassDescriptor>> classDescriptors;
private final MemoizedFunctionToNotNull<Name, Set<FunctionDescriptor>> functionDescriptors;
private final MemoizedFunctionToNotNull<Name, Set<VariableDescriptor>> propertyDescriptors;
@@ -63,9 +63,9 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
this.thisDescriptor = thisDescriptor;
StorageManager storageManager = resolveSession.getStorageManager();
this.classDescriptors = storageManager.createMemoizedFunction(new Function1<Name, List<ClassifierDescriptor>>() {
this.classDescriptors = storageManager.createMemoizedFunction(new Function1<Name, List<ClassDescriptor>>() {
@Override
public List<ClassifierDescriptor> invoke(Name name) {
public List<ClassDescriptor> invoke(Name name) {
return resolveClassDescriptor(name);
}
});
@@ -92,12 +92,12 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
}
@Nullable
private List<ClassifierDescriptor> resolveClassDescriptor(@NotNull final Name name) {
private List<ClassDescriptor> resolveClassDescriptor(@NotNull final Name name) {
Collection<JetClassOrObject> classOrObjectDeclarations = declarationProvider.getClassOrObjectDeclarations(name);
return ContainerUtil.mapNotNull(classOrObjectDeclarations, new Function<JetClassOrObject, ClassifierDescriptor>() {
return ContainerUtil.mapNotNull(classOrObjectDeclarations, new Function<JetClassOrObject, ClassDescriptor>() {
@Override
public ClassifierDescriptor fun(JetClassOrObject classOrObject) {
public ClassDescriptor fun(JetClassOrObject classOrObject) {
return new LazyClassDescriptor(resolveSession, thisDescriptor, name, JetClassInfoUtil.createClassLikeInfo(classOrObject));
}
});
@@ -108,12 +108,6 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
return first(classDescriptors.invoke(name));
}
@NotNull
@Override
public Collection<ClassifierDescriptor> getClassifiers(@NotNull Name name) {
return classDescriptors.invoke(name);
}
private static <T> T first(@NotNull List<T> list) {
if (list.isEmpty()) return null;
return list.get(0);