Skip to content

Commit a0f467f

Browse files
stereotype441Commit Queue
authored andcommitted
Rename CFE Severity enum.
The analyzer already has an enum with the same name, but a slightly different declaration. (The analyzer's enum declares only severities of `error`, `warning`, and `info`, whereas the CFE's enum also declares severities of `context`, `ignored`, and `internalProblem`). I'm currently embarking on an arc of work that I hope will eventually culminate in unifying the analyzer and CFE diagnostic message representations (and their severities) into a single set of classes. Until that unification is complete, both representations will have to co-exist in the `_fe_analyzer_shared` package. To reduce confusion during that time period, I would like the classes to have distinct names. Since the analyzer's `Severity` enum is exposed through the analyzer public API, analyzer clients may depend on the name. So it makes sense to rename the CFE's `Severity` enum. Tested: standard trybots Change-Id: I95622950f49b1754267e441e4636e046045629bb Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/442102 Reviewed-by: Liam Appelbe <[email protected]> Reviewed-by: Mayank Patke <[email protected]> Commit-Queue: Paul Berry <[email protected]> Reviewed-by: Ömer Ağacan <[email protected]> Reviewed-by: Johnni Winther <[email protected]>
1 parent bbdc543 commit a0f467f

File tree

79 files changed

+436
-393
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+436
-393
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import 'diagnostic_message.dart' show CfeDiagnosticMessage;
1010

1111
import '../scanner/token.dart' show Token;
1212

13-
import 'severity.dart' show Severity;
13+
import 'severity.dart' show CfeSeverity;
1414

1515
import '../util/relativize.dart' as util show isWindows, relativizeUri;
1616

@@ -28,13 +28,13 @@ class Code {
2828

2929
final List<String>? analyzerCodes;
3030

31-
final Severity severity;
31+
final CfeSeverity severity;
3232

3333
const Code(
3434
this.name, {
3535
this.index = -1,
3636
this.analyzerCodes,
37-
this.severity = Severity.error,
37+
this.severity = CfeSeverity.error,
3838
});
3939

4040
@override
@@ -161,7 +161,7 @@ class LocatedMessage implements Comparable<LocatedMessage> {
161161
PlainAndColorizedString formatted,
162162
int line,
163163
int column,
164-
Severity severity,
164+
CfeSeverity severity,
165165
List<FormattedMessage>? relatedInformation, {
166166
List<Uri>? involvedFiles,
167167
}) {
@@ -227,7 +227,7 @@ class FormattedMessage implements CfeDiagnosticMessage {
227227
final int column;
228228

229229
@override
230-
final Severity severity;
230+
final CfeSeverity severity;
231231

232232
final List<FormattedMessage>? relatedInformation;
233233

@@ -308,7 +308,7 @@ class DiagnosticMessageFromJson implements CfeDiagnosticMessage {
308308
final Iterable<String> plainTextFormatted;
309309

310310
@override
311-
final Severity severity;
311+
final CfeSeverity severity;
312312

313313
final Uri? uri;
314314

@@ -335,7 +335,7 @@ class DiagnosticMessageFromJson implements CfeDiagnosticMessage {
335335
List<String> plainTextFormatted = _asListOfString(
336336
decoded["plainTextFormatted"],
337337
);
338-
Severity severity = Severity.values[decoded["severity"] as int];
338+
CfeSeverity severity = CfeSeverity.values[decoded["severity"] as int];
339339
Uri? uri =
340340
decoded["uri"] == null ? null : Uri.parse(decoded["uri"] as String);
341341
List<Uri>? involvedFiles =

0 commit comments

Comments
 (0)