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);