Skip to content

Commit fb809c2

Browse files
stereotype441Commit Queue
authored andcommitted
[analyzer/linter] Clean up after renaming error codes to camelCase.
Now that the analyzer and linter error codes have been renamed to camelCase (see https://dart-review.googlesource.com/c/sdk/+/444921), the script `rename_error_constants.dart` is no longer needed. Also, the temporary logic in `messages/generate.dart` and `generate_lints.dart` that allowed for generating either camelCase or SCREAMING_CAPS error codes can now be hardcoded to always generate camelCase error codes. Change-Id: I6a6a6964ec8eef09cac643c959a967ab405f3343 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/445122 Commit-Queue: Paul Berry <[email protected]> Reviewed-by: Samuel Rawlins <[email protected]> Reviewed-by: Konstantin Shcheglov <[email protected]>
1 parent bfcd5af commit fb809c2

File tree

4 files changed

+7
-190
lines changed

4 files changed

+7
-190
lines changed

pkg/analyzer/pubspec.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ dependencies:
3131
# See also https://dart.dev/tools/pub/dependencies.
3232
dev_dependencies:
3333
analysis_server_client: any
34-
analyzer_plugin: any
3534
analyzer_testing: any
3635
analyzer_utilities: any
3736
args: any

pkg/analyzer/tool/messages/generate.dart

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@ Future<void> main() async {
3535
..printSummary();
3636
}
3737

38-
/// Whether the error constants that should be generated should use camel-case
39-
/// names.
40-
///
41-
/// This is a temporary flag to allow the codebase to be transitioned to using
42-
/// camel-case error constants. TODO(paulberry): once the transition is
43-
/// complete, remove this constant.
44-
const _useLowerCamelCaseNames = true;
45-
4638
/// A list of all targets generated by this code generator.
4739
final List<GeneratedContent> allTargets = _analyzerGeneratedFiles();
4840

@@ -164,8 +156,7 @@ library;
164156
out.writeln('${errorCodeInfo.aliasFor};');
165157
} else {
166158
generatedCodes.add((errorClass.name, errorName));
167-
var constantName =
168-
_useLowerCamelCaseNames ? errorName.toCamelCase() : errorName;
159+
var constantName = errorName.toCamelCase();
169160
out.writeln(' static const ${errorClass.name} $constantName =');
170161
out.writeln(
171162
errorCodeInfo.toAnalyzerCode(
@@ -175,8 +166,7 @@ library;
175166
),
176167
);
177168

178-
if (_useLowerCamelCaseNames &&
179-
errorClass.deprecatedSnakeCaseNames.contains(errorName)) {
169+
if (errorClass.deprecatedSnakeCaseNames.contains(errorName)) {
180170
out.writeln();
181171
out.writeln(' @Deprecated("Please use $constantName")');
182172
out.writeln(
@@ -224,10 +214,8 @@ library;
224214
void _generateFastaAnalyzerErrorCodeList() {
225215
out.writeln('final fastaAnalyzerErrorCodes = <DiagnosticCode?>[');
226216
for (var entry in cfeToAnalyzerErrorCodeTables.indexToInfo) {
227-
var name = cfeToAnalyzerErrorCodeTables.infoToAnalyzerCode[entry];
228-
if (_useLowerCamelCaseNames) {
229-
name = name?.toCamelCase();
230-
}
217+
var name =
218+
cfeToAnalyzerErrorCodeTables.infoToAnalyzerCode[entry]?.toCamelCase();
231219
out.writeln('${name == null ? 'null' : 'ParserErrorCode.$name'},');
232220
}
233221
out.writeln('];');
@@ -285,9 +273,7 @@ import 'package:analyzer/src/pubspec/pubspec_warning_code.dart';
285273
);
286274
out.writeln('const List<DiagnosticCode> diagnosticCodeValues = [');
287275
for (var (className, errorName) in generatedCodes) {
288-
if (_useLowerCamelCaseNames) {
289-
errorName = errorName.toCamelCase();
290-
}
276+
errorName = errorName.toCamelCase();
291277
out.writeln(' $className.$errorName,');
292278
}
293279
out.writeln('];');

pkg/analyzer/tool/messages/rename_error_constants.dart

Lines changed: 0 additions & 158 deletions
This file was deleted.

pkg/linter/tool/generate_lints.dart

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@ const linterLintCodeInfo = ErrorClassInfo(
3535
type: 'LINT',
3636
);
3737

38-
/// Whether the error constants that should be generated should use camel-case
39-
/// names.
40-
///
41-
/// This is a temporary flag to allow the codebase to be transitioned to using
42-
/// camel-case error constants. TODO(paulberry): once the transition is
43-
/// complete, remove this constant.
44-
const _useLowerCamelCaseNames = true;
45-
4638
GeneratedFile get generatedCodesFile =>
4739
GeneratedFile(generatedCodesPath, (pkgRoot) async {
4840
var out = StringBuffer('''
@@ -78,8 +70,7 @@ class LinterLintCode extends LintCode {
7870
if (codeInfo.deprecatedMessage case var deprecatedMessage?) {
7971
out.writeln(' @Deprecated("$deprecatedMessage")');
8072
}
81-
var constantName =
82-
_useLowerCamelCaseNames ? errorName.toCamelCase() : errorName;
73+
var constantName = errorName.toCamelCase();
8374
out.writeln(' static const LintCode $constantName =');
8475
out.writeln(
8576
codeInfo.toAnalyzerCode(
@@ -92,8 +83,7 @@ class LinterLintCode extends LintCode {
9283
out.writeln();
9384
}
9485

95-
var removedLintName =
96-
_useLowerCamelCaseNames ? 'removedLint' : 'removed_lint';
86+
var removedLintName = 'removedLint';
9787
out.writeln('''
9888
/// A lint code that removed lints can specify as their `lintCode`.
9989
///

0 commit comments

Comments
 (0)