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

extracted method 'getInnerClassByName'

Browse Source
This commit is contained in:
Svetlana Isakova
2012-09-10 18:01:18 +04:00
parent 1d63ed4db5
commit 2c118084d1
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
+9
View File
@@ -387,4 +387,13 @@ public class DescriptorUtils {
Collections.sort(resultList); Collections.sort(resultList);
return resultList; return resultList;
} }
@Nullable
public static ClassDescriptor getInnerClassByName(@NotNull ClassDescriptor classDescriptor, @NotNull String innerClassName) {
ClassifierDescriptor classifier = classDescriptor.getDefaultType().getMemberScope().getClassifier(Name.identifier(innerClassName));
assert classifier instanceof ClassDescriptor :
"Inner class " + innerClassName + " in " + classDescriptor + " should be instance of ClassDescriptor, but was: "
+ (classifier == null ? "null" : classifier.getClass());
return (ClassDescriptor) classifier;
}
} }
compiler/frontend/src/org/jetbrains/jet/lang/types/lang/JetStandardLibrary.java
+3 -2
View File
@@ -31,6 +31,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.BindingTraceContext;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.TopDownAnalyzer; import org.jetbrains.jet.lang.resolve.TopDownAnalyzer;
import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope;
@@ -428,14 +429,14 @@ public class JetStandardLibrary {
@NotNull @NotNull
public ClassDescriptor getMapEntry() { public ClassDescriptor getMapEntry() {
ClassifierDescriptor entry = getMap().getDefaultType().getMemberScope().getClassifier(Name.identifier("Entry")); ClassifierDescriptor entry = DescriptorUtils.getInnerClassByName(getMap(), "Entry");
assert entry instanceof ClassDescriptor; assert entry instanceof ClassDescriptor;
return (ClassDescriptor) entry; return (ClassDescriptor) entry;
} }
@NotNull @NotNull
public ClassDescriptor getMutableMapEntry() { public ClassDescriptor getMutableMapEntry() {
ClassifierDescriptor entry = getMutableMap().getDefaultType().getMemberScope().getClassifier(Name.identifier("MutableEntry")); ClassifierDescriptor entry = DescriptorUtils.getInnerClassByName(getMutableMap(), "MutableEntry");
assert entry instanceof ClassDescriptor; assert entry instanceof ClassDescriptor;
return (ClassDescriptor) entry; return (ClassDescriptor) entry;
} }