Skip to content

Commit c48c3fc

Browse files
committed
Cleanup: DataFlowAnalyzer, ignore MethodMayBeStatic for SmartCastManager
1 parent 6157ebe commit c48c3fc

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastManager.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
import static org.jetbrains.kotlin.resolve.BindingContext.IMPLICIT_RECEIVER_SMARTCAST;
4444
import static org.jetbrains.kotlin.resolve.BindingContext.SMARTCAST;
4545

46+
// We do not want to make methods static to keep SmartCastManager as a component
47+
@SuppressWarnings("MethodMayBeStatic")
4648
public class SmartCastManager {
4749

4850
@NotNull

compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowAnalyzer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public KotlinType checkType(
245245
}
246246

247247
@Nullable
248-
public SmartCastResult checkPossibleCast(
248+
public static SmartCastResult checkPossibleCast(
249249
@NotNull KotlinType expressionType,
250250
@NotNull KtExpression expression,
251251
@NotNull ResolutionContext c
@@ -272,15 +272,15 @@ public KotlinType checkStatementType(@NotNull KtExpression expression, @NotNull
272272
}
273273

274274
@NotNull
275-
public KotlinTypeInfo illegalStatementType(@NotNull KtExpression expression, @NotNull ExpressionTypingContext context, @NotNull ExpressionTypingInternals facade) {
275+
public static KotlinTypeInfo illegalStatementType(@NotNull KtExpression expression, @NotNull ExpressionTypingContext context, @NotNull ExpressionTypingInternals facade) {
276276
facade.checkStatementType(
277277
expression, context.replaceExpectedType(TypeUtils.NO_EXPECTED_TYPE).replaceContextDependency(INDEPENDENT));
278278
context.trace.report(EXPRESSION_EXPECTED.on(expression, expression));
279279
return TypeInfoFactoryKt.noTypeInfo(context);
280280
}
281281

282282
@NotNull
283-
public Collection<KotlinType> getAllPossibleTypes(
283+
public static Collection<KotlinType> getAllPossibleTypes(
284284
@NotNull KtExpression expression,
285285
@NotNull DataFlowInfo dataFlowInfo,
286286
@NotNull KotlinType type,

0 commit comments

Comments
 (0)