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

[NI] Don't replace context dependency for blocks with expected type

Browse Source 
#KT-35702 Fixed
This commit is contained in:
Dmitriy Novozhilov
2019-12-26 17:32:44 +03:00
parent 4fa5e2d85c
commit 04e567dbf9
7 changed files with 112 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java
+1 -6
View File
@@ -327,12 +327,7 @@ public class ExpressionTypingServices {
expectedType = context.expectedType;
}
ContextDependency dependency = context.contextDependency;
if (getLanguageVersionSettings().supportsFeature(LanguageFeature.NewInference)) {
dependency = ContextDependency.INDEPENDENT;
}
return blockLevelVisitor.getTypeInfo(statementExpression, context.replaceExpectedType(expectedType).replaceContextDependency(dependency), true);
return blockLevelVisitor.getTypeInfo(statementExpression, context.replaceExpectedType(expectedType), true);
}
if (context.languageVersionSettings.supportsFeature(LanguageFeature.NewInference) &&
statementExpression instanceof KtLambdaExpression) {