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

Diagnostic tests are logging their lazy activity

Browse Source
This commit is contained in:
Andrey Breslav
2013-11-21 16:04:48 +04:00
parent 8436147cec
commit 4892369cf4
1659 changed files with 173986 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt
+2 -2
View File
@@ -93,13 +93,13 @@ public class LazyPackageFragmentScopeForJavaPackage(
private val classes = c.storageManager.createMemoizedFunctionWithNullableValues<Name, ClassDescriptor> {
name ->
val classId = ClassId(packageFragment.fqName, SpecialNames.safeIdentifier(name))
val (jClass, kClass) = c.findClassInJava(classId)
val (jClass, kClass) = this.c.findClassInJava(classId)
if (kClass != null)
kClass
else if (jClass == null)
null
else {
val classDescriptor = c.javaClassResolver.resolveClass(jClass)
val classDescriptor = this.c.javaClassResolver.resolveClass(jClass)
assert(classDescriptor == null || classDescriptor.getContainingDeclaration() == packageFragment,
"Wrong package fragment for $classDescriptor, expected $packageFragment")
classDescriptor