Skip to content

Commit e86ce41

Browse files
bwilkersoncommit-bot@chromium.org
bwilkerson
authored and
[email protected]
committed
Rename a hint code to be consistent with similar codes
Change-Id: I916c97c2e3ef34f2cf8d613b2b192dcde96c87e7 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112740 Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Brian Wilkerson <[email protected]>
1 parent 81569e5 commit e86ce41

File tree

6 files changed

+20
-16
lines changed

6 files changed

+20
-16
lines changed

‎pkg/analysis_server/lib/src/services/correction/fix_internal.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ class FixProcessor {
342342
await _addFix_updateSdkConstraints('2.2.0');
343343
}
344344
if (errorCode == HintCode.SDK_VERSION_AS_EXPRESSION_IN_CONST_CONTEXT ||
345-
errorCode == HintCode.SDK_VERSION_BOOL_OPERATOR ||
345+
errorCode == HintCode.SDK_VERSION_BOOL_OPERATOR_IN_CONST_CONTEXT ||
346346
errorCode == HintCode.SDK_VERSION_EQ_EQ_OPERATOR_IN_CONST_CONTEXT ||
347347
errorCode == HintCode.SDK_VERSION_GT_GT_GT_OPERATOR ||
348348
errorCode == HintCode.SDK_VERSION_IS_EXPRESSION_IN_CONST_CONTEXT ||

‎pkg/analyzer/lib/error/error.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ const List<ErrorCode> errorCodeValues = const [
366366
HintCode.PACKAGE_IMPORT_CONTAINS_DOT_DOT,
367367
HintCode.SDK_VERSION_ASYNC_EXPORTED_FROM_CORE,
368368
HintCode.SDK_VERSION_AS_EXPRESSION_IN_CONST_CONTEXT,
369-
HintCode.SDK_VERSION_BOOL_OPERATOR,
369+
HintCode.SDK_VERSION_BOOL_OPERATOR_IN_CONST_CONTEXT,
370370
HintCode.SDK_VERSION_EQ_EQ_OPERATOR_IN_CONST_CONTEXT,
371371
HintCode.SDK_VERSION_GT_GT_GT_OPERATOR,
372372
HintCode.SDK_VERSION_IS_EXPRESSION_IN_CONST_CONTEXT,

‎pkg/analyzer/lib/src/dart/error/hint_codes.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -649,11 +649,11 @@ class HintCode extends ErrorCode {
649649
* The operator '&', '|' or '^' is being used on boolean values in code that
650650
* is expected to run on versions of the SDK that did not support it.
651651
*/
652-
static const HintCode SDK_VERSION_BOOL_OPERATOR = const HintCode(
653-
'SDK_VERSION_BOOL_OPERATOR',
654-
"Using the operator '{0}' for 'bool's wasn't supported until version "
655-
"2.3.2, but this code is required to be able to run on earlier "
656-
"versions.",
652+
static const HintCode SDK_VERSION_BOOL_OPERATOR_IN_CONST_CONTEXT = const HintCode(
653+
'SDK_VERSION_BOOL_OPERATOR_IN_CONST_CONTEXT',
654+
"Using the operator '{0}' for 'bool's in a constant expression wasn't "
655+
"supported until version 2.3.2, but this code is required to be able "
656+
"to run on earlier versions.",
657657
correction: "Try updating the SDK constraints.");
658658

659659
/**

‎pkg/analyzer/lib/src/hint/sdk_constraint_verifier.dart‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,10 @@ class SdkConstraintVerifier extends RecursiveAstVisitor<void> {
122122
operatorType == TokenType.CARET) &&
123123
(node as BinaryExpressionImpl).inConstantContext) {
124124
if (node.leftOperand.staticType.isDartCoreBool) {
125-
_errorReporter.reportErrorForToken(HintCode.SDK_VERSION_BOOL_OPERATOR,
126-
node.operator, [node.operator.lexeme]);
125+
_errorReporter.reportErrorForToken(
126+
HintCode.SDK_VERSION_BOOL_OPERATOR_IN_CONST_CONTEXT,
127+
node.operator,
128+
[node.operator.lexeme]);
127129
}
128130
} else if (operatorType == TokenType.EQ_EQ &&
129131
(node as BinaryExpressionImpl).inConstantContext) {

pkg/analyzer/test/src/diagnostics/sdk_version_bool_operator_test.dart renamed to pkg/analyzer/test/src/diagnostics/sdk_version_bool_operator_in_const_context_test.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ import 'sdk_constraint_verifier_support.dart';
1111

1212
main() {
1313
defineReflectiveSuite(() {
14-
defineReflectiveTests(SdkVersionBoolOperatorTest);
14+
defineReflectiveTests(SdkVersionBoolOperatorInConstContextTest);
1515
});
1616
}
1717

1818
@reflectiveTest
19-
class SdkVersionBoolOperatorTest extends SdkConstraintVerifierTest {
19+
class SdkVersionBoolOperatorInConstContextTest
20+
extends SdkConstraintVerifierTest {
2021
@override
2122
AnalysisOptionsImpl get analysisOptions => AnalysisOptionsImpl()
2223
..enabledExperiments = [EnableString.constant_update_2018];
@@ -31,7 +32,7 @@ const c = true & false;
3132
verifyVersion('2.2.0', '''
3233
const c = true & false;
3334
''', expectedErrors: [
34-
error(HintCode.SDK_VERSION_BOOL_OPERATOR, 15, 1),
35+
error(HintCode.SDK_VERSION_BOOL_OPERATOR_IN_CONST_CONTEXT, 15, 1),
3536
]);
3637
}
3738

@@ -57,7 +58,7 @@ const c = true | false;
5758
verifyVersion('2.2.0', '''
5859
const c = true | false;
5960
''', expectedErrors: [
60-
error(HintCode.SDK_VERSION_BOOL_OPERATOR, 15, 1),
61+
error(HintCode.SDK_VERSION_BOOL_OPERATOR_IN_CONST_CONTEXT, 15, 1),
6162
]);
6263
}
6364

@@ -83,7 +84,7 @@ const c = true ^ false;
8384
verifyVersion('2.2.0', '''
8485
const c = true ^ false;
8586
''', expectedErrors: [
86-
error(HintCode.SDK_VERSION_BOOL_OPERATOR, 15, 1),
87+
error(HintCode.SDK_VERSION_BOOL_OPERATOR_IN_CONST_CONTEXT, 15, 1),
8788
]);
8889
}
8990

‎pkg/analyzer/test/src/diagnostics/test_all.dart‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,8 @@ import 'sdk_version_as_expression_in_const_context_test.dart'
227227
as sdk_version_as_expression_in_const_context;
228228
import 'sdk_version_async_exported_from_core_test.dart'
229229
as sdk_version_async_exported_from_core;
230-
import 'sdk_version_bool_operator_test.dart' as sdk_version_bool_operator;
230+
import 'sdk_version_bool_operator_in_const_context_test.dart'
231+
as sdk_version_bool_operator_in_const_context;
231232
import 'sdk_version_eq_eq_operator_test.dart' as sdk_version_eq_eq_operator;
232233
import 'sdk_version_gt_gt_gt_operator_test.dart'
233234
as sdk_version_gt_gt_gt_operator;
@@ -445,7 +446,7 @@ main() {
445446
set_element_from_deferred_library.main();
446447
sdk_version_as_expression_in_const_context.main();
447448
sdk_version_async_exported_from_core.main();
448-
sdk_version_bool_operator.main();
449+
sdk_version_bool_operator_in_const_context.main();
449450
sdk_version_eq_eq_operator.main();
450451
sdk_version_gt_gt_gt_operator.main();
451452
sdk_version_is_expression_in_const_context.main();

0 commit comments

Comments
 (0)