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

test for handling smart casts in "show expression type"

Browse Source 
#KT-10588 Fixed
This commit is contained in:
Dmitry Jemerov
2016-08-25 21:22:25 +02:00
parent 032d50bbbf
commit 4346afa19e
3 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinExpressionTypeProvider.kt
+20 -21
View File
@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.calls.callUtil.getType import org.jetbrains.kotlin.resolve.calls.callUtil.getType
import org.jetbrains.kotlin.types.KotlinType
class KotlinExpressionTypeProvider : ExpressionTypeProvider<KtExpression>() { class KotlinExpressionTypeProvider : ExpressionTypeProvider<KtExpression>() {
override fun getExpressionsAt(elementAt: PsiElement): List<KtExpression> = override fun getExpressionsAt(elementAt: PsiElement): List<KtExpression> =
@@ -39,27 +38,27 @@ class KotlinExpressionTypeProvider : ExpressionTypeProvider<KtExpression>() {
} }
override fun getInformationHint(element: KtExpression): String { override fun getInformationHint(element: KtExpression): String {
val type = typeByExpression(element) ?: return "Type is unknown" val bindingContext = element.analyze()
return renderTypeHint(type)
return "<html>${renderExpressionType(element, bindingContext)}</html>"
}
private fun renderExpressionType(element: KtExpression, bindingContext: BindingContext): String {
if (element is KtCallableDeclaration) {
val descriptor = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, element] as? CallableDescriptor
if (descriptor != null) {
return descriptor.returnType?.let { DescriptorRenderer.HTML.renderType(it) } ?: "Type is unknown"
}
}
val expressionType = element.getType(bindingContext) ?: return "Type is unknown"
val result = DescriptorRenderer.HTML.renderType(expressionType)
val smartCast = bindingContext[BindingContext.SMARTCAST, element]
if (smartCast != null) {
return result + " (smart cast)"
}
return result
} }
override fun getErrorHint(): String = "No expression found" override fun getErrorHint(): String = "No expression found"
companion object {
fun renderTypeHint(type: KotlinType) = "<html>" + DescriptorRenderer.HTML.renderType(type) + "</html>"
fun typeByExpression(expression: KtExpression): KotlinType? {
val bindingContext = expression.analyze()
if (expression is KtCallableDeclaration) {
val descriptor = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, expression] as? CallableDescriptor
if (descriptor != null) {
return descriptor.returnType
}
}
return expression.getType(bindingContext)
}
}
} }
idea/testData/codeInsight/expressionType/SmartCast.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
fun foo(x: Any) {
if (x is String) {
<caret>x.length
}
}
// TYPE: if (x is String) { x.length } -> <html>kotlin.Unit</html>
// TYPE: x -> <html>kotlin.String (smart cast)</html>
// TYPE: x.length -> <html>kotlin.Int</html>
idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractExpressionTypeTest.kt
+2 -1
View File
@@ -29,7 +29,8 @@ abstract class AbstractExpressionTypeTest : KotlinLightCodeInsightFixtureTestCas
protected fun doTest(path: String) { protected fun doTest(path: String) {
myFixture.configureByFile(path) myFixture.configureByFile(path)
val expressionTypeProvider = KotlinExpressionTypeProvider() val expressionTypeProvider = KotlinExpressionTypeProvider()
val expressions = expressionTypeProvider.getExpressionsAt(myFixture.elementAtCaret) val elementAtCaret = myFixture.file.findElementAt(myFixture.editor.caretModel.offset)!!
val expressions = expressionTypeProvider.getExpressionsAt(elementAtCaret)
val types = expressions.map { "${it.text.replace('\n', ' ')} -> ${expressionTypeProvider.getInformationHint(it)}" } val types = expressions.map { "${it.text.replace('\n', ' ')} -> ${expressionTypeProvider.getInformationHint(it)}" }
val expectedTypes = InTextDirectivesUtils.findLinesWithPrefixesRemoved(myFixture.file.text, "// TYPE: ") val expectedTypes = InTextDirectivesUtils.findLinesWithPrefixesRemoved(myFixture.file.text, "// TYPE: ")
UsefulTestCase.assertOrderedEquals(types, expectedTypes) UsefulTestCase.assertOrderedEquals(types, expectedTypes)