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

Show parameter hints only before unclear expressions, as in Java

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-04-21 19:24:11 +02:00
parent 8b3f8ce750
commit 8508b8b397
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinInlayParameterHintsProvider.kt
+8 -1
View File
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
import org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention
import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.getReturnTypeReference
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.endOffset
@@ -126,7 +127,7 @@ private enum class HintType(desc: String, enabled: Boolean) {
return resolvedCall.valueArguments.mapNotNull { (valueParam: ValueParameterDescriptor, resolvedArg) ->
resolvedArg.arguments.firstOrNull()?.let { arg ->
arg.getArgumentExpression()?.let { argExp ->
if (!arg.isNamed() && !valueParam.name.isSpecial) {
if (!arg.isNamed() && !valueParam.name.isSpecial && argExp.isUnclearExpression()) {
return@mapNotNull InlayInfo(valueParam.name.identifier, argExp.startOffset)
}
}
@@ -138,6 +139,12 @@ private enum class HintType(desc: String, enabled: Boolean) {
return emptyList()
}
private fun KtExpression.isUnclearExpression() = when(this) {
is KtConstantExpression, is KtThisExpression, is KtBinaryExpression -> true
is KtPrefixExpression -> baseExpression is KtConstantExpression && (operationToken == KtTokens.PLUS || operationToken == KtTokens.MINUS)
else -> false
}
private fun provideTypeHint(element: KtCallableDeclaration, offset: Int): List<InlayInfo> {
val type = SpecifyTypeExplicitlyIntention.getTypeForDeclaration(element)
return if (!type.isError) {