From 8b80daa2a1963168fceb26692048d06941483211 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 13 Nov 2014 11:24:09 +0400 Subject: [PATCH] Replaced filterIsInstance with class-literal argument with simplified version --- .../src/org/jetbrains/jet/backend/common/CodegenUtilKt.kt | 2 +- .../jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt | 2 +- .../jet/lang/resolve/scopes/InnerClassesScopeWrapper.kt | 4 ++-- .../jet/plugin/caches/resolve/ModuleDependencyMapper.kt | 4 ++-- .../org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt | 4 ++-- .../jetbrains/jet/plugin/completion/smart/SmartCompletion.kt | 2 +- .../jet/plugin/completion/smart/TypeInstantiationItems.kt | 2 +- .../debugger/PositionManagerLibraryClassFileSearcher.kt | 2 +- .../jet/plugin/highlighter/markers/OverridenPropertyMarker.kt | 2 +- .../refactoring/extractFunction/ExtractableCodeDescriptor.kt | 4 ++-- .../jet/plugin/refactoring/extractFunction/ExtractionData.kt | 2 +- .../refactoring/extractFunction/extractableAnalysisUtil.kt | 2 +- .../jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt | 2 +- .../move/moveFilesOrDirectories/MoveKotlinFileHandler.kt | 2 +- .../jet/plugin/debugger/AbstractKotlinSteppingTest.kt | 2 +- j2k/src/org/jetbrains/jet/j2k/ClassBodyConverter.kt | 2 +- j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt | 2 +- j2k/src/org/jetbrains/jet/j2k/Converter.kt | 2 +- j2k/src/org/jetbrains/jet/j2k/ReferenceSearcher.kt | 2 +- .../k2js/translate/declaration/DelegationTranslator.kt | 2 +- 20 files changed, 24 insertions(+), 24 deletions(-) diff --git a/compiler/backend-common/src/org/jetbrains/jet/backend/common/CodegenUtilKt.kt b/compiler/backend-common/src/org/jetbrains/jet/backend/common/CodegenUtilKt.kt index dd165616915..ba7885e8efe 100644 --- a/compiler/backend-common/src/org/jetbrains/jet/backend/common/CodegenUtilKt.kt +++ b/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()) + .filterIsInstance() .filter { it.getKind() == CallableMemberDescriptor.Kind.DELEGATION } .toList() .sortBy(MemberComparator.INSTANCE as Comparator) // Workaround for KT-6030 diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index d07c03360d3..0c6458ca337 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/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()).forEach { + classDescriptor.getDefaultType().getMemberScope().getDescriptors().filterIsInstance().forEach { checkCallable(it) } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.kt index b18681b86fa..6b50491b2d9 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.kt +++ b/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()) + override fun getDeclarationsByLabel(labelName: Name) = workerScope.getDeclarationsByLabel(labelName).filterIsInstance() override fun getDescriptors(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean): List { val restrictedFilter = kindFilter.restrictedToKinds(DescriptorKindFilter.CLASSIFIERS_MASK) ?: return listOf() - return workerScope.getDescriptors(restrictedFilter, nameFilter).filterIsInstance(javaClass()) + return workerScope.getDescriptors(restrictedFilter, nameFilter).filterIsInstance() } override fun getImplicitReceiversHierarchy(): List = listOf() diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt index d1c5fb5be27..8e695d56c2a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt @@ -90,7 +90,7 @@ private fun collectAllModuleInfosFromIdeaModel(project: Project): List()).map { + ModuleRootManager.getInstance(it).getOrderEntries().filterIsInstance().map { it.getLibrary() } }.filterNotNull().toSet() @@ -98,7 +98,7 @@ private fun collectAllModuleInfosFromIdeaModel(project: Project): List()).map { + ModuleRootManager.getInstance(it).getOrderEntries().filterIsInstance().map { it.getJdk() } }.filterNotNull().toSet() diff --git a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt b/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt index bbaa66b97af..0aba3579eb1 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt +++ b/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()) + .filterIsInstance() .filter { it.getExtensionReceiverParameter() != null } } @@ -189,7 +189,7 @@ public class KotlinIndicesHelper( private fun findTopLevelCallables(fqName: FqName, context: JetExpression, jetScope: JetScope): Collection { val importDirective = JetPsiFactory(context.getProject()).createImportDirective(ImportPath(fqName, false)) val allDescriptors = analyzeImportReference(importDirective, jetScope, BindingTraceContext(), moduleDescriptor) - return allDescriptors.filterIsInstance(javaClass()).filter { it.getExtensionReceiverParameter() == null } + return allDescriptors.filterIsInstance().filter { it.getExtensionReceiverParameter() == null } } private fun analyzeImportReference( diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt index bf0cf8ad618..050a19797a3 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt +++ b/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()) + .filterIsInstance() for (condition in conditions) { val selectorExpr = (condition.getExpression() as? JetDotQualifiedExpression) ?.getSelectorExpression() as? JetReferenceExpression ?: continue diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt index 1aa6420d3b4..19b72b672e3 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt +++ b/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()) + .filterIsInstance() .singleOrNull() ?: return val lookupElement = LookupElementFactory.DEFAULT.createLookupElement(samConstructor, resolutionFacade, bindingContext) .assignSmartCompletionPriority(SmartCompletionItemPriority.INSTANTIATION) diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt b/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt index 054fd97414d..1c6f388b497 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt @@ -82,7 +82,7 @@ fun findPackagePartInternalNameForLibraryFile(elementAt: JetElement): String? { } val deserializedDescriptor = descriptors - .filterIsInstance(javaClass()) + .filterIsInstance() .filter { render(it) == descFromSourceText } .singleOrNull() diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenPropertyMarker.kt b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenPropertyMarker.kt index ea6388557f0..b072b81f939 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenPropertyMarker.kt +++ b/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()) + .filterIsInstance() PsiElementListNavigator.openTargets(e, navigatingOverrides.copyToArray(), diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractableCodeDescriptor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractableCodeDescriptor.kt index 9e56df0aeb5..58da00bfa4d 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractableCodeDescriptor.kt +++ b/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())) { + val defaultOutputValue: ExpressionValue? = with(outputValues.filterIsInstance()) { if (size > 1) throw IllegalArgumentException("Multiple expression values: ${outputValues.joinToString()}") else firstOrNull() } - val jumpOutputValue: Jump? = with(outputValues.filterIsInstance(javaClass())) { + val jumpOutputValue: Jump? = with(outputValues.filterIsInstance()) { when { isEmpty() -> null diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt index db0d8c39412..3cd5344a63c 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt +++ b/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 = originalElements.filterIsInstance(javaClass()) + fun getExpressions(): List = originalElements.filterIsInstance() fun getCodeFragmentTextRange(): TextRange? { val originalElements = originalElements diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt index f24b03fa9fb..f92067a1202 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt +++ b/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.getModifiedVarDescriptors(bindingContext: BindingContext): Map> { val result = HashMap>() - for (instruction in filterIsInstance(javaClass())) { + for (instruction in filterIsInstance()) { val expression = instruction.element as? JetExpression val descriptor = PseudocodeUtil.extractVariableDescriptorIfAny(instruction, false, bindingContext) if (expression != null && descriptor != null) { diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt index a28ff681f98..c18911aad92 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt +++ b/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()) + getAllExtractionContainers(strict).filterIsInstance() } else -> { val enclosingDeclaration = diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt index 85093e82aab..d4997cca5e8 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt +++ b/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()), + elementsToMove = psiFile.getDeclarations().filterIsInstance(), moveTarget = DeferredJetFileKotlinMoveTarget(project, packageNameInfo.newPackageName) { MoveFilesOrDirectoriesUtil.doMoveFile(psiFile, newParent) newParent.findFile(psiFile.getName()) as? JetFile diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt index 37b183f626d..6ba8ccbfc15 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt +++ b/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()).map { + stepTargets.filterIsInstance().map { stepTarget -> when (stepTarget) { is KotlinMethodSmartStepTarget -> KotlinBasicStepMethodFilter(stepTarget as KotlinMethodSmartStepTarget) diff --git a/j2k/src/org/jetbrains/jet/j2k/ClassBodyConverter.kt b/j2k/src/org/jetbrains/jet/j2k/ClassBodyConverter.kt index 16e573380ab..eeecf5c0fb1 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ClassBodyConverter.kt +++ b/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()).filter { it.hasModifierProperty(PsiModifier.STATIC) } + val nestedClasses = members.filterIsInstance().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() } } } diff --git a/j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt b/j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt index 7bdd8df2187..97c9f1d89ea 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt +++ b/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()).filter { it.isVal } + val propertiesToInitialize = classBody.members.filterIsInstance().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 diff --git a/j2k/src/org/jetbrains/jet/j2k/Converter.kt b/j2k/src/org/jetbrains/jet/j2k/Converter.kt index cea25f62cf1..da212b39287 100644 --- a/j2k/src/org/jetbrains/jet/j2k/Converter.kt +++ b/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()) + val annotationMethods = psiClass.getMethods().filterIsInstance() val parameters = annotationMethods .map { method -> val returnType = method.getReturnType() diff --git a/j2k/src/org/jetbrains/jet/j2k/ReferenceSearcher.kt b/j2k/src/org/jetbrains/jet/j2k/ReferenceSearcher.kt index 826f1bd0531..09189979726 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ReferenceSearcher.kt +++ b/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 { - return ReferencesSearch.search(variable, LocalSearchScope(scope)).findAll().filterIsInstance(javaClass()) + return ReferencesSearch.search(variable, LocalSearchScope(scope)).findAll().filterIsInstance() } override fun findMethodCalls(method: PsiMethod, scope: PsiElement): Collection { diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/DelegationTranslator.kt b/js/js.translator/src/org/jetbrains/k2js/translate/declaration/DelegationTranslator.kt index a0c8401f753..5d92dd76511 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/DelegationTranslator.kt +++ b/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()); + classDeclaration.getDelegationSpecifiers().filterIsInstance(); private class Field (val name: String, val generateField: Boolean) private val fields = HashMap();