Rename CFE DiagnosticMessage class.

The analyzer already has a class with the same name, but a slightly
different purpose. (The analyzer's class represents a single message
associated with a source location, whereas the CFE's class represents
a message along with related context messages).

I'm currently embarking on an arc of work that I hope will eventually
culminate in unifying the analyzer and CFE diagnostic message
representations 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 `DiagnosticMessage` class is exposed through the
analyzer public API, analyzer clients may depend on the name. So it
makes sense to rename the CFE's `DiagnosticMessage` class.

Tested: standard trybots
Change-Id: I6b6948fe9da18c7b6688333fa12ffeea8e81436f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/441831
Reviewed-by: Alexander Markov <[email protected]>
Reviewed-by: Ömer Ağacan <[email protected]>
Reviewed-by: Nicholas Shahan <[email protected]>
Commit-Queue: Paul Berry <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>

Author: stereotype441

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

@@ -6,7 +6,7 @@ library _fe_analyzer_shared.messages.codes;
 
 import 'dart:convert' show JsonEncoder, json;
 
-import 'diagnostic_message.dart' show DiagnosticMessage;
+import 'diagnostic_message.dart' show CfeDiagnosticMessage;
 
 import '../scanner/token.dart' show Token;
 
@@ -215,7 +215,7 @@ class PlainAndColorizedString {
   const PlainAndColorizedString.plainOnly(this.plain) : this.colorized = plain;
 }
 
-class FormattedMessage implements DiagnosticMessage {
+class FormattedMessage implements CfeDiagnosticMessage {
   final LocatedMessage locatedMessage;
 
   final String formattedPlain;
@@ -300,7 +300,7 @@ class FormattedMessage implements DiagnosticMessage {
   }
 }
 
-class DiagnosticMessageFromJson implements DiagnosticMessage {
+class DiagnosticMessageFromJson implements CfeDiagnosticMessage {
   @override
   final Iterable<String> ansiFormatted;
 

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

@@ -17,7 +17,7 @@ import 'severity.dart' show Severity;
 ///        message.plainTextFormatted.forEach(stderr.writeln);
 ///      }
 ///    }
-typedef DiagnosticMessageHandler = void Function(DiagnosticMessage);
+typedef DiagnosticMessageHandler = void Function(CfeDiagnosticMessage);
 
 /// Represents a diagnostic message that can be reported from a tool, for
 /// example, a compiler.
@@ -26,8 +26,8 @@ typedef DiagnosticMessageHandler = void Function(DiagnosticMessage);
 /// reporting any kind of message, including non-diagnostic messages such as
 /// licensing, informal, or logging information. This allows a well-behaved
 /// tool to never directly write to stdout or stderr.
-abstract class DiagnosticMessage {
-  DiagnosticMessage._(); // Prevent subclassing.
+abstract class CfeDiagnosticMessage {
+  CfeDiagnosticMessage._(); // Prevent subclassing.
 
   Iterable<String> get ansiFormatted;
 
@@ -41,7 +41,7 @@ abstract class DiagnosticMessage {
 }
 
 /// This method is subject to change.
-Uri? getMessageUri(DiagnosticMessage message) {
+Uri? getMessageUri(CfeDiagnosticMessage message) {
   return message is FormattedMessage
       ? message.uri
       : message is DiagnosticMessageFromJson
@@ -50,38 +50,38 @@ Uri? getMessageUri(DiagnosticMessage message) {
 }
 
 /// This method is subject to change.
-int? getMessageCharOffset(DiagnosticMessage message) {
+int? getMessageCharOffset(CfeDiagnosticMessage message) {
   return message is FormattedMessage ? message.charOffset : null;
 }
 
 /// This method is subject to change.
-int? getMessageLength(DiagnosticMessage message) {
+int? getMessageLength(CfeDiagnosticMessage message) {
   return message is FormattedMessage ? message.length : null;
 }
 
 /// This method is subject to change.
-Code? getMessageCodeObject(DiagnosticMessage message) {
+Code? getMessageCodeObject(CfeDiagnosticMessage message) {
   return message is FormattedMessage ? message.code : null;
 }
 
 /// This method is subject to change.
-String? getMessageHeaderText(DiagnosticMessage message) {
+String? getMessageHeaderText(CfeDiagnosticMessage message) {
   return message is FormattedMessage ? message.problemMessage : null;
 }
 
 /// This method is subject to change.
-int getMessageCode(DiagnosticMessage message) {
+int getMessageCode(CfeDiagnosticMessage message) {
   return message is FormattedMessage ? message.code.index : -1;
 }
 
 /// This method is subject to change.
-Map<String, dynamic>? getMessageArguments(DiagnosticMessage message) {
+Map<String, dynamic>? getMessageArguments(CfeDiagnosticMessage message) {
   return message is FormattedMessage ? message.arguments : null;
 }
 
 /// This method is subject to change.
-Iterable<DiagnosticMessage>? getMessageRelatedInformation(
-  DiagnosticMessage message,
+Iterable<CfeDiagnosticMessage>? getMessageRelatedInformation(
+  CfeDiagnosticMessage message,
 ) {
   return message is FormattedMessage ? message.relatedInformation : null;
 }

pkg/compiler/lib/src/kernel/front_end_adapter.dart

@@ -93,9 +93,9 @@ class _CompilerFileSystemEntity implements fe.FileSystemEntity {
 /// [DiagnosticReporter].
 void reportFrontEndMessage(
   DiagnosticReporter reporter,
-  fe.DiagnosticMessage message,
+  fe.CfeDiagnosticMessage message,
 ) {
-  Spannable getSpannable(fe.DiagnosticMessage message) {
+  Spannable getSpannable(fe.CfeDiagnosticMessage message) {
     Uri? uri = fe.getMessageUri(message);
     int offset = fe.getMessageCharOffset(message)!;
     int length = fe.getMessageLength(message)!;
@@ -106,15 +106,15 @@ void reportFrontEndMessage(
     }
   }
 
-  DiagnosticMessage convertMessage(fe.DiagnosticMessage message) {
+  DiagnosticMessage convertMessage(fe.CfeDiagnosticMessage message) {
     Spannable span = getSpannable(message);
     String? text = fe.getMessageHeaderText(message);
     return reporter.createMessage(span, MessageKind.generic, {
       'text': text ?? '',
     });
   }
 
-  Iterable<fe.DiagnosticMessage>? relatedInformation = fe
+  Iterable<fe.CfeDiagnosticMessage>? relatedInformation = fe
       .getMessageRelatedInformation(message);
   DiagnosticMessage mainMessage = convertMessage(message);
   List<DiagnosticMessage> infos = relatedInformation != null

pkg/compiler/lib/src/phase/load_kernel.dart

@@ -275,7 +275,7 @@ Future<_LoadFromSourceResult> _loadFromSource(
   );
   fe.FileSystem fileSystem = CompilerFileSystem(compilerInput);
   fe.Verbosity verbosity = options.verbosity;
-  void onDiagnostic(fe.DiagnosticMessage message) {
+  void onDiagnostic(fe.CfeDiagnosticMessage message) {
     if (fe.Verbosity.shouldPrint(verbosity, message)) {
       reportFrontEndMessage(reporter, message);
     }

pkg/compiler/test/end_to_end/no_platform_test.dart

@@ -28,7 +28,7 @@ main() {
       initializedCompilerState,
       false,
       fe.StandardFileSystem.instance,
-      (fe.DiagnosticMessage message) {
+      (fe.CfeDiagnosticMessage message) {
         message.plainTextFormatted.forEach(print);
         Expect.notEquals(fe.Severity.error, message.severity);
       },

pkg/dart2bytecode/lib/dart2bytecode.dart

@@ -10,7 +10,7 @@ import 'package:front_end/src/api_unstable/vm.dart'
     show
         CompilerOptions,
         InvocationMode,
-        DiagnosticMessage,
+        CfeDiagnosticMessage,
         Verbosity,
         parseExperimentalArguments,
         parseExperimentalFlags,
@@ -219,7 +219,7 @@ Future<int> runCompilerWithOptions({
     ..explicitExperimentalFlags = parseExperimentalFlags(
         parseExperimentalArguments(experimentalFlags),
         onError: printMessage)
-    ..onDiagnostic = (DiagnosticMessage m) {
+    ..onDiagnostic = (CfeDiagnosticMessage m) {
       errorDetector(m);
     }
     ..embedSourceText = false

pkg/dart2bytecode/test/bytecode_generator_test.dart

@@ -15,7 +15,7 @@ import 'package:front_end/src/api_unstable/vm.dart'
     show
         CompilerOptions,
         computePlatformBinariesLocation,
-        DiagnosticMessage,
+        CfeDiagnosticMessage,
         kernelForProgram;
 import 'package:kernel/ast.dart';
 import 'package:kernel/core_types.dart';
@@ -65,7 +65,7 @@ Future<Component> compileTestCaseToKernelProgram(Uri sourceUri,
     ..target = target
     ..additionalDills = <Uri>[platformKernel]
     ..environmentDefines = {}
-    ..onDiagnostic = (DiagnosticMessage message) {
+    ..onDiagnostic = (CfeDiagnosticMessage message) {
       fail("Compilation error: ${message.plainTextFormatted.join('\n')}");
     };
 

pkg/dart2wasm/lib/compile.dart

@@ -12,7 +12,7 @@ import 'package:front_end/src/api_unstable/vm.dart'
     show
         CompilerOptions,
         CompilerResult,
-        DiagnosticMessage,
+        CfeDiagnosticMessage,
         kernelForProgram,
         Severity;
 import 'package:kernel/ast.dart';
@@ -128,10 +128,10 @@ Future<CompilationResult> compileToModule(
     compiler.WasmCompilerOptions options,
     FileSystem fileSystem,
     Uri Function(String moduleName)? sourceMapUrlGenerator,
-    void Function(DiagnosticMessage) handleDiagnosticMessage,
+    void Function(CfeDiagnosticMessage) handleDiagnosticMessage,
     {void Function(String, String)? writeFile}) async {
   var hadCompileTimeError = false;
-  void diagnosticMessageHandler(DiagnosticMessage message) {
+  void diagnosticMessageHandler(CfeDiagnosticMessage message) {
     if (message.severity == Severity.error) {
       hadCompileTimeError = true;
     }

pkg/dev_compiler/lib/src/command/command.dart

@@ -255,7 +255,7 @@ Future<CompilerResult> _compile(
       argResults['packages'] as String? ?? _findPackagesFilePath();
 
   var succeeded = true;
-  void diagnosticMessageHandler(fe.DiagnosticMessage message) {
+  void diagnosticMessageHandler(fe.CfeDiagnosticMessage message) {
     if (message.severity == fe.Severity.error) {
       succeeded = false;
     }

pkg/dev_compiler/lib/src/kernel/expression_compiler.dart

@@ -7,7 +7,7 @@ import 'dart:async';
 import 'package:_fe_analyzer_shared/src/messages/codes.dart'
     show Code, Message, PlainAndColorizedString;
 import 'package:_fe_analyzer_shared/src/messages/diagnostic_message.dart'
-    show DiagnosticMessage, DiagnosticMessageHandler;
+    show CfeDiagnosticMessage, DiagnosticMessageHandler;
 import 'package:front_end/src/api_unstable/ddc.dart';
 import 'package:kernel/ast.dart' show Component, Library;
 import 'package:kernel/dart_scope_calculator.dart';
@@ -17,7 +17,12 @@ import '../compiler/module_builder.dart';
 import '../js_ast/js_ast.dart' as js_ast;
 import 'compiler.dart' show Compiler;
 
-DiagnosticMessage _createInternalError(Uri uri, int line, int col, String msg) {
+CfeDiagnosticMessage _createInternalError(
+  Uri uri,
+  int line,
+  int col,
+  String msg,
+) {
   return Message(
         Code('Expression Compiler Internal error'),
         problemMessage: msg,