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

use short names in Show Expression Type

Browse Source 
#KT-11310 Fixed
This commit is contained in:
Dmitry Jemerov
2016-08-26 11:47:56 +02:00
parent 4346afa19e
commit 6dccfd3b22
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinExpressionTypeProvider.kt
+7 -2
View File
@@ -23,10 +23,15 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.renderer.RenderingFormat
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
class KotlinExpressionTypeProvider : ExpressionTypeProvider<KtExpression>() { class KotlinExpressionTypeProvider : ExpressionTypeProvider<KtExpression>() {
private val typeRenderer = DescriptorRenderer.COMPACT_WITH_SHORT_TYPES.withOptions {
textFormat = RenderingFormat.HTML
}
override fun getExpressionsAt(elementAt: PsiElement): List<KtExpression> = override fun getExpressionsAt(elementAt: PsiElement): List<KtExpression> =
elementAt.parentsWithSelf.filterIsInstance<KtExpression>().filter { it.shouldShowType() }.toList() elementAt.parentsWithSelf.filterIsInstance<KtExpression>().filter { it.shouldShowType() }.toList()
@@ -47,12 +52,12 @@ class KotlinExpressionTypeProvider : ExpressionTypeProvider<KtExpression>() {
if (element is KtCallableDeclaration) { if (element is KtCallableDeclaration) {
val descriptor = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, element] as? CallableDescriptor val descriptor = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, element] as? CallableDescriptor
if (descriptor != null) { if (descriptor != null) {
return descriptor.returnType?.let { DescriptorRenderer.HTML.renderType(it) } ?: "Type is unknown" return descriptor.returnType?.let { typeRenderer.renderType(it) } ?: "Type is unknown"
} }
} }
val expressionType = element.getType(bindingContext) ?: return "Type is unknown" val expressionType = element.getType(bindingContext) ?: return "Type is unknown"
val result = DescriptorRenderer.HTML.renderType(expressionType) val result = typeRenderer.renderType(expressionType)
val smartCast = bindingContext[BindingContext.SMARTCAST, element] val smartCast = bindingContext[BindingContext.SMARTCAST, element]
if (smartCast != null) { if (smartCast != null) {
return result + " (smart cast)" return result + " (smart cast)"
idea/testData/codeInsight/expressionType/BlockBodyFunction.kt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ fun foo() {
val <caret>x = 1 val <caret>x = 1
} }
// TYPE: val x = 1 -> <html>kotlin.Int</html> // TYPE: val x = 1 -> <html>Int</html>
idea/testData/codeInsight/expressionType/MultiDeclaration.kt
Vendored
+1 -1
View File
@@ -4,4 +4,4 @@ fun f(x: IntStringPair) {
val (fir<caret>st, second) = x val (fir<caret>st, second) = x
} }
// TYPE: first -> <html>kotlin.Int</html> // TYPE: first -> <html>Int</html>
idea/testData/codeInsight/expressionType/SmartCast.kt
Vendored
+3 -3
View File
@@ -4,6 +4,6 @@ fun foo(x: Any) {
} }
} }
// TYPE: if (x is String) { x.length } -> <html>kotlin.Unit</html> // TYPE: if (x is String) { x.length } -> <html>Unit</html>
// TYPE: x -> <html>kotlin.String (smart cast)</html> // TYPE: x -> <html>String (smart cast)</html>
// TYPE: x.length -> <html>kotlin.Int</html> // TYPE: x.length -> <html>Int</html>
idea/testData/codeInsight/expressionType/VariableDeclaration.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
val <caret>x = 1 val <caret>x = 1
// TYPE: val x = 1 -> <html>kotlin.Int</html> // TYPE: val x = 1 -> <html>Int</html>