Skip to content

Commit 5529302

Browse files
stereotype441Commit Queue
authored andcommitted
[messages] Remove unnecessary if test.
Removes the `if (diagnosticCode is CompileTimeErrorCode)` test in `_ConstantDiagnosticListener.onDiagnostic`. This test was unnecessary, since the enclosed switch statement does nothing in the default case. This is a step toward collapsoing the `DiagnosticCode` class hierarchy and removing classes like `CompileTimeErrorCode` entirely. Change-Id: I6a6a69640d9076f3a6ed8bb976ce6fb122e0413a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/459120 Reviewed-by: Konstantin Shcheglov <scheglov@google.com> Commit-Queue: Paul Berry <paulberry@google.com>
1 parent 0284cb4 commit 5529302

File tree

1 file changed

+36
-39
lines changed

1 file changed

+36
-39
lines changed

pkg/analyzer/lib/src/lint/constants.dart

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -26,45 +26,42 @@ class _ConstantDiagnosticListener extends DiagnosticListener {
2626
@override
2727
void onDiagnostic(Diagnostic diagnostic) {
2828
DiagnosticCode diagnosticCode = diagnostic.diagnosticCode;
29-
if (diagnosticCode is CompileTimeErrorCode) {
30-
switch (diagnosticCode) {
31-
case CompileTimeErrorCode.constConstructorConstantFromDeferredLibrary:
32-
case CompileTimeErrorCode
33-
.constConstructorWithFieldInitializedByNonConst:
34-
case CompileTimeErrorCode.constEvalExtensionMethod:
35-
case CompileTimeErrorCode.constEvalExtensionTypeMethod:
36-
case CompileTimeErrorCode.constEvalMethodInvocation:
37-
case CompileTimeErrorCode.constEvalPropertyAccess:
38-
case CompileTimeErrorCode.constEvalTypeBool:
39-
case CompileTimeErrorCode.constEvalTypeBoolInt:
40-
case CompileTimeErrorCode.constEvalTypeBoolNumString:
41-
case CompileTimeErrorCode.constEvalTypeInt:
42-
case CompileTimeErrorCode.constEvalTypeNum:
43-
case CompileTimeErrorCode.constEvalTypeNumString:
44-
case CompileTimeErrorCode.constEvalTypeString:
45-
case CompileTimeErrorCode.constEvalThrowsException:
46-
case CompileTimeErrorCode.constEvalThrowsIdbze:
47-
case CompileTimeErrorCode.constEvalForElement:
48-
case CompileTimeErrorCode.constMapKeyNotPrimitiveEquality:
49-
case CompileTimeErrorCode.constSetElementNotPrimitiveEquality:
50-
case CompileTimeErrorCode.constTypeParameter:
51-
case CompileTimeErrorCode.constWithNonConst:
52-
case CompileTimeErrorCode.constWithNonConstantArgument:
53-
case CompileTimeErrorCode.constWithTypeParameters:
54-
case CompileTimeErrorCode.constWithTypeParametersConstructorTearoff:
55-
case CompileTimeErrorCode.invalidConstant:
56-
case CompileTimeErrorCode.missingConstInListLiteral:
57-
case CompileTimeErrorCode.missingConstInMapLiteral:
58-
case CompileTimeErrorCode.missingConstInSetLiteral:
59-
case CompileTimeErrorCode.nonBoolCondition:
60-
case CompileTimeErrorCode.nonConstantListElement:
61-
case CompileTimeErrorCode.nonConstantMapElement:
62-
case CompileTimeErrorCode.nonConstantMapKey:
63-
case CompileTimeErrorCode.nonConstantMapValue:
64-
case CompileTimeErrorCode.nonConstantRecordField:
65-
case CompileTimeErrorCode.nonConstantSetElement:
66-
hasConstError = true;
67-
}
29+
switch (diagnosticCode) {
30+
case CompileTimeErrorCode.constConstructorConstantFromDeferredLibrary:
31+
case CompileTimeErrorCode.constConstructorWithFieldInitializedByNonConst:
32+
case CompileTimeErrorCode.constEvalExtensionMethod:
33+
case CompileTimeErrorCode.constEvalExtensionTypeMethod:
34+
case CompileTimeErrorCode.constEvalMethodInvocation:
35+
case CompileTimeErrorCode.constEvalPropertyAccess:
36+
case CompileTimeErrorCode.constEvalTypeBool:
37+
case CompileTimeErrorCode.constEvalTypeBoolInt:
38+
case CompileTimeErrorCode.constEvalTypeBoolNumString:
39+
case CompileTimeErrorCode.constEvalTypeInt:
40+
case CompileTimeErrorCode.constEvalTypeNum:
41+
case CompileTimeErrorCode.constEvalTypeNumString:
42+
case CompileTimeErrorCode.constEvalTypeString:
43+
case CompileTimeErrorCode.constEvalThrowsException:
44+
case CompileTimeErrorCode.constEvalThrowsIdbze:
45+
case CompileTimeErrorCode.constEvalForElement:
46+
case CompileTimeErrorCode.constMapKeyNotPrimitiveEquality:
47+
case CompileTimeErrorCode.constSetElementNotPrimitiveEquality:
48+
case CompileTimeErrorCode.constTypeParameter:
49+
case CompileTimeErrorCode.constWithNonConst:
50+
case CompileTimeErrorCode.constWithNonConstantArgument:
51+
case CompileTimeErrorCode.constWithTypeParameters:
52+
case CompileTimeErrorCode.constWithTypeParametersConstructorTearoff:
53+
case CompileTimeErrorCode.invalidConstant:
54+
case CompileTimeErrorCode.missingConstInListLiteral:
55+
case CompileTimeErrorCode.missingConstInMapLiteral:
56+
case CompileTimeErrorCode.missingConstInSetLiteral:
57+
case CompileTimeErrorCode.nonBoolCondition:
58+
case CompileTimeErrorCode.nonConstantListElement:
59+
case CompileTimeErrorCode.nonConstantMapElement:
60+
case CompileTimeErrorCode.nonConstantMapKey:
61+
case CompileTimeErrorCode.nonConstantMapValue:
62+
case CompileTimeErrorCode.nonConstantRecordField:
63+
case CompileTimeErrorCode.nonConstantSetElement:
64+
hasConstError = true;
6865
}
6966
}
7067
}

0 commit comments

Comments
 (0)