Version 3.4.0-101.0.dev

Merge 2a88162 into dev
dart-lang · Feb 2, 2024 · 03c804f · 03c804f
2 parents cc1fc8e + 2a88162
commit 03c804f
Show file tree

Hide file tree

Showing 77 changed files with 2,115 additions and 2,308 deletions.
diff --git a/pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml b/pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml
@@ -618,10 +618,6 @@ CompileTimeErrorCode.EXPORT_INTERNAL_LIBRARY:
   status: needsFix
   notes: |-
     Remove the export.
-CompileTimeErrorCode.EXPORT_LEGACY_SYMBOL:
-  status: noFix
-  notes: |-
-    Removed as of Dart 3.0.
 CompileTimeErrorCode.EXPORT_OF_NON_LIBRARY:
   status: needsFix
   notes: |-
@@ -1842,9 +1838,6 @@ HintCode.DIVISION_OPTIMIZATION:
   status: hasFix
 HintCode.IMPORT_DEFERRED_LIBRARY_WITH_LOAD_FUNCTION:
   status: noFix
-HintCode.IMPORT_OF_LEGACY_LIBRARY_INTO_NULL_SAFE:
-  status: noFix
-  notes: Deprecated
 HintCode.MACRO_INFO:
   status: noFix
 HintCode.UNNECESSARY_CAST:

diff --git a/pkg/analyzer/lib/error/listener.dart b/pkg/analyzer/lib/error/listener.dart
@@ -159,21 +159,31 @@ class ErrorReporter {
       reportErrorForOffset(
           code, offset, constructor.name!.end - offset, arguments);
     } else {
-      reportErrorForNode(code, constructor.returnType, arguments);
+      atNode(
+        constructor.returnType,
+        code,
+        arguments: arguments,
+      );
     }
   }
 
   /// Report an error with the given [errorCode] and [arguments].
   /// The [node] is used to compute the location of the error.
+  @Deprecated('Use atNode() instead')
   void reportErrorForNode(
     ErrorCode errorCode,
     AstNode node, [
     List<Object>? arguments,
     List<DiagnosticMessage>? messages,
     Object? data,
   ]) {
-    reportErrorForOffset(
-        errorCode, node.offset, node.length, arguments, messages, data);
+    atNode(
+      node,
+      errorCode,
+      arguments: arguments,
+      messages: messages,
+      data: data,
+    );
   }
 
   /// Report an error with the given [errorCode] and [arguments]. The location
