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

"Show expression type" no longer shows elements which enclose the element at caret (KT-14436)

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-10-27 13:48:29 +02:00
parent 57680ae003
commit 4246fcf256
7 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinExpressionTypeProvider.kt
+4 -2
View File
@@ -36,8 +36,10 @@ class KotlinExpressionTypeProvider : ExpressionTypeProvider<KtExpression>() {
textFormat = RenderingFormat.HTML 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() val candidates = elementAt.parentsWithSelf.filterIsInstance<KtExpression>().filter { it.shouldShowType() }.toList()
return candidates.takeWhile { it.textRange.startOffset == candidates.first().textRange.startOffset }
}
private fun KtExpression.shouldShowType() = when (this) { private fun KtExpression.shouldShowType() = when (this) {
is KtFunctionLiteral -> false is KtFunctionLiteral -> false
idea/testData/codeInsight/expressionType/IfAsExpression.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
val x = if (2 > 1) <caret>3 else 4 val x = if (2 > 1) <caret>3 else 4
// TYPE: if (2 > 1) 3 else 4 -> <html>Int</html> // TYPE: if (2 > 1) 3 else 4 -> <html>Int</html>
// TYPE: val x = if (2 > 1) 3 else 4 -> <html>Int</html>
idea/testData/codeInsight/expressionType/IfAsExpressionInsideBlock.kt
Vendored
-2
View File
@@ -3,5 +3,3 @@ val x = if (flag) {
} else 42 } else 42
// TYPE: if (flag2) 13 else 7 -> <html>Int</html> // TYPE: if (flag2) 13 else 7 -> <html>Int</html>
// TYPE: if (flag) { if (flag2) 13 else 7 } else 42 -> <html>Int</html>
// TYPE: val x = if (flag) { if (flag2) 13 else 7 } else 42 -> <html>Int</html>
idea/testData/codeInsight/expressionType/Lambda.kt
Vendored
+1 -5
View File
@@ -1,7 +1,3 @@
val x = listOf(1).map { q -> println(<caret>q) } val x = listOf(1).map {<caret> q -> println(q) }
// TYPE: q -> <html>Int</html>
// TYPE: println(q) -> <html>Unit</html>
// TYPE: { q -> println(q) } -> <html>(Int) &rarr; Unit</html> // TYPE: { q -> println(q) } -> <html>(Int) &rarr; Unit</html>
// TYPE: listOf(1).map { q -> println(q) } -> <html>List&lt;Unit&gt;</html>
// TYPE: val x = listOf(1).map { q -> println(q) } -> <html>List&lt;Unit&gt;</html>
idea/testData/codeInsight/expressionType/MethodReference.kt
Vendored
-1
View File
@@ -6,4 +6,3 @@ fun bar() {
} }
// TYPE: ::foo -> <html>KFunction0&lt;Unit&gt;</html> // TYPE: ::foo -> <html>KFunction0&lt;Unit&gt;</html>
// TYPE: run(::foo) -> <html>Unit</html>
idea/testData/codeInsight/expressionType/MultiDeclarationInLambda.kt
Vendored
-2
View File
@@ -6,5 +6,3 @@ fun f(x: List<IntStringPair>) {
} }
// TYPE: first -> <html>Int</html> // TYPE: first -> <html>Int</html>
// TYPE: { (first, second) -> } -> <html>(IntStringPair) &rarr; Unit</html>
// TYPE: x.forEach { (first, second) -> } -> <html>Unit</html>
idea/testData/codeInsight/expressionType/SoftSmartCastMultipleTypes.kt
Vendored
-1
View File
@@ -11,4 +11,3 @@ fun fn(value: Any) {
} }
// TYPE: value -> <html>A & B (smart cast from Any)</html> // TYPE: value -> <html>A & B (smart cast from Any)</html>
// TYPE: println(value) -> <html>Unit</html>