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

Delete JetScope.getObjectDescriptor()

Browse Source
This commit is contained in:
Alexander Udalov
2013-11-15 22:09:47 +04:00
parent 550df37056
commit 4526d96186
20 changed files with 7 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java
-5
View File
@@ -52,11 +52,6 @@ public abstract class JavaClassMembersScope extends JavaBaseScope {
return memberResolver.resolveFunctionGroupForClass(members, descriptor);
}
@Override
public ClassDescriptor getObjectDescriptor(@NotNull Name name) {
return null;
}
@Override
public ClassifierDescriptor getClassifier(@NotNull Name name) {
if (innerClassesMap == null) {
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java
-9
View File
@@ -58,15 +58,6 @@ public final class JavaPackageScope extends JavaBaseScope {
return memberResolver.resolveClass(packageFQN.child(name), IGNORE_KOTLIN_SOURCES);
}
@Override
public ClassDescriptor getObjectDescriptor(@NotNull Name name) {
ClassDescriptor classDescriptor = memberResolver.resolveClass(packageFQN.child(name), IGNORE_KOTLIN_SOURCES);
if (classDescriptor != null && classDescriptor.getKind().isSingleton()) {
return classDescriptor;
}
return null;
}
@Override
public NamespaceDescriptor getNamespace(@NotNull Name name) {
return memberResolver.resolveNamespace(packageFQN.child(name), INCLUDE_KOTLIN_SOURCES);
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java
-5
View File
@@ -55,11 +55,6 @@ public abstract class AbstractScopeAdapter implements JetScope {
return getWorkerScope().getClassifier(name);
}
@Override
public ClassDescriptor getObjectDescriptor(@NotNull Name name) {
return getWorkerScope().getObjectDescriptor(name);
}
@NotNull
@Override
public Collection<VariableDescriptor> getProperties(@NotNull Name name) {
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java
-9
View File
@@ -57,15 +57,6 @@ public class ChainedScope implements JetScope {
return null;
}
@Override
public ClassDescriptor getObjectDescriptor(@NotNull Name name) {
for (JetScope scope : scopeChain) {
ClassDescriptor objectDescriptor = scope.getObjectDescriptor(name);
if (objectDescriptor != null) return objectDescriptor;
}
return null;
}
@Override
public NamespaceDescriptor getNamespace(@NotNull Name name) {
for (JetScope jetScope : scopeChain) {
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java
-5
View File
@@ -65,11 +65,6 @@ public class FilteringScope implements JetScope {
return filterDescriptor(workerScope.getClassifier(name));
}
@Override
public ClassDescriptor getObjectDescriptor(@NotNull Name name) {
return filterDescriptor(workerScope.getObjectDescriptor(name));
}
@NotNull
@Override
public Collection<VariableDescriptor> getProperties(@NotNull Name name) {
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java
-3
View File
@@ -52,9 +52,6 @@ public interface JetScope {
*/
@Nullable
ClassifierDescriptor getClassifier(@NotNull Name name);
@Nullable
ClassDescriptor getObjectDescriptor(@NotNull Name name);
@Nullable
NamespaceDescriptor getNamespace(@NotNull Name name);
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java
-5
View File
@@ -33,11 +33,6 @@ public abstract class JetScopeImpl implements JetScope {
return null;
}
@Override
public ClassDescriptor getObjectDescriptor(@NotNull Name name) {
return null;
}
@NotNull
@Override
public Collection<VariableDescriptor> getProperties(@NotNull Name name) {
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java
-5
View File
@@ -98,11 +98,6 @@ public class SubstitutingScope implements JetScope {
return substitute(workerScope.getClassifier(name));
}
@Override
public ClassDescriptor getObjectDescriptor(@NotNull Name name) {
return substitute(workerScope.getObjectDescriptor(name));
}
@NotNull
@Override
public Collection<FunctionDescriptor> getFunctions(@NotNull Name name) {
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java
-24
View File
@@ -35,8 +35,6 @@ public class WritableScopeImpl extends WritableScopeWithImports {
private final Multimap<Name, DeclarationDescriptor> declaredDescriptorsAccessibleBySimpleName = HashMultimap.create();
private boolean allDescriptorsDone = false;
private Set<ClassDescriptor> allObjectDescriptors = null;
@NotNull
private final DeclarationDescriptor ownerDeclarationDescriptor;
@@ -54,9 +52,6 @@ public class WritableScopeImpl extends WritableScopeWithImports {
@Nullable
private Map<LabelName, List<DeclarationDescriptor>> labelsToDescriptors;
@Nullable
private Map<Name, ClassDescriptor> objectDescriptors;
@Nullable
private ReceiverParameterDescriptor implicitReceiver;
@@ -146,14 +141,6 @@ public class WritableScopeImpl extends WritableScopeWithImports {
return labelsToDescriptors;
}
@NotNull
private Map<Name, ClassDescriptor> getObjectDescriptorsMap() {
if (objectDescriptors == null) {
objectDescriptors = Maps.newHashMap();
}
return objectDescriptors;
}
@NotNull
@Override
public Collection<DeclarationDescriptor> getDeclarationsByLabel(@NotNull LabelName labelName) {
@@ -384,17 +371,6 @@ public class WritableScopeImpl extends WritableScopeWithImports {
return super.getClassifier(name);
}
@Override
public ClassDescriptor getObjectDescriptor(@NotNull Name name) {
ClassDescriptor descriptor = getObjectDescriptorsMap().get(name);
if (descriptor != null) return descriptor;
ClassDescriptor fromWorker = getWorkerScope().getObjectDescriptor(name);
if (fromWorker != null) return fromWorker;
return super.getObjectDescriptor(name);
}
@Override
public void addNamespace(@NotNull NamespaceDescriptor namespaceDescriptor) {
checkMayWrite();
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java
-13
View File
@@ -176,19 +176,6 @@ public abstract class WritableScopeWithImports extends JetScopeAdapter implement
return null;
}
@Override
public ClassDescriptor getObjectDescriptor(@NotNull Name name) {
checkMayRead();
for (JetScope imported : getImports()) {
ClassDescriptor objectDescriptor = imported.getObjectDescriptor(name);
if (objectDescriptor != null) {
return objectDescriptor;
}
}
return null;
}
@Override
public NamespaceDescriptor getNamespace(@NotNull Name name) {
checkMayRead();
core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java
-11
View File
@@ -88,11 +88,6 @@ public class ErrorUtils {
return ERROR_CLASS;
}
@Override
public ClassDescriptor getObjectDescriptor(@NotNull Name name) {
return ERROR_CLASS;
}
@NotNull
@Override
public Set<VariableDescriptor> getProperties(@NotNull Name name) {
@@ -169,12 +164,6 @@ public class ErrorUtils {
throw new IllegalStateException();
}
@Nullable
@Override
public ClassDescriptor getObjectDescriptor(@NotNull Name name) {
throw new IllegalStateException();
}
@Nullable
@Override
public NamespaceDescriptor getNamespace(@NotNull Name name) {