Replaced filterIsInstance with class-literal argument with simplified version

compiler/backend-common/src/org/jetbrains/jet/backend/common/CodegenUtilKt.kt

@@ -42,7 +42,7 @@ public object CodegenUtilKt {
         if (delegateExpressionType?.isDynamic() ?: false) return mapOf();
 
         return descriptor.getDefaultType().getMemberScope().getDescriptors().stream()
-            .filterIsInstance(javaClass<CallableMemberDescriptor>())
+            .filterIsInstance<CallableMemberDescriptor>()
             .filter { it.getKind() == CallableMemberDescriptor.Kind.DELEGATION }
             .toList()
             .sortBy(MemberComparator.INSTANCE as Comparator<CallableMemberDescriptor>) // Workaround for KT-6030

compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt

@@ -118,7 +118,7 @@ public class MultiModuleJavaAnalysisCustomTest : UsefulTestCase() {
     }
 
     private fun checkClass(classDescriptor: ClassDescriptor) {
-        classDescriptor.getDefaultType().getMemberScope().getDescriptors().filterIsInstance(javaClass<CallableDescriptor>()).forEach {
+        classDescriptor.getDefaultType().getMemberScope().getDescriptors().filterIsInstance<CallableDescriptor>().forEach {
             checkCallable(it)
         }
 

core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.kt

@@ -23,12 +23,12 @@ import org.jetbrains.jet.lang.resolve.name.Name
 public class InnerClassesScopeWrapper(override val workerScope: JetScope) : AbstractScopeAdapter() {
     override fun getClassifier(name: Name) = workerScope.getClassifier(name) as? ClassDescriptor
 
-    override fun getDeclarationsByLabel(labelName: Name) = workerScope.getDeclarationsByLabel(labelName).filterIsInstance(javaClass<ClassDescriptor>())
+    override fun getDeclarationsByLabel(labelName: Name) = workerScope.getDeclarationsByLabel(labelName).filterIsInstance<ClassDescriptor>()
 
     override fun getDescriptors(kindFilter: DescriptorKindFilter,
                                 nameFilter: (Name) -> Boolean): List<ClassDescriptor> {
         val restrictedFilter = kindFilter.restrictedToKinds(DescriptorKindFilter.CLASSIFIERS_MASK) ?: return listOf()
-        return workerScope.getDescriptors(restrictedFilter, nameFilter).filterIsInstance(javaClass<ClassDescriptor>())
+        return workerScope.getDescriptors(restrictedFilter, nameFilter).filterIsInstance<ClassDescriptor>()
     }
 
     override fun getImplicitReceiversHierarchy(): List<ReceiverParameterDescriptor> = listOf()

idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt

@@ -90,7 +90,7 @@ private fun collectAllModuleInfosFromIdeaModel(project: Project): List<IdeaModul
 
     //TODO: (module refactoring) include libraries that are not among dependencies of any module
     val ideaLibraries = ideaModules.flatMap {
-        ModuleRootManager.getInstance(it).getOrderEntries().filterIsInstance(javaClass<LibraryOrderEntry>()).map {
+        ModuleRootManager.getInstance(it).getOrderEntries().filterIsInstance<LibraryOrderEntry>().map {
             it.getLibrary()
         }
     }.filterNotNull().toSet()
@@ -98,7 +98,7 @@ private fun collectAllModuleInfosFromIdeaModel(project: Project): List<IdeaModul
     val librariesInfos = ideaLibraries.map { LibraryInfo(project, it) }
 
     val ideaSdks = ideaModules.flatMap {
-        ModuleRootManager.getInstance(it).getOrderEntries().filterIsInstance(javaClass<JdkOrderEntry>()).map {
+        ModuleRootManager.getInstance(it).getOrderEntries().filterIsInstance<JdkOrderEntry>().map {
             it.getJdk()
         }
     }.filterNotNull().toSet()

idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt

@@ -156,7 +156,7 @@ public class KotlinIndicesHelper(
         else {
             val importDirective = JetPsiFactory(project).createImportDirective(fqnString)
             analyzeImportReference(importDirective, resolutionScope, BindingTraceContext(), module)
-                    .filterIsInstance(javaClass<CallableDescriptor>())
+                    .filterIsInstance<CallableDescriptor>()
                     .filter { it.getExtensionReceiverParameter() != null }
         }
 
@@ -189,7 +189,7 @@ public class KotlinIndicesHelper(
     private fun findTopLevelCallables(fqName: FqName, context: JetExpression, jetScope: JetScope): Collection<CallableDescriptor> {
         val importDirective = JetPsiFactory(context.getProject()).createImportDirective(ImportPath(fqName, false))
         val allDescriptors = analyzeImportReference(importDirective, jetScope, BindingTraceContext(), moduleDescriptor)
-        return allDescriptors.filterIsInstance(javaClass<CallableDescriptor>()).filter { it.getExtensionReceiverParameter() == null }
+        return allDescriptors.filterIsInstance<CallableDescriptor>().filter { it.getExtensionReceiverParameter() == null }
     }
 
     private fun analyzeImportReference(

idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt

@@ -235,7 +235,7 @@ class SmartCompletion(val expression: JetSimpleNameExpression,
                 if (classDescriptor != null && DescriptorUtils.isEnumClass(classDescriptor)) {
                     val conditions = whenExpression.getEntries()
                             .flatMap { it.getConditions().toList() }
-                            .filterIsInstance(javaClass<JetWhenConditionWithExpression>())
+                            .filterIsInstance<JetWhenConditionWithExpression>()
                     for (condition in conditions) {
                         val selectorExpr = (condition.getExpression() as? JetDotQualifiedExpression)
                                 ?.getSelectorExpression() as? JetReferenceExpression ?: continue

idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt

@@ -257,7 +257,7 @@ class TypeInstantiationItems(
                 else -> return
             }
             val samConstructor = scope.getFunctions(`class`.getName())
-                                         .filterIsInstance(javaClass<SamConstructorDescriptor>())
+                                         .filterIsInstance<SamConstructorDescriptor>()
                                          .singleOrNull() ?: return
             val lookupElement = LookupElementFactory.DEFAULT.createLookupElement(samConstructor, resolutionFacade, bindingContext)
                     .assignSmartCompletionPriority(SmartCompletionItemPriority.INSTANTIATION)

idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt

@@ -82,7 +82,7 @@ fun findPackagePartInternalNameForLibraryFile(elementAt: JetElement): String? {
     }
 
     val deserializedDescriptor = descriptors
-            .filterIsInstance(javaClass<DeserializedCallableMemberDescriptor>())
+            .filterIsInstance<DeserializedCallableMemberDescriptor>()
             .filter { render(it) == descFromSourceText }
             .singleOrNull()
 

idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenPropertyMarker.kt

@@ -106,7 +106,7 @@ fun navigateToPropertyOverriddenDeclarations(e: MouseEvent?, property: JetProper
     val renderer = DefaultPsiElementCellRenderer()
     val navigatingOverrides = elementProcessor.getResults()
             .sortBy(renderer.getComparator())
-            .filterIsInstance(javaClass<NavigatablePsiElement>())
+            .filterIsInstance<NavigatablePsiElement>()
 
     PsiElementListNavigator.openTargets(e,
                                         navigatingOverrides.copyToArray(),

idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractableCodeDescriptor.kt

@@ -290,11 +290,11 @@ data class ControlFlow(
 ) {
     val outputValueBoxer = boxerFactory(outputValues)
 
-    val defaultOutputValue: ExpressionValue? = with(outputValues.filterIsInstance(javaClass<ExpressionValue>())) {
+    val defaultOutputValue: ExpressionValue? = with(outputValues.filterIsInstance<ExpressionValue>()) {
         if (size > 1) throw IllegalArgumentException("Multiple expression values: ${outputValues.joinToString()}") else firstOrNull()
     }
 
-    val jumpOutputValue: Jump? = with(outputValues.filterIsInstance(javaClass<Jump>())) {
+    val jumpOutputValue: Jump? = with(outputValues.filterIsInstance<Jump>()) {
         when {
             isEmpty() ->
                 null

idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt

@@ -88,7 +88,7 @@ data class ExtractionData(
         it is JetDeclarationWithBody || it is JetClassInitializer
     } ?: false
 
-    fun getExpressions(): List<JetExpression> = originalElements.filterIsInstance(javaClass<JetExpression>())
+    fun getExpressions(): List<JetExpression> = originalElements.filterIsInstance<JetExpression>()
 
     fun getCodeFragmentTextRange(): TextRange? {
         val originalElements = originalElements

idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt

@@ -85,7 +85,7 @@ private fun JetType.isDefault(): Boolean = KotlinBuiltIns.getInstance().isUnit(t
 
 private fun List<Instruction>.getModifiedVarDescriptors(bindingContext: BindingContext): Map<VariableDescriptor, List<JetExpression>> {
     val result = HashMap<VariableDescriptor, MutableList<JetExpression>>()
-    for (instruction in filterIsInstance(javaClass<WriteValueInstruction>())) {
+    for (instruction in filterIsInstance<WriteValueInstruction>()) {
         val expression = instruction.element as? JetExpression
         val descriptor = PseudocodeUtil.extractVariableDescriptorIfAny(instruction, false, bindingContext)
         if (expression != null && descriptor != null) {

idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt

@@ -145,7 +145,7 @@ public fun PsiElement.getExtractionContainers(strict: Boolean = true, includeAll
     return when (parent) {
         is JetFile -> Collections.singletonList(parent)
         is JetClassBody -> {
-            getAllExtractionContainers(strict).filterIsInstance(javaClass<JetClassBody>())
+            getAllExtractionContainers(strict).filterIsInstance<JetClassBody>()
         }
         else -> {
             val enclosingDeclaration =

idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt

@@ -75,7 +75,7 @@ public class MoveKotlinFileHandler : MoveFileHandler() {
         val declarationMoveProcessor = MoveKotlinTopLevelDeclarationsProcessor(
                 project,
                 MoveKotlinTopLevelDeclarationsOptions(
-                        elementsToMove = psiFile.getDeclarations().filterIsInstance(javaClass<JetNamedDeclaration>()),
+                        elementsToMove = psiFile.getDeclarations().filterIsInstance<JetNamedDeclaration>(),
                         moveTarget = DeferredJetFileKotlinMoveTarget(project, packageNameInfo.newPackageName) {
                             MoveFilesOrDirectoriesUtil.doMoveFile(psiFile, newParent)
                             newParent.findFile(psiFile.getName()) as? JetFile

idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt

@@ -121,7 +121,7 @@ public abstract class AbstractKotlinSteppingTest : KotlinDebuggerTestBase() {
 
             val stepTargets = KotlinSmartStepIntoHandler().findSmartStepTargets(position)
 
-            stepTargets.filterIsInstance(javaClass<MethodSmartStepTarget>()).map {
+            stepTargets.filterIsInstance<MethodSmartStepTarget>().map {
                 stepTarget ->
                 when (stepTarget) {
                     is KotlinMethodSmartStepTarget -> KotlinBasicStepMethodFilter(stepTarget as KotlinMethodSmartStepTarget)

j2k/src/org/jetbrains/jet/j2k/ClassBodyConverter.kt

@@ -127,7 +127,7 @@ class ClassBodyConverter(private val psiClass: PsiClass,
 
         val members = convertedMembers.keySet().filter { !it.isConstructor() }
         val classObjectMembers = members.filter { it !is PsiClass && it.hasModifierProperty(PsiModifier.STATIC) }
-        val nestedClasses = members.filterIsInstance(javaClass<PsiClass>()).filter { it.hasModifierProperty(PsiModifier.STATIC) }
+        val nestedClasses = members.filterIsInstance<PsiClass>().filter { it.hasModifierProperty(PsiModifier.STATIC) }
         if (classObjectMembers.all { it is PsiMethod && it.hasModifierProperty(PsiModifier.PRIVATE) }) {
             return nestedClasses.any { nestedClass -> classObjectMembers.any { converter.referenceSearcher.findMethodCalls(it as PsiMethod, nestedClass).isNotEmpty() } }
         }

j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt

@@ -344,7 +344,7 @@ class ConstructorConverter(private val psiClass: PsiClass,
     private fun generateArtificialPrimaryConstructor(classBody: ClassBody): ClassBody {
         assert(classBody.primaryConstructorSignature == null)
 
-        val propertiesToInitialize = classBody.members.filterIsInstance(javaClass<Property>()).filter { it.isVal }
+        val propertiesToInitialize = classBody.members.filterIsInstance<Property>().filter { it.isVal }
         for (function in classBody.factoryFunctions) {
             function.body!!.updateGenerator { (codeConverter, block) ->
                 // 2 cases: secondary constructor either calls another constructor or does not call any

j2k/src/org/jetbrains/jet/j2k/Converter.kt

@@ -186,7 +186,7 @@ class Converter private(private val elementToConvert: PsiElement,
     private fun convertAnnotationType(psiClass: PsiClass): Class {
         val paramModifiers = Modifiers(listOf(Modifier.PUBLIC)).assignNoPrototype()
         val noBlankLinesInheritance = CommentsAndSpacesInheritance(blankLinesBefore = false)
-        val annotationMethods = psiClass.getMethods().filterIsInstance(javaClass<PsiAnnotationMethod>())
+        val annotationMethods = psiClass.getMethods().filterIsInstance<PsiAnnotationMethod>()
         val parameters = annotationMethods
                 .map { method ->
                     val returnType = method.getReturnType()

j2k/src/org/jetbrains/jet/j2k/ReferenceSearcher.kt

@@ -43,7 +43,7 @@ public object EmptyReferenceSearcher: ReferenceSearcher {
 
 public object IdeaReferenceSearcher : ReferenceSearcher {
     override fun findVariableUsages(variable: PsiVariable, scope: PsiElement): Collection<PsiReferenceExpression> {
-        return ReferencesSearch.search(variable, LocalSearchScope(scope)).findAll().filterIsInstance(javaClass<PsiReferenceExpression>())
+        return ReferencesSearch.search(variable, LocalSearchScope(scope)).findAll().filterIsInstance<PsiReferenceExpression>()
     }
 
     override fun findMethodCalls(method: PsiMethod, scope: PsiElement): Collection<PsiMethodCallExpression> {

js/js.translator/src/org/jetbrains/k2js/translate/declaration/DelegationTranslator.kt

@@ -47,7 +47,7 @@ public class DelegationTranslator(
             BindingUtils.getClassDescriptor(context.bindingContext(), classDeclaration);
 
     private val delegationBySpecifiers =
-            classDeclaration.getDelegationSpecifiers().filterIsInstance(javaClass<JetDelegatorByExpressionSpecifier>());
+            classDeclaration.getDelegationSpecifiers().filterIsInstance<JetDelegatorByExpressionSpecifier>();
 
     private class Field (val name: String, val generateField: Boolean)
     private val fields = HashMap<JetDelegatorByExpressionSpecifier, Field>();