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

Code cleanup: several inspections applied

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-06-27 14:26:19 +03:00
committed by Mikhail Glukhikh
parent fdca96634e
commit 840847e47c
76 changed files with 121 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicLookupElementFactory.kt
+1 -1
View File
@@ -188,7 +188,7 @@ class BasicLookupElementFactory(
is ClassifierDescriptorWithTypeParameters -> {
val typeParams = descriptor.declaredTypeParameters
if (includeClassTypeArguments && typeParams.isNotEmpty()) {
element = element.appendTailText(typeParams.map { it.name.asString() }.joinToString(", ", "<", ">"), true)
element = element.appendTailText(typeParams.joinToString(", ", "<", ">") { it.name.asString() }, true)
}
var container = descriptor.containingDeclaration
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LambdaSignatureTemplates.kt
+1 -3
View File
@@ -109,9 +109,7 @@ object LambdaSignatureTemplates {
}
}
return functionParameterTypes(lambdaType)
.map(::parameterPresentation)
.joinToString(", ") + " ->"
return functionParameterTypes(lambdaType).joinToString(", ", transform = ::parameterPresentation) + " ->"
}
fun explicitParameterTypesRequired(file: KtFile, placeholderRange: TextRange, lambdaType: KotlinType): Boolean {
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt
+2 -2
View File
@@ -209,9 +209,9 @@ class LookupElementFactory(
if (descriptor.valueParameters.isEmpty()) return null
if (descriptor.findOriginalTopMostOverriddenDescriptors().none { it in superFunctions }) return null
val argumentText = descriptor.valueParameters.map {
val argumentText = descriptor.valueParameters.joinToString(", ") {
(if (it.varargElementType != null) "*" else "") + it.name.render()
}.joinToString(", ") //TODO: use code formatting settings
} //TODO: use code formatting settings
val lookupElement = createFunctionCallElementWithArguments(descriptor, argumentText, true)
lookupElement.assignPriority(ItemPriority.SUPER_METHOD_WITH_ARGUMENTS)
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt
+1 -1
View File
@@ -89,7 +89,7 @@ class MultipleArgumentsItemProvider(
compoundIcon.setIcon(firstIcon, 1, 0, 0)
return LookupElementBuilder
.create(variables.map { it.name.render() }.joinToString(", ")) //TODO: use code formatting settings
.create(variables.joinToString(", ") { it.name.render() }) //TODO: use code formatting settings
.withInsertHandler { context, _ ->
if (context.completionChar == Lookup.REPLACE_SELECT_CHAR) {
val offset = context.offsetMap.tryGetOffset(SmartCompletion.MULTIPLE_ARGUMENTS_REPLACEMENT_OFFSET)