Skip to content

Commit 45b31b5

Browse files
stereotype441Commit Queue
authored andcommitted
[messages] Move non-shared errors out of pkg/_fe_analyzer_shared.
Changes `pkg/front_end/tool/generate_messages_lib.dart` so that only shared and "pseudoShared" messages are generated to `pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart`. The remaining front end messages are generated to `pkg/front_end/lib/src/codes/cfe_codes_generated.dart`. Previously, a heuristic was used to try to guess which messages *might* be sharable, which resulted in a lot of messages being put in `pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart` that were not actually shared. This change paves the way for sharing more messages between the analyzer and CFE, by making it clear which messages are shared and which ones aren't. A few import statements had to be adjusted as part of this change, to account for the fact that a lot of generated code was moved. Change-Id: I6a6a69641fdc79dcf92f25c980c5a0de9196be4c Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449608 Reviewed-by: Ömer Ağacan <[email protected]> Reviewed-by: Johnni Winther <[email protected]> Reviewed-by: Stephen Adams <[email protected]> Commit-Queue: Paul Berry <[email protected]>
1 parent 7452b7e commit 45b31b5

File tree

9 files changed

+17493
-17495
lines changed

9 files changed

+17493
-17495
lines changed

pkg/_fe_analyzer_shared/lib/src/messages/codes.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import 'severity.dart' show CfeSeverity;
1515
import '../util/relativize.dart' as util show isWindows, relativizeUri;
1616

1717
import 'conversions.dart' as conversions;
18-
import 'codes.dart' as conversions show relativizeUri;
1918

2019
part 'codes_generated.dart';
2120

pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart

Lines changed: 1825 additions & 14649 deletions
Large diffs are not rendered by default.

pkg/_js_interop_checks/lib/src/transformations/export_checker.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
// ignore_for_file: implementation_imports
66

7-
import 'package:_fe_analyzer_shared/src/messages/codes.dart'
7+
import 'package:_js_interop_checks/js_interop_checks.dart'
8+
show JsInteropDiagnosticReporter;
9+
import 'package:_js_interop_checks/src/js_interop.dart' as js_interop;
10+
import 'package:front_end/src/codes/cfe_codes.dart'
811
show
912
codeJsInteropExportDartInterfaceHasNonEmptyJSExportValue,
1013
codeJsInteropExportDisallowedMember,
1114
codeJsInteropExportMemberCollision,
1215
codeJsInteropExportNoExportableMembers;
13-
import 'package:_js_interop_checks/js_interop_checks.dart'
14-
show JsInteropDiagnosticReporter;
15-
import 'package:_js_interop_checks/src/js_interop.dart' as js_interop;
1616
import 'package:kernel/ast.dart';
1717

1818
enum ExportStatus { exportError, exportable, nonExportable }

pkg/dart2wasm/lib/target.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
import 'package:_fe_analyzer_shared/src/messages/codes.dart'
6-
show Message, LocatedMessage, codeWasmImportOrExportInUserCode;
6+
show Message, LocatedMessage;
77
import 'package:_js_interop_checks/js_interop_checks.dart';
88
import 'package:_js_interop_checks/src/js_interop.dart' as jsInteropHelper;
99
import 'package:_js_interop_checks/src/transformations/shared_interop_transformer.dart';
1010
import 'package:front_end/src/api_prototype/const_conditional_simplifier.dart'
1111
show ConstConditionalSimplifier;
1212
import 'package:front_end/src/api_prototype/constant_evaluator.dart'
1313
as constantEvaluator show ConstantEvaluator;
14+
import 'package:front_end/src/codes/cfe_codes.dart'
15+
show codeWasmImportOrExportInUserCode;
1416
import 'package:kernel/ast.dart';
1517
import 'package:kernel/class_hierarchy.dart';
1618
import 'package:kernel/clone.dart';

pkg/front_end/lib/src/api_prototype/kernel_generator.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ library front_end.kernel_generator;
77

88
import 'dart:typed_data';
99

10-
import 'package:_fe_analyzer_shared/src/messages/codes.dart'
11-
show codeMissingMain, noLength;
10+
import 'package:_fe_analyzer_shared/src/messages/codes.dart' show noLength;
1211
import 'package:_fe_analyzer_shared/src/messages/severity.dart'
1312
show CfeSeverity;
13+
import 'package:front_end/src/codes/cfe_codes.dart' show codeMissingMain;
1414
import 'package:kernel/ast.dart' show Component;
1515
import 'package:kernel/class_hierarchy.dart' show ClassHierarchy;
1616
import 'package:kernel/core_types.dart' show CoreTypes;

pkg/front_end/lib/src/api_unstable/dart2js.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
import 'package:_fe_analyzer_shared/src/messages/codes.dart'
6-
show codeMissingMain;
75
import 'package:_fe_analyzer_shared/src/messages/diagnostic_message.dart'
86
show DiagnosticMessageHandler;
97
import 'package:_fe_analyzer_shared/src/messages/severity.dart'
108
show CfeSeverity;
9+
import 'package:front_end/src/codes/cfe_codes.dart' show codeMissingMain;
1110
import 'package:kernel/kernel.dart' show Component;
1211
import 'package:kernel/target/targets.dart' show Target;
1312

pkg/front_end/lib/src/codes/cfe_codes.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@
44

55
import 'package:_fe_analyzer_shared/src/messages/codes.dart';
66
import 'package:_fe_analyzer_shared/src/messages/severity.dart';
7+
import 'package:_fe_analyzer_shared/src/scanner/token.dart' show Token;
78
import 'package:kernel/ast.dart' show Constant, DartType;
89

910
import 'package:_fe_analyzer_shared/src/messages/conversions.dart'
1011
as conversions;
12+
import 'package:_fe_analyzer_shared/src/messages/codes.dart'
13+
as conversions
14+
show relativizeUri;
1115
import 'type_labeler.dart';
1216

1317
export 'package:_fe_analyzer_shared/src/messages/codes.dart';

0 commit comments

Comments
 (0)