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

Show expression type for argument names (KT-30057)

Browse Source 
#KT-30057 Fixed
This commit is contained in:
Nikolay Krasko
2019-03-19 18:22:42 +03:00
parent ce2f738d9f
commit 04ecc913ef
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinExpressionTypeProvider.kt
+15 -1
View File
@@ -32,16 +32,20 @@ import org.jetbrains.kotlin.idea.references.mainReference
import org.jetbrains.kotlin.idea.resolve.frontendService
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelector
import org.jetbrains.kotlin.psi.psiUtil.parents
import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
import org.jetbrains.kotlin.renderer.ClassifierNamePolicy
import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.renderer.RenderingFormat
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.calls.callUtil.getParameterForArgument
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.calls.callUtil.getType
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.expressions.typeInfoFactory.noTypeInfo
class KotlinExpressionTypeProvider : ExpressionTypeProvider<KtExpression>() {
@@ -112,7 +116,8 @@ class KotlinExpressionTypeProvider : ExpressionTypeProvider<KtExpression>() {
}
val expressionTypeInfo = bindingContext[BindingContext.EXPRESSION_TYPE_INFO, element] ?: noTypeInfo(DataFlowInfo.EMPTY)
val expressionType = element.getType(bindingContext)
val expressionType = element.getType(bindingContext) ?: getTypeForArgumentName(element, bindingContext)
val result = expressionType?.let { typeRenderer.renderType(it) } ?: return "Type is unknown"
val dataFlowValueFactory = element.getResolutionFacade().frontendService<DataFlowValueFactory>()
@@ -132,5 +137,14 @@ class KotlinExpressionTypeProvider : ExpressionTypeProvider<KtExpression>() {
return result
}
private fun getTypeForArgumentName(element: KtExpression, bindingContext: BindingContext): KotlinType? {
val valueArgumentName = (element.parent as? KtValueArgumentName) ?: return null
val argument = valueArgumentName.parent as? KtValueArgument ?: return null
val ktCallExpression = argument.parents.filterIsInstance<KtCallExpression>().firstOrNull() ?: return null
val resolvedCall = ktCallExpression.getResolvedCall(bindingContext) ?: return null
val parameter = resolvedCall.getParameterForArgument(argument) ?: return null
return parameter.type
}
override fun getErrorHint(): String = "No expression found"
}
idea/testData/codeInsight/expressionType/ArgumentName.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
fun foo(a: Int) {}
fun main() {
foo(<caret>a = 42)
}
// TYPE: a -> <html>Int</html>
idea/tests/org/jetbrains/kotlin/idea/codeInsight/ExpressionTypeTestGenerated.java
Generated
+5
View File
@@ -34,6 +34,11 @@ public class ExpressionTypeTestGenerated extends AbstractExpressionTypeTest {
runTest("idea/testData/codeInsight/expressionType/AnonymousObject.kt");
}
@TestMetadata("ArgumentName.kt")
public void testArgumentName() throws Exception {
runTest("idea/testData/codeInsight/expressionType/ArgumentName.kt");
}
@TestMetadata("BlockBodyFunction.kt")
public void testBlockBodyFunction() throws Exception {
runTest("idea/testData/codeInsight/expressionType/BlockBodyFunction.kt");