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

Cleanup: DataFlowAnalyzer, ignore MethodMayBeStatic for SmartCastManager

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-01-15 16:45:27 +03:00
parent 6157ebe3b8
commit c48c3fc8ed
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastManager.java
+2
View File
@@ -43,6 +43,8 @@ import static org.jetbrains.kotlin.diagnostics.Errors.SMARTCAST_IMPOSSIBLE;
import static org.jetbrains.kotlin.resolve.BindingContext.IMPLICIT_RECEIVER_SMARTCAST; import static org.jetbrains.kotlin.resolve.BindingContext.IMPLICIT_RECEIVER_SMARTCAST;
import static org.jetbrains.kotlin.resolve.BindingContext.SMARTCAST; import static org.jetbrains.kotlin.resolve.BindingContext.SMARTCAST;
// We do not want to make methods static to keep SmartCastManager as a component
@SuppressWarnings("MethodMayBeStatic")
public class SmartCastManager { public class SmartCastManager {
@NotNull @NotNull
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowAnalyzer.java
+3 -3
View File
@@ -245,7 +245,7 @@ public class DataFlowAnalyzer {
} }
@Nullable @Nullable
public SmartCastResult checkPossibleCast( public static SmartCastResult checkPossibleCast(
@NotNull KotlinType expressionType, @NotNull KotlinType expressionType,
@NotNull KtExpression expression, @NotNull KtExpression expression,
@NotNull ResolutionContext c @NotNull ResolutionContext c
@@ -272,7 +272,7 @@ public class DataFlowAnalyzer {
} }
@NotNull @NotNull
public KotlinTypeInfo illegalStatementType(@NotNull KtExpression expression, @NotNull ExpressionTypingContext context, @NotNull ExpressionTypingInternals facade) { public static KotlinTypeInfo illegalStatementType(@NotNull KtExpression expression, @NotNull ExpressionTypingContext context, @NotNull ExpressionTypingInternals facade) {
facade.checkStatementType( facade.checkStatementType(
expression, context.replaceExpectedType(TypeUtils.NO_EXPECTED_TYPE).replaceContextDependency(INDEPENDENT)); expression, context.replaceExpectedType(TypeUtils.NO_EXPECTED_TYPE).replaceContextDependency(INDEPENDENT));
context.trace.report(EXPRESSION_EXPECTED.on(expression, expression)); context.trace.report(EXPRESSION_EXPECTED.on(expression, expression));
@@ -280,7 +280,7 @@ public class DataFlowAnalyzer {
} }
@NotNull @NotNull
public Collection<KotlinType> getAllPossibleTypes( public static Collection<KotlinType> getAllPossibleTypes(
@NotNull KtExpression expression, @NotNull KtExpression expression,
@NotNull DataFlowInfo dataFlowInfo, @NotNull DataFlowInfo dataFlowInfo,
@NotNull KotlinType type, @NotNull KotlinType type,