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

Assert null pointer warning

Browse Source
This commit is contained in:
Nikolay Krasko
2013-06-04 14:13:14 +04:00
parent a21f7dcf37
commit 9d71c372ce
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java
+5 -1
View File
@@ -149,7 +149,11 @@ public class ScopeProvider {
return classDescriptor.getScopeForPropertyInitializerResolution(); return classDescriptor.getScopeForPropertyInitializerResolution();
} }
if (jetDeclaration instanceof JetEnumEntry) { if (jetDeclaration instanceof JetEnumEntry) {
return ((LazyClassDescriptor) classDescriptor.getClassObjectDescriptor()).getScopeForMemberDeclarationResolution(); LazyClassDescriptor descriptor = (LazyClassDescriptor) classDescriptor.getClassObjectDescriptor();
assert descriptor != null : "There should be class object descriptor for enum class " + parentDeclaration.getText() +
" on entry " + jetDeclaration.getText();
return descriptor.getScopeForMemberDeclarationResolution();
} }
return classDescriptor.getScopeForMemberDeclarationResolution(); return classDescriptor.getScopeForMemberDeclarationResolution();
} }