From 865fdd79624f59c91b1a3fd212ad4dc8d43fc7a9 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 29 Dec 2015 04:38:30 +0300 Subject: [PATCH] Cleanup in idea plugin modules, idea-core --- .../org/jetbrains/kotlin/idea/core/ExpectedInfos.kt | 2 +- .../jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt | 2 +- .../jetbrains/kotlin/idea/core/KotlinNameSuggester.kt | 10 +++++----- .../src/org/jetbrains/kotlin/idea/core/Utils.kt | 4 ++-- .../overrideImplement/OverrideMemberChooserObject.kt | 6 +++--- .../core/overrideImplement/OverrideMembersHandler.kt | 6 +++--- .../jetbrains/kotlin/idea/core/psiModificationUtils.kt | 2 +- .../idea/core/util/DescriptorMemberChooserObject.kt | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ExpectedInfos.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ExpectedInfos.kt index 9a14be0020d..2654c5b29d1 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ExpectedInfos.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ExpectedInfos.kt @@ -378,7 +378,7 @@ class ExpectedInfos( = getArgumentExpression()?.let { bindingContext.getType(it) }?.isError ?: true private fun namedArgumentTail(argumentToParameter: Map, argumentName: Name, descriptor: FunctionDescriptor): Tail? { - val usedParameterNames = (argumentToParameter.values().map { it.getName() } + listOf(argumentName)).toSet() + val usedParameterNames = (argumentToParameter.values.map { it.getName() } + listOf(argumentName)).toSet() val notUsedParameters = descriptor.getValueParameters().filter { it.getName() !in usedParameterNames } return if (notUsedParameters.isEmpty()) Tail.RPARENTH // named arguments no supported for [] diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt index 93814ed1c26..1323fc33a9f 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt @@ -304,7 +304,7 @@ public class KotlinIndicesHelper( val fqName = descriptor.importableFqName?.asString() ?: return false return CodeInsightSettings.getInstance().EXCLUDED_PACKAGES - .any { excluded -> fqName == excluded || (fqName.startsWith(excluded) && fqName[excluded.length()] == '.') } + .any { excluded -> fqName == excluded || (fqName.startsWith(excluded) && fqName[excluded.length] == '.') } } private fun KtCallableDeclaration.resolveToDescriptorsWithHack(): Collection { diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt index 8c46c6ba46f..ca3b0d14d1c 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt @@ -244,16 +244,16 @@ public object KotlinNameSuggester { for (prefix in ACCESSOR_PREFIXES) { if (!s.startsWith(prefix)) continue - val len = prefix.length() - if (len < s.length() && Character.isUpperCase(s.charAt(len))) { + val len = prefix.length + if (len < s.length && Character.isUpperCase(s[len])) { s = s.substring(len) break } } var upperCaseLetterBefore = false - for (i in 0..s.length() - 1) { - val c = s.charAt(i) + for (i in 0..s.length - 1) { + val c = s[i] val upperCaseLetter = Character.isUpperCase(c) if (i == 0) { @@ -335,7 +335,7 @@ public object KotlinNameSuggester { if (name == null || name.isEmpty()) return false val lexer = KotlinLexer() - lexer.start(name, 0, name.length()) + lexer.start(name, 0, name.length) if (lexer.getTokenType() !== KtTokens.IDENTIFIER) return false lexer.advance() return lexer.getTokenType() == null diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt index fda647fedaf..ec011ccb828 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt @@ -73,7 +73,7 @@ public fun Call.mapArgumentsToParameters(targetDescriptor: CallableDescriptor): positionalArgumentIndex = null } else { - if (positionalArgumentIndex != null && positionalArgumentIndex < parameters.size()) { + if (positionalArgumentIndex != null && positionalArgumentIndex < parameters.size) { val parameter = parameters[positionalArgumentIndex] map[argument] = parameter @@ -90,7 +90,7 @@ public fun Call.mapArgumentsToParameters(targetDescriptor: CallableDescriptor): public fun ImplicitReceiver.asExpression(resolutionScope: LexicalScope, psiFactory: KtPsiFactory): KtExpression? { val expressionFactory = resolutionScope.getImplicitReceiversWithInstanceToExpression() - .entrySet() + .entries .firstOrNull { it.key.getContainingDeclaration() == this.declarationDescriptor } ?.value ?: return null return expressionFactory.createExpression(psiFactory) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt index 7bba25ebd82..94daccf6496 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt @@ -105,7 +105,7 @@ private fun generateProperty(project: Project, descriptor: PropertyDescriptor, b descriptor.kind, /* copyOverrides = */ true) as PropertyDescriptor newDescriptor.addOverriddenDescriptor(descriptor) - val body = StringBuilder { + val body = buildString { append("\nget()") append(" = ") append(generateUnsupportedOrSuperCall(descriptor, bodyType)) @@ -143,7 +143,7 @@ public fun generateUnsupportedOrSuperCall(descriptor: CallableMemberDescriptor, return "throw UnsupportedOperationException()" } else { - return StringBuilder { + return buildString { append("super") if (bodyType == OverrideMemberChooserObject.BodyType.QUALIFIED_SUPER) { val superClassFqName = IdeDescriptorRenderers.SOURCE_CODE.renderClassifierName(descriptor.containingDeclaration as ClassifierDescriptor) @@ -158,7 +158,7 @@ public fun generateUnsupportedOrSuperCall(descriptor: CallableMemberDescriptor, } paramTexts.joinTo(this, prefix="(", postfix=")") } - }.toString() + } } } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt index 7b3968c1bc8..d128d22aaa1 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt @@ -46,7 +46,7 @@ public class OverrideMembersHandler : OverrideImplementMembersHandler() { } } - val realSupers = byOriginalRealSupers.values().map { it.realSuper } + val realSupers = byOriginalRealSupers.values.map { it.realSuper } val nonAbstractRealSupers = realSupers.filter { it.modality != Modality.ABSTRACT } val realSupersToUse = if (nonAbstractRealSupers.isNotEmpty()) { nonAbstractRealSupers @@ -59,7 +59,7 @@ public class OverrideMembersHandler : OverrideImplementMembersHandler() { val immediateSupers = byOriginalRealSupers[realSuper.original]!!.immediateSupers assert(immediateSupers.isNotEmpty()) - val immediateSuperToUse = if (immediateSupers.size() == 1) { + val immediateSuperToUse = if (immediateSupers.size == 1) { immediateSupers.single() } else { @@ -68,7 +68,7 @@ public class OverrideMembersHandler : OverrideImplementMembersHandler() { val bodyType = if (immediateSuperToUse.modality == Modality.ABSTRACT) OverrideMemberChooserObject.BodyType.EMPTY - else if (realSupersToUse.size() == 1) + else if (realSupersToUse.size == 1) OverrideMemberChooserObject.BodyType.SUPER else OverrideMemberChooserObject.BodyType.QUALIFIED_SUPER diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/psiModificationUtils.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/psiModificationUtils.kt index 96895ab9a71..ffd67178590 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/psiModificationUtils.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/psiModificationUtils.kt @@ -93,7 +93,7 @@ public fun KtCallExpression.moveFunctionLiteralOutsideParentheses() { val dummyCall = KtPsiFactory(this).createExpressionByPattern("foo()$0:'{}'", expression) as KtCallExpression val functionLiteralArgument = dummyCall.getLambdaArguments().single() this.add(functionLiteralArgument) - if (argumentList.getArguments().size() > 1) { + if (argumentList.getArguments().size > 1) { argumentList.removeArgument(argument) } else { diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/DescriptorMemberChooserObject.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/DescriptorMemberChooserObject.kt index 44c265fa0ea..ba8c4b98338 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/DescriptorMemberChooserObject.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/DescriptorMemberChooserObject.kt @@ -46,8 +46,8 @@ public open class DescriptorMemberChooserObject( val parent = descriptor.containingDeclaration ?: error("No parent for $descriptor") val declaration = if (psiElement is KtDeclaration) { // kotlin - PsiTreeUtil.getStubOrPsiParentOfType(psiElement, javaClass()) - ?: PsiTreeUtil.getStubOrPsiParentOfType(psiElement, javaClass()) + PsiTreeUtil.getStubOrPsiParentOfType(psiElement, KtNamedDeclaration::class.java) + ?: PsiTreeUtil.getStubOrPsiParentOfType(psiElement, KtFile::class.java) } else { // java or compiled (psiElement as PsiMember).containingClass