Legacy. Remove 2.5 language tests, two error codes.

Change-Id: If29c291d17fbbd74141c08afe55d0c174b303f0a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/349627 Commit-Queue: Konstantin Shcheglov <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
dart-lang · Feb 1, 2024 · 14a9782 · 14a9782
1 parent 79cd9a6
commit 14a9782
Show file tree

Hide file tree

Showing 26 changed files with 13 additions and 781 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/src/dart/error/hint_codes.g.dart b/pkg/analyzer/lib/src/dart/error/hint_codes.g.dart
@@ -106,18 +106,6 @@ class HintCode extends AnalyzerErrorCode {
     hasPublishedDocs: true,
   );
 
-  ///  https://github.com/dart-lang/sdk/issues/44063
-  ///
-  ///  Parameters:
-  ///  0: the name of the library
-  static const HintCode IMPORT_OF_LEGACY_LIBRARY_INTO_NULL_SAFE = HintCode(
-    'IMPORT_OF_LEGACY_LIBRARY_INTO_NULL_SAFE',
-    "The library '{0}' is legacy, and shouldn't be imported into a null safe "
-        "library.",
-    correctionMessage: "Try migrating the imported library.",
-    hasPublishedDocs: true,
-  );
-
   ///  Parameters:
   ///  0: the message
   static const HintCode MACRO_INFO = HintCode(

diff --git a/pkg/analyzer/lib/src/error/best_practices_verifier.dart b/pkg/analyzer/lib/src/error/best_practices_verifier.dart
@@ -551,7 +551,6 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
       _checkForLoadLibraryFunction(node, importElement);
     }
     _invalidAccessVerifier.verifyImport(node);
-    _checkForImportOfLegacyLibraryIntoNullSafe(node);
     super.visitImportDirective(node);
   }
 
@@ -996,28 +995,6 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
     }
   }
 
-  void _checkForImportOfLegacyLibraryIntoNullSafe(ImportDirective node) {
-    if (!_isNonNullableByDefault) {
-      return;
-    }
-
-    var importElement = node.element;
-    if (importElement == null) {
-      return;
-    }
-
-    var importedLibrary = importElement.importedLibrary;
-    if (importedLibrary == null || importedLibrary.isNonNullableByDefault) {
-      return;
-    }
-
-    _errorReporter.reportErrorForNode(
-      HintCode.IMPORT_OF_LEGACY_LIBRARY_INTO_NULL_SAFE,
-      node.uri,
-      [importedLibrary.source.uri],
-    );
-  }
-
   /// Check that the namespace exported by [node] does not include any elements
   /// annotated with `@internal`.
   void _checkForInternalExport(ExportDirective node) {

diff --git a/pkg/analyzer/lib/src/error/codes.g.dart b/pkg/analyzer/lib/src/error/codes.g.dart
@@ -1543,17 +1543,6 @@ class CompileTimeErrorCode extends AnalyzerErrorCode {
     hasPublishedDocs: true,
   );
 
-  ///  Parameters:
-  ///  0: the name of a symbol defined in a legacy library
-  static const CompileTimeErrorCode EXPORT_LEGACY_SYMBOL = CompileTimeErrorCode(
-    'EXPORT_LEGACY_SYMBOL',
-    "The symbol '{0}' is defined in a legacy library, and can't be re-exported "
-        "from a library with null safety enabled.",
-    correctionMessage:
-        "Try removing the export or migrating the legacy library.",
-    hasPublishedDocs: true,
-  );
-
   ///  Parameters:
   ///  0: the URI pointing to a non-library declaration
   static const CompileTimeErrorCode EXPORT_OF_NON_LIBRARY =

diff --git a/pkg/analyzer/lib/src/error/error_code_values.g.dart b/pkg/analyzer/lib/src/error/error_code_values.g.dart
@@ -189,7 +189,6 @@ const List<ErrorCode> errorCodeValues = [
   CompileTimeErrorCode.EXPECTED_TWO_MAP_PATTERN_TYPE_ARGUMENTS,
   CompileTimeErrorCode.EXPECTED_TWO_MAP_TYPE_ARGUMENTS,
   CompileTimeErrorCode.EXPORT_INTERNAL_LIBRARY,
-  CompileTimeErrorCode.EXPORT_LEGACY_SYMBOL,
   CompileTimeErrorCode.EXPORT_OF_NON_LIBRARY,
   CompileTimeErrorCode.EXPRESSION_IN_MAP,
   CompileTimeErrorCode.EXTENDS_DEFERRED_CLASS,
@@ -631,7 +630,6 @@ const List<ErrorCode> errorCodeValues = [
   HintCode.DEPRECATED_MEMBER_USE_WITH_MESSAGE,
   HintCode.DIVISION_OPTIMIZATION,
   HintCode.IMPORT_DEFERRED_LIBRARY_WITH_LOAD_FUNCTION,
-  HintCode.IMPORT_OF_LEGACY_LIBRARY_INTO_NULL_SAFE,
   HintCode.MACRO_INFO,
   HintCode.UNNECESSARY_CAST,
   HintCode.UNNECESSARY_IMPORT,

diff --git a/pkg/analyzer/lib/src/generated/error_verifier.dart b/pkg/analyzer/lib/src/generated/error_verifier.dart
@@ -675,7 +675,6 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
       var exportedLibrary = exportElement.exportedLibrary;
       _checkForAmbiguousExport(node, exportElement, exportedLibrary);
       _checkForExportInternalLibrary(node, exportElement);
-      _checkForExportLegacySymbol(node);
     }
     super.visitExportDirective(node);
   }
@@ -2927,35 +2926,6 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
         [directive.uri.stringValue!]);
   }
 
-  /// See [CompileTimeErrorCode.EXPORT_LEGACY_SYMBOL].
-  void _checkForExportLegacySymbol(ExportDirective node) {
-    if (!_isNonNullableByDefault) {
-      return;
-    }
-
-    var element = node.element!;
-    // TODO(scheglov): Expose from ExportElement.
-    var namespace =
-        NamespaceBuilder().createExportNamespaceForDirective(element);
-
-    for (var element in namespace.definedNames.values) {
-      if (element == DynamicElementImpl.instance ||
-          element == NeverElementImpl.instance) {
-        continue;
-      }
-      if (!element.library!.isNonNullableByDefault) {
-        errorReporter.reportErrorForNode(
-          CompileTimeErrorCode.EXPORT_LEGACY_SYMBOL,
-          node.uri,
-          [element.displayName],
-        );
-        // Stop after the first symbol.
-        // We don't want to list them all.
-        break;
-      }
-    }
-  }
-
   /// Verify that the given extends [clause] does not extend a deferred class.
   ///
   /// See [CompileTimeErrorCode.EXTENDS_DEFERRED_CLASS].

diff --git a/pkg/analyzer/messages.yaml b/pkg/analyzer/messages.yaml
@@ -4750,6 +4750,7 @@ CompileTimeErrorCode:
 
       Remove the export directive.
   EXPORT_LEGACY_SYMBOL:
+    removedIn: "3.0"
     problemMessage: "The symbol '{0}' is defined in a legacy library, and can't be re-exported from a library with null safety enabled."
     correctionMessage: Try removing the export or migrating the legacy library.
     hasPublishedDocs: true
@@ -20657,6 +20658,7 @@ HintCode:
       }
       ```
   IMPORT_OF_LEGACY_LIBRARY_INTO_NULL_SAFE:
+    removedIn: "3.0"
     problemMessage: "The library '{0}' is legacy, and shouldn't be imported into a null safe library."
     correctionMessage: Try migrating the imported library.
     comment: |-

diff --git a/pkg/analyzer/test/src/dart/analysis/unlinked_api_signature_test.dart b/pkg/analyzer/test/src/dart/analysis/unlinked_api_signature_test.dart
@@ -1212,24 +1212,24 @@ extension E<U> on int {}
     _assertNotSameSignature(r'''
 class A {}
 ''', r'''
-// @dart = 2.5
+// @dart = 3.2
 class A {}
 ''');
   }
 
   test_featureSet_change() async {
     _assertNotSameSignature(r'''
-// @dart = 2.6
+// @dart = 3.2
 class A {}
 ''', r'''
-// @dart = 2.2
+// @dart = 3.3
 class A {}
 ''');
   }
 
   test_featureSet_remove() async {
     _assertNotSameSignature(r'''
-// @dart = 2.5
+// @dart = 3.2
 class A {}
 ''', r'''
 class A {}

diff --git a/pkg/analyzer/test/src/dart/resolution/field_test.dart b/pkg/analyzer/test/src/dart/resolution/field_test.dart
@@ -249,25 +249,6 @@ class A {
     assertType(findElement.field('f').type, 'dynamic');
   }
 
-  test_type_inferred_nonNullify() async {
-    newFile('$testPackageLibPath/a.dart', r'''
-// @dart = 2.7
-var a = 0;
-''');
-
-    await assertErrorsInCode('''
-import 'a.dart';
-
-class A {
-  var f = a;
-}
-''', [
-      error(HintCode.IMPORT_OF_LEGACY_LIBRARY_INTO_NULL_SAFE, 7, 8),
-    ]);
-
-    assertType(findElement.field('f').type, 'int');
-  }
-
   test_type_inferred_null() async {
     await resolveTestCode('''
 class A {

diff --git a/pkg/analyzer/test/src/dart/resolution/language_version_test.dart b/pkg/analyzer/test/src/dart/resolution/language_version_test.dart
diff --git a/pkg/analyzer/test/src/dart/resolution/local_variable_test.dart b/pkg/analyzer/test/src/dart/resolution/local_variable_test.dart
@@ -133,25 +133,4 @@ void f() {
     expect(x.isLate, isTrue);
     expect(x.isStatic, isFalse);
   }
-
-  test_nonNullifyType() async {
-    newFile('$testPackageLibPath/a.dart', r'''
-// @dart = 2.7
-var a = 0;
-''');
-
-    await assertErrorsInCode('''
-import 'a.dart';
-
-void f() {
-  var x = a;
-  x;
-}
-''', [
-      error(HintCode.IMPORT_OF_LEGACY_LIBRARY_INTO_NULL_SAFE, 7, 8),
-    ]);
-
-    var x = findElement.localVar('x');
-    assertType(x.type, 'int');
-  }
 }