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

Separate options for showing types of local vars and properties

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-04-21 19:40:24 +02:00
parent 0132b643ec
commit 6cda992204
1 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinInlayParameterHintsProvider.kt
+28 -20
View File
@@ -56,24 +56,25 @@ private enum class HintType(desc: String, enabled: Boolean) {
PROPERTY_HINT("Show property type hints", true) {
override fun provideHints(elem: PsiElement): List<InlayInfo> {
(elem as? KtProperty)?.let {
property ->
property.nameIdentifier?.let {
ident ->
return provideTypeHint(property, ident.endOffset)
}
}
return emptyList()
return providePropertyTypeHint(elem)
}
override fun isApplicable(elem: PsiElement): Boolean = elem is KtProperty && elem.getReturnTypeReference() == null
override fun isApplicable(elem: PsiElement): Boolean = elem is KtProperty && elem.getReturnTypeReference() == null && !elem.isLocal
},
FUNCTION_HINT("Show function type hints", true) {
LOCAL_VARIABLE_HINT("Show local variable type hints", true) {
override fun provideHints(elem: PsiElement): List<InlayInfo> {
(elem as? KtNamedFunction)?.let {
namedFunc ->
namedFunc.valueParameterList?.let {
paramList ->
return providePropertyTypeHint(elem)
}
override fun isApplicable(elem: PsiElement): Boolean = (elem is KtProperty && elem.getReturnTypeReference() == null && elem.isLocal) ||
(elem is KtParameter && elem.isLoopParameter)
},
FUNCTION_HINT("Show function return type hints", true) {
override fun provideHints(elem: PsiElement): List<InlayInfo> {
(elem as? KtNamedFunction)?.let { namedFunc ->
namedFunc.valueParameterList?.let { paramList ->
return provideTypeHint(namedFunc, paramList.endOffset)
}
}
@@ -84,19 +85,17 @@ private enum class HintType(desc: String, enabled: Boolean) {
},
PARAMETER_TYPE_HINT("Show parameter type hints ", false) {
override fun provideHints(elem: PsiElement): List<InlayInfo> {
(elem as? KtParameter)?.let {
param ->
param.nameIdentifier?.let {
ident ->
(elem as? KtParameter)?.let { param ->
param.nameIdentifier?.let { ident ->
return provideTypeHint(param, ident.endOffset)
}
}
return emptyList()
}
override fun isApplicable(elem: PsiElement): Boolean = elem is KtParameter && elem.typeReference == null
override fun isApplicable(elem: PsiElement): Boolean = elem is KtParameter && elem.typeReference == null && !elem.isLoopParameter
},
PARAMETER_HINT("Show parameter hints", true) {
PARAMETER_HINT("Show argument name hints", true) {
override fun provideHints(elem: PsiElement): List<InlayInfo> {
(elem as? KtCallExpression)?.let {
return provideParameterInfo(it)
@@ -145,6 +144,15 @@ private enum class HintType(desc: String, enabled: Boolean) {
else -> false
}
private fun providePropertyTypeHint(elem: PsiElement): List<InlayInfo> {
(elem as? KtCallableDeclaration)?.let { property ->
property.nameIdentifier?.let { ident ->
return HintType.provideTypeHint(property, ident.endOffset)
}
}
return emptyList()
}
private fun provideTypeHint(element: KtCallableDeclaration, offset: Int): List<InlayInfo> {
val type = SpecifyTypeExplicitlyIntention.getTypeForDeclaration(element)
return if (!type.isError) {