Version 3.0.0-373.0.dev

Merge e687628 into dev
dart-lang · Mar 27, 2023 · f49a838 · f49a838
2 parents af5457b + e687628
commit f49a838
Show file tree

Hide file tree

Showing 123 changed files with 238 additions and 350 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
@@ -1379,11 +1379,11 @@ FfiCode.PACKED_ANNOTATION_ALIGNMENT:
 FfiCode.SIZE_ANNOTATION_DIMENSIONS:
   status: needsEvaluation
 FfiCode.SUBTYPE_OF_FFI_CLASS_IN_EXTENDS:
-  status: hasFix
+  status: noFix
 FfiCode.SUBTYPE_OF_FFI_CLASS_IN_IMPLEMENTS:
-  status: hasFix
+  status: noFix
 FfiCode.SUBTYPE_OF_FFI_CLASS_IN_WITH:
-  status: hasFix
+  status: noFix
 FfiCode.SUBTYPE_OF_STRUCT_CLASS_IN_EXTENDS:
   status: hasFix
 FfiCode.SUBTYPE_OF_STRUCT_CLASS_IN_IMPLEMENTS:

diff --git a/pkg/analysis_server/lib/src/services/correction/fix_internal.dart b/pkg/analysis_server/lib/src/services/correction/fix_internal.dart
@@ -1350,15 +1350,6 @@ class FixProcessor extends BaseProcessor {
     CompileTimeErrorCode.YIELD_OF_INVALID_TYPE: [
       MakeReturnTypeNullable.new,
     ],
-    FfiCode.SUBTYPE_OF_FFI_CLASS_IN_EXTENDS: [
-      RemoveNameFromDeclarationClause.new,
-    ],
-    FfiCode.SUBTYPE_OF_FFI_CLASS_IN_IMPLEMENTS: [
-      RemoveNameFromDeclarationClause.new,
-    ],
-    FfiCode.SUBTYPE_OF_FFI_CLASS_IN_WITH: [
-      RemoveNameFromDeclarationClause.new,
-    ],
     FfiCode.SUBTYPE_OF_STRUCT_CLASS_IN_EXTENDS: [
       RemoveNameFromDeclarationClause.new,
     ],

diff --git a/...sis_server/test/src/services/correction/fix/remove_name_from_declaration_clause_test.dart b/...sis_server/test/src/services/correction/fix/remove_name_from_declaration_clause_test.dart
@@ -23,9 +23,7 @@ void main() {
     defineReflectiveTests(MixinOfNonInterfaceTest);
     defineReflectiveTests(SubtypeOfFfiClassInExtendsTest);
     defineReflectiveTests(SubtypeOfFfiClassInImplementsTest);
-    defineReflectiveTests(SubtypeOfFfiClassInWithTest);
     defineReflectiveTests(SubtypeOfStructClassInExtendsTest);
-    defineReflectiveTests(SubtypeOfStructClassInImplementsTest);
     defineReflectiveTests(SubtypeOfStructClassInWithTest);
   });
 }
@@ -214,8 +212,6 @@ final class C extends Double {}
 import 'dart:ffi';
 final class C {}
 ''',
-      errorFilter: (error) =>
-          error.errorCode == FfiCode.SUBTYPE_OF_FFI_CLASS_IN_EXTENDS,
     );
   }
 }
@@ -235,31 +231,10 @@ final class C implements Double {}
 import 'dart:ffi';
 final class C {}
 ''',
-      errorFilter: (error) =>
-          error.errorCode == FfiCode.SUBTYPE_OF_FFI_CLASS_IN_IMPLEMENTS,
     );
   }
 }
 
-@reflectiveTest
-class SubtypeOfFfiClassInWithTest extends FixProcessorTest {
-  @override
-  FixKind get kind => DartFixKind.REMOVE_NAME_FROM_DECLARATION_CLAUSE;
-
-  Future<void> test_oneName() async {
-    await resolveTestCode('''
-import 'dart:ffi';
-final class C with Double {}
-''');
-    await assertHasFix('''
-import 'dart:ffi';
-final class C {}
-''',
-        errorFilter: (error) =>
-            error.errorCode == FfiCode.SUBTYPE_OF_FFI_CLASS_IN_WITH);
-  }
-}
-
 @reflectiveTest
 class SubtypeOfStructClassInExtendsTest extends FixProcessorTest {
   @override
@@ -283,27 +258,6 @@ final class C {}
   }
 }
 
-@reflectiveTest
-class SubtypeOfStructClassInImplementsTest extends FixProcessorTest {
-  @override
-  FixKind get kind => DartFixKind.REMOVE_NAME_FROM_DECLARATION_CLAUSE;
-
-  Future<void> test_oneName() async {
-    await resolveTestCode('''
-import 'dart:ffi';
-final class C implements Struct {}
-''');
-    await assertHasFix(
-      '''
-import 'dart:ffi';
-final class C {}
-''',
-      errorFilter: (error) =>
-          error.errorCode == FfiCode.SUBTYPE_OF_FFI_CLASS_IN_IMPLEMENTS,
-    );
-  }
-}
-
 @reflectiveTest
 class SubtypeOfStructClassInWithTest extends FixProcessorTest {
   @override

diff --git a/pkg/analyzer/lib/src/generated/ffi_verifier.dart b/pkg/analyzer/lib/src/generated/ffi_verifier.dart
@@ -99,13 +99,6 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
           _validateAbiSpecificIntegerAnnotation(node);
           _validateAbiSpecificIntegerMappingAnnotation(
               node.name, node.metadata);
-        } else if (className != _allocatorClassName &&
-            className != _opaqueClassName &&
-            className != _abiSpecificIntegerClassName) {
-          _errorReporter.reportErrorForNode(
-              FfiCode.SUBTYPE_OF_FFI_CLASS_IN_EXTENDS,
-              superclass.name,
-              [node.name.lexeme, superclass.name.name]);
         }
       } else if (superclass.isCompoundSubtype ||
           superclass.isAbiSpecificIntegerSubtype) {
@@ -117,18 +110,13 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
     }
 
     // No classes from the FFI may be explicitly implemented.
-    void checkSupertype(NamedType typename, FfiCode subtypeOfFfiCode,
-        FfiCode subtypeOfStructCode) {
+    void checkSupertype(NamedType typename, FfiCode subtypeOfStructCode) {
       final superName = typename.name.staticElement?.name;
       if (superName == _allocatorClassName ||
           superName == _finalizableClassName) {
         return;
       }
-      if (typename.ffiClass != null) {
-        _errorReporter.reportErrorForNode(subtypeOfFfiCode, typename,
-            [node.name.lexeme, typename.name.toSource()]);
-      } else if (typename.isCompoundSubtype ||
-          typename.isAbiSpecificIntegerSubtype) {
+      if (typename.isCompoundSubtype || typename.isAbiSpecificIntegerSubtype) {
         _errorReporter.reportErrorForNode(subtypeOfStructCode, typename,
             [node.name.lexeme, typename.name.toSource()]);
       }
@@ -137,15 +125,13 @@ class FfiVerifier extends RecursiveAstVisitor<void> {
     var implementsClause = node.implementsClause;
     if (implementsClause != null) {
       for (NamedType type in implementsClause.interfaces) {
-        checkSupertype(type, FfiCode.SUBTYPE_OF_FFI_CLASS_IN_IMPLEMENTS,
-            FfiCode.SUBTYPE_OF_STRUCT_CLASS_IN_IMPLEMENTS);
+        checkSupertype(type, FfiCode.SUBTYPE_OF_STRUCT_CLASS_IN_IMPLEMENTS);
       }
     }
     var withClause = node.withClause;
     if (withClause != null) {
       for (NamedType type in withClause.mixinTypes) {
-        checkSupertype(type, FfiCode.SUBTYPE_OF_FFI_CLASS_IN_WITH,
-            FfiCode.SUBTYPE_OF_STRUCT_CLASS_IN_WITH);
+        checkSupertype(type, FfiCode.SUBTYPE_OF_STRUCT_CLASS_IN_WITH);
       }
     }
 

diff --git a/pkg/analyzer/messages.yaml b/pkg/analyzer/messages.yaml
@@ -19266,6 +19266,7 @@ FfiCode:
       }
       ```
   SUBTYPE_OF_FFI_CLASS_IN_EXTENDS:
+    removed: 3.0
     sharedName: SUBTYPE_OF_FFI_CLASS
     problemMessage: "The class '{0}' can't extend '{1}'."
     correctionMessage: "Try extending 'Struct' or 'Union'."
@@ -19316,6 +19317,7 @@ FfiCode:
       final class C {}
       ```
   SUBTYPE_OF_FFI_CLASS_IN_IMPLEMENTS:
+    removed: 3.0
     sharedName: SUBTYPE_OF_FFI_CLASS
     problemMessage: "The class '{0}' can't implement '{1}'."
     correctionMessage: "Try implementing 'Allocator' or 'Finalizable'."
@@ -19325,6 +19327,7 @@ FfiCode:
       1: the name of the class being extended, implemented, or mixed in
     hasPublishedDocs: true
   SUBTYPE_OF_FFI_CLASS_IN_WITH:
+    removed: 3.0
     sharedName: SUBTYPE_OF_FFI_CLASS
     problemMessage: "The class '{0}' can't mix in '{1}'."
     correctionMessage: "Try extending 'Struct' or 'Union'."