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

Don't show disambiguation for "Show expression type" on "this"

Browse Source 
#KT-17840 Fixed
This commit is contained in:
Dmitry Jemerov
2017-05-16 16:22:29 +02:00
parent 2cbb8d03c0
commit af043843b7
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinExpressionTypeProvider.kt
+1
View File
@@ -74,6 +74,7 @@ class KotlinExpressionTypeProvider : ExpressionTypeProvider<KtExpression>() {
is KtIfExpression, is KtWhenExpression, is KtTryExpression -> shouldShowStatementType() is KtIfExpression, is KtWhenExpression, is KtTryExpression -> shouldShowStatementType()
is KtLoopExpression -> false is KtLoopExpression -> false
is KtConstantExpression -> false is KtConstantExpression -> false
is KtThisExpression -> false
else -> getQualifiedExpressionForSelector() == null && parent !is KtCallableReferenceExpression && !isFunctionCallee() else -> getQualifiedExpressionForSelector() == null && parent !is KtCallableReferenceExpression && !isFunctionCallee()
} }
idea/testData/codeInsight/expressionType/ThisInLambda.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
val x = 1.apply {
th<caret>is
}
// TYPE: this -> <html>Int</html>
idea/tests/org/jetbrains/kotlin/idea/codeInsight/ExpressionTypeTestGenerated.java
+6
View File
@@ -126,6 +126,12 @@ public class ExpressionTypeTestGenerated extends AbstractExpressionTypeTest {
doTest(fileName); doTest(fileName);
} }
@TestMetadata("ThisInLambda.kt")
public void testThisInLambda() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/ThisInLambda.kt");
doTest(fileName);
}
@TestMetadata("VariableDeclaration.kt") @TestMetadata("VariableDeclaration.kt")
public void testVariableDeclaration() throws Exception { public void testVariableDeclaration() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/VariableDeclaration.kt"); String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/expressionType/VariableDeclaration.kt");