MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[groovy] Add type hint for implicit parameter in closure

Browse Source 
GitOrigin-RevId: 3f0db7012d382c8eac020a34e4330fec57fcfeec
This commit is contained in:
Konstantin.Nisht
2020-04-22 18:51:01 +00:00
committed by intellij-monorepo-bot
parent 677466c6e3
commit fa0abddbc7
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/hint/GroovyParameterTypeHintsCollector.kt
+17 -4
View File
@@ -3,11 +3,16 @@ package org.jetbrains.plugins.groovy.codeInsight.hint
import com.intellij.codeInsight.hints.FactoryInlayHintsCollector
import com.intellij.codeInsight.hints.InlayHintsSink
import com.intellij.codeInsight.hints.presentation.InlayPresentation
import com.intellij.openapi.editor.Editor
import com.intellij.psi.CommonClassNames
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiType
import com.intellij.refactoring.suggested.endOffset
import org.jetbrains.plugins.groovy.intentions.style.inference.MethodParameterAugmenter
import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.GrModifier.DEF
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable
import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock
import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod
import org.jetbrains.plugins.groovy.lang.psi.dataFlow.types.TypeAugmenter
@@ -22,13 +27,16 @@ class GroovyParameterTypeHintsCollector(editor: Editor,
return false
}
if (element is GrParameter && element.typeElement == null && !element.isVarArgs) {
val type = (GrVariableEnhancer.getEnhancedType(element)
?: TypeAugmenter.inferAugmentedType(element))
?.takeIf { !it.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) }
?: return true
val type: PsiType = getRepresentableType(element) ?: return true
val typeRepresentation = factory.buildRepresentation(type, " ").run { factory.roundWithBackground(this) }
sink.addInlineElement(element.textOffset, false, typeRepresentation)
}
if (element is GrClosableBlock && element.parameterList.isEmpty) {
val itParameter: GrParameter = element.allParameters.singleOrNull() ?: return true
val type: PsiType = getRepresentableType(itParameter) ?: return true
val textRepresentation: InlayPresentation = factory.roundWithBackground(factory.buildRepresentation(type, " it -> "))
sink.addInlineElement(element.lBrace.endOffset, true, textRepresentation)
}
if (settings.showTypeParameterList &&
element is GrMethod &&
!element.hasTypeParameters() &&
@@ -46,4 +54,9 @@ class GroovyParameterTypeHintsCollector(editor: Editor,
return true
}
private fun getRepresentableType(variable: GrVariable): PsiType? {
val inferredType: PsiType? = GrVariableEnhancer.getEnhancedType(variable) ?: TypeAugmenter.inferAugmentedType(variable)
return inferredType?.takeIf { !it.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) }
}
}