@@ -230,7 +240,7 @@ class ErrorReporter {
   /// used in order to clarify the message.
   ///
   /// If there are not two or more types in the argument list, the method
-  /// [reportErrorForNode] should be used instead.
+  /// [atNode] should be used instead.
   @Deprecated('Use reportErrorForNode(), it will convert types as well')
   void reportTypeErrorForNode(
       ErrorCode errorCode, AstNode node, List<Object> arguments) {

diff --git a/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart b/pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart
@@ -231,9 +231,9 @@ class LibraryAnalyzer {
               shouldReport = true;
             }
             if (shouldReport) {
-              _getErrorReporter(_library.file).reportErrorForNode(
-                CompileTimeErrorCode.INCONSISTENT_LANGUAGE_VERSION_OVERRIDE,
+              _getErrorReporter(_library.file).atNode(
                 directive.uri,
+                CompileTimeErrorCode.INCONSISTENT_LANGUAGE_VERSION_OVERRIDE,
               );
             }
           }
@@ -599,42 +599,42 @@ class LibraryAnalyzer {
     if (state is LibraryImportWithUri) {
       final selectedUriStr = state.selectedUri.relativeUriStr;
       if (selectedUriStr.startsWith('dart-ext:')) {
-        errorReporter.reportErrorForNode(
-          CompileTimeErrorCode.USE_OF_NATIVE_EXTENSION,
+        errorReporter.atNode(
           directive.uri,
+          CompileTimeErrorCode.USE_OF_NATIVE_EXTENSION,
         );
       } else if (state.importedSource == null) {
-        errorReporter.reportErrorForNode(
-          CompileTimeErrorCode.URI_DOES_NOT_EXIST,
+        errorReporter.atNode(
           directive.uri,
-          [selectedUriStr],
+          CompileTimeErrorCode.URI_DOES_NOT_EXIST,
+          arguments: [selectedUriStr],
         );
       } else if (state is LibraryImportWithFile && !state.importedFile.exists) {
         final errorCode = isGeneratedSource(state.importedSource)
             ? CompileTimeErrorCode.URI_HAS_NOT_BEEN_GENERATED
             : CompileTimeErrorCode.URI_DOES_NOT_EXIST;
-        errorReporter.reportErrorForNode(
-          errorCode,
+        errorReporter.atNode(
           directive.uri,
-          [selectedUriStr],
+          errorCode,
+          arguments: [selectedUriStr],
         );
       } else if (state.importedLibrarySource == null) {
-        errorReporter.reportErrorForNode(
-          CompileTimeErrorCode.IMPORT_OF_NON_LIBRARY,
+        errorReporter.atNode(
           directive.uri,
-          [selectedUriStr],
+          CompileTimeErrorCode.IMPORT_OF_NON_LIBRARY,
+          arguments: [selectedUriStr],
         );
       }
     } else if (state is LibraryImportWithUriStr) {
-      errorReporter.reportErrorForNode(
-        CompileTimeErrorCode.INVALID_URI,
+      errorReporter.atNode(
         directive.uri,
-        [state.selectedUri.relativeUriStr],
+        CompileTimeErrorCode.INVALID_URI,
+        arguments: [state.selectedUri.relativeUriStr],
       );
     } else {
-      errorReporter.reportErrorForNode(
-        CompileTimeErrorCode.URI_WITH_INTERPOLATION,
+      errorReporter.atNode(
         directive.uri,
+        CompileTimeErrorCode.URI_WITH_INTERPOLATION,
       );
     }
   }
@@ -650,7 +650,11 @@ class LibraryAnalyzer {
 
     void reportOnDirective(ErrorCode errorCode, List<Object>? arguments) {
       if (directive != null) {
-        errorReporter.reportErrorForNode(errorCode, directive.uri, arguments);
+        errorReporter.atNode(
+          directive.uri,
+          errorCode,
+          arguments: arguments,
+        );
       }
     }
 
@@ -889,28 +893,28 @@ class LibraryAnalyzer {
     if (targetUri is DirectiveUriWithFile) {
       final targetFile = targetUri.file;
       if (!targetFile.exists) {
-        containerErrorReporter.reportErrorForNode(
-          CompileTimeErrorCode.URI_DOES_NOT_EXIST,
+        containerErrorReporter.atNode(
           directive.uri,
-          [targetUri.relativeUriStr],
+          CompileTimeErrorCode.URI_DOES_NOT_EXIST,
+          arguments: [targetUri.relativeUriStr],
         );
         return;
       }
 
       final targetFileKind = targetFile.kind;
       if (targetFileKind is LibraryFileKind) {
-        containerErrorReporter.reportErrorForNode(
-          CompileTimeErrorCode.AUGMENTATION_WITHOUT_IMPORT,
+        containerErrorReporter.atNode(
           directive.uri,
+          CompileTimeErrorCode.AUGMENTATION_WITHOUT_IMPORT,
         );
         return;
       }
     }
 
     // Otherwise, there are many other problems with the URI.
-    containerErrorReporter.reportErrorForNode(
-      CompileTimeErrorCode.AUGMENTATION_WITHOUT_LIBRARY,
+    containerErrorReporter.atNode(
       directive.uri,
+      CompileTimeErrorCode.AUGMENTATION_WITHOUT_LIBRARY,
     );
   }
 
@@ -946,42 +950,42 @@ class LibraryAnalyzer {
     if (state is LibraryExportWithUri) {
       final selectedUriStr = state.selectedUri.relativeUriStr;
       if (selectedUriStr.startsWith('dart-ext:')) {
-        errorReporter.reportErrorForNode(
-          CompileTimeErrorCode.USE_OF_NATIVE_EXTENSION,
+        errorReporter.atNode(
           directive.uri,
+          CompileTimeErrorCode.USE_OF_NATIVE_EXTENSION,
         );
       } else if (state.exportedSource == null) {
-        errorReporter.reportErrorForNode(
-          CompileTimeErrorCode.URI_DOES_NOT_EXIST,
+        errorReporter.atNode(
           directive.uri,
-          [selectedUriStr],
+          CompileTimeErrorCode.URI_DOES_NOT_EXIST,
+          arguments: [selectedUriStr],
         );
       } else if (state is LibraryExportWithFile && !state.exportedFile.exists) {
         final errorCode = isGeneratedSource(state.exportedSource)
             ? CompileTimeErrorCode.URI_HAS_NOT_BEEN_GENERATED
             : CompileTimeErrorCode.URI_DOES_NOT_EXIST;
-        errorReporter.reportErrorForNode(
-          errorCode,
+        errorReporter.atNode(
           directive.uri,
-          [selectedUriStr],
+          errorCode,
+          arguments: [selectedUriStr],
         );
       } else if (state.exportedLibrarySource == null) {
-        errorReporter.reportErrorForNode(
-          CompileTimeErrorCode.EXPORT_OF_NON_LIBRARY,
+        errorReporter.atNode(
           directive.uri,
-          [selectedUriStr],
+          CompileTimeErrorCode.EXPORT_OF_NON_LIBRARY,
+          arguments: [selectedUriStr],
         );
       }
     } else if (state is LibraryExportWithUriStr) {
-      errorReporter.reportErrorForNode(
-        CompileTimeErrorCode.INVALID_URI,
+      errorReporter.atNode(
         directive.uri,
-        [state.selectedUri.relativeUriStr],
+        CompileTimeErrorCode.INVALID_URI,
+        arguments: [state.selectedUri.relativeUriStr],
       );
     } else {
-      errorReporter.reportErrorForNode(
-        CompileTimeErrorCode.URI_WITH_INTERPOLATION,
+      errorReporter.atNode(
         directive.uri,
+        CompileTimeErrorCode.URI_WITH_INTERPOLATION,
       );
     }
   }
@@ -1028,27 +1032,27 @@ class LibraryAnalyzer {
     directive.element = partElement;
 
     if (partState is! PartWithUriStr) {
-      errorReporter.reportErrorForNode(
-        CompileTimeErrorCode.URI_WITH_INTERPOLATION,
+      errorReporter.atNode(
         directive.uri,
+        CompileTimeErrorCode.URI_WITH_INTERPOLATION,
       );
       return;
     }
 
     if (partState is! PartWithUri) {
-      errorReporter.reportErrorForNode(
-        CompileTimeErrorCode.INVALID_URI,
+      errorReporter.atNode(
         directive.uri,
-        [partState.uri.relativeUriStr],
+        CompileTimeErrorCode.INVALID_URI,
+        arguments: [partState.uri.relativeUriStr],
       );
       return;
     }
 
     if (partState is! PartWithFile) {
-      errorReporter.reportErrorForNode(
-        CompileTimeErrorCode.URI_DOES_NOT_EXIST,
+      errorReporter.atNode(
         directive.uri,
-        [partState.uri.relativeUriStr],
+        CompileTimeErrorCode.URI_DOES_NOT_EXIST,
+        arguments: [partState.uri.relativeUriStr],
       );
       return;
     }
@@ -1065,10 +1069,10 @@ class LibraryAnalyzer {
       } else {
         errorCode = CompileTimeErrorCode.URI_DOES_NOT_EXIST;
       }
-      errorReporter.reportErrorForNode(
-        errorCode,
+      errorReporter.atNode(
         partUri,
-        [includedFile.uriStr],
+        errorCode,
+        arguments: [includedFile.uriStr],
       );
       return;
     }
@@ -1077,25 +1081,25 @@ class LibraryAnalyzer {
       if (!includedKind.libraries.contains(_library)) {
         final name = includedKind.unlinked.name;
         if (libraryNameNode == null) {
-          errorReporter.reportErrorForNode(
-            CompileTimeErrorCode.PART_OF_UNNAMED_LIBRARY,
+          errorReporter.atNode(
             partUri,
-            [name],
+            CompileTimeErrorCode.PART_OF_UNNAMED_LIBRARY,
+            arguments: [name],
           );
         } else {
-          errorReporter.reportErrorForNode(
-            CompileTimeErrorCode.PART_OF_DIFFERENT_LIBRARY,
+          errorReporter.atNode(
             partUri,
-            [libraryNameNode.name, name],
+            CompileTimeErrorCode.PART_OF_DIFFERENT_LIBRARY,
+            arguments: [libraryNameNode.name, name],
           );
         }
         return;
       }
     } else if (includedKind.library != _library) {
-      errorReporter.reportErrorForNode(
-        CompileTimeErrorCode.PART_OF_DIFFERENT_LIBRARY,
+      errorReporter.atNode(
         partUri,
-        [_library.file.uriStr, includedFile.uriStr],
+        CompileTimeErrorCode.PART_OF_DIFFERENT_LIBRARY,
+        arguments: [_library.file.uriStr, includedFile.uriStr],
       );
       return;
     }
@@ -1120,8 +1124,11 @@ class LibraryAnalyzer {
     // Validate that the part source is unique in the library.
     //
     if (!seenPartSources.add(partSource)) {
-      errorReporter.reportErrorForNode(
-          CompileTimeErrorCode.DUPLICATE_PART, partUri, [partSource.uri]);
+      errorReporter.atNode(
+        partUri,
+        CompileTimeErrorCode.DUPLICATE_PART,
+        arguments: [partSource.uri],
+      );
     }
   }
 }