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

Use module to resolve "kotlin" package in DecompiledTextConsistencyTest

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-06-10 18:17:53 +04:00
parent bd30bc074e
commit c11df9ce9c
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextConsistencyTest.kt
+8 -3
View File
@@ -27,6 +27,9 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
import java.util.Collections
import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension
import org.jetbrains.jet.lang.descriptors.CallableDescriptor
import org.jetbrains.jet.lang.resolve.DescriptorUtils
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
public class DecompiledTextConsistencyTest : JetLightCodeInsightFixtureTestCase() {
@@ -58,10 +61,12 @@ class ProjectBasedResolverForDecompiler(project: Project) : ResolverForDecompile
}
override fun resolveDeclarationsInPackage(packageFqName: FqName): Collection<DeclarationDescriptor> {
val packageFragment = javaDescriptorResolver.getPackageFragment(packageFqName)
if (packageFragment == null) {
val packageView = javaDescriptorResolver.getModule().getPackage(packageFqName)
if (packageView == null) {
return Collections.emptyList()
}
return packageFragment.getMemberScope().getAllDescriptors() filter { it !is ClassDescriptor }
return packageView.getMemberScope().getAllDescriptors() filter {
it is CallableDescriptor && DescriptorUtils.getContainingModule(it) != KotlinBuiltIns.getInstance().getBuiltInsModule()
}
}
}