Tests: Replace some usages of KotlinBuiltIns.getInstance()
In cases where platform is either unimportant or predefined in test code
This commit is contained in:
@@ -28,6 +28,7 @@ import com.intellij.psi.util.PsiTreeUtil
|
||||
import com.intellij.testFramework.LightProjectDescriptor
|
||||
import com.intellij.util.SmartList
|
||||
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
|
||||
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
||||
import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMembersHandler
|
||||
import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideImplementMembersHandler
|
||||
import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideMemberChooserObject
|
||||
@@ -127,7 +128,11 @@ public abstract class AbstractOverrideImplementTest : JetLightCodeInsightFixture
|
||||
val chooserObjects = handler.collectMembersToGenerate(classOrObject)
|
||||
|
||||
val singleToOverride = if (memberToOverride == null) {
|
||||
val filtered = chooserObjects.filter { it.descriptor.containingDeclaration != KotlinBuiltIns.getInstance().any }
|
||||
val filtered = chooserObjects.filter {
|
||||
(it.descriptor.containingDeclaration as? ClassDescriptor)?.let {
|
||||
!KotlinBuiltIns.isAny(it)
|
||||
} ?: true
|
||||
}
|
||||
assertEquals(1, filtered.size(), "Invalid number of available chooserObjects for override")
|
||||
filtered.single()
|
||||
}
|
||||
|
||||
+2
-1
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
|
||||
import org.jetbrains.kotlin.idea.js.KotlinJavaScriptLibraryManager
|
||||
import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor
|
||||
import org.jetbrains.kotlin.idea.vfilefinder.JsVirtualFileFinder
|
||||
import org.jetbrains.kotlin.js.resolve.JsPlatform
|
||||
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils
|
||||
import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils
|
||||
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder
|
||||
@@ -64,7 +65,7 @@ public class KotlinJavaScriptDecompiledTextConsistencyTest : TextConsistencyBase
|
||||
.sure { "No package fragment provider was created" }
|
||||
|
||||
module.initialize(provider)
|
||||
module.setDependencies(module, KotlinBuiltIns.getInstance().builtInsModule)
|
||||
module.setDependencies(module, JsPlatform.builtIns.builtInsModule)
|
||||
|
||||
return module
|
||||
}
|
||||
|
||||
+1
-1
@@ -81,7 +81,7 @@ public abstract class TextConsistencyBaseTest : JetLightCodeInsightFixtureTestCa
|
||||
override fun resolveDeclarationsInFacade(facadeFqName: FqName): Collection<DeclarationDescriptor> =
|
||||
module.getPackage(facadeFqName.parent()).memberScope.getAllDescriptors().filter {
|
||||
it is CallableMemberDescriptor &&
|
||||
it.module != KotlinBuiltIns.getInstance().builtInsModule &&
|
||||
it.module != module.builtIns.builtInsModule &&
|
||||
isFromFacade(it, facadeFqName)
|
||||
}.sortedWith(MemberComparator.INSTANCE)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user