Version 2.19.0-399.0.dev

Merge bf48667 into dev

Author: Dart CI

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

@@ -143,6 +143,17 @@ Message _withArgumentsAbstractRedirectedClassInstantiation(String name) {
       arguments: {'name': name});
 }
 
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Null> codeAbstractSealedClass = messageAbstractSealedClass;
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const MessageCode messageAbstractSealedClass = const MessageCode(
+    "AbstractSealedClass",
+    index: 132,
+    problemMessage:
+        r"""A class can't be declared both 'sealed' and 'abstract'.""",
+    correctionMessage: r"""Try removing the 'abstract' or 'sealed' keyword.""");
+
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
 const Code<Null> codeAbstractStaticField = messageAbstractStaticField;
 

pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart

@@ -545,11 +545,17 @@ class Parser {
         optional('class', next.next!)) {
       macroToken = next;
       next = next.next!;
-    } else if (next.isIdentifier &&
-        next.lexeme == 'sealed' &&
-        optional('class', next.next!)) {
+    } else if (next.isIdentifier && next.lexeme == 'sealed') {
       sealedToken = next;
-      next = next.next!;
+      if (optional('class', next.next!)) {
+        next = next.next!;
+      } else if (optional('abstract', next.next!) &&
+          optional('class', next.next!.next!)) {
+        // Defer error handling of sealed abstract to
+        // [parseClassOrNamedMixinApplication] after the abstract is parsed.
+        start = next;
+        next = next.next!.next!;
+      }
     }
     if (next.isTopLevelKeyword) {
       return parseTopLevelKeywordDeclaration(
@@ -2457,6 +2463,9 @@ class Parser {
     Token token = computeTypeParamOrArg(
             name, /* inDeclaration = */ true, /* allowsVariance = */ true)
         .parseVariables(name, this);
+    if (abstractToken != null && sealedToken != null) {
+      reportRecoverableError(sealedToken, codes.messageAbstractSealedClass);
+    }
     if (optional('=', token.next!)) {
       listener.beginNamedMixinApplication(
           begin, abstractToken, macroToken, viewToken, augmentToken, name);

pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml

@@ -2138,6 +2138,8 @@ ParserErrorCode.ABSTRACT_EXTERNAL_FIELD:
   status: needsEvaluation
 ParserErrorCode.ABSTRACT_LATE_FIELD:
   status: needsEvaluation
+ParserErrorCode.ABSTRACT_SEALED_CLASS:
+  status: needsEvaluation
 ParserErrorCode.ABSTRACT_STATIC_FIELD:
   status: needsEvaluation
 ParserErrorCode.ABSTRACT_STATIC_METHOD:

pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart

@@ -146,6 +146,7 @@ final fastaAnalyzerErrorCodes = <ErrorCode?>[
   ParserErrorCode.EMPTY_RECORD_TYPE_NAMED_FIELDS_LIST,
   ParserErrorCode.EMPTY_RECORD_TYPE_WITH_COMMA,
   ParserErrorCode.RECORD_TYPE_ONE_POSITIONAL_NO_TRAILING_COMMA,
+  ParserErrorCode.ABSTRACT_SEALED_CLASS,
 ];
 
 class ParserErrorCode extends ErrorCode {
@@ -175,6 +176,12 @@ class ParserErrorCode extends ErrorCode {
     correctionMessage: "Try removing the 'abstract' or 'late' keyword.",
   );
 
+  static const ParserErrorCode ABSTRACT_SEALED_CLASS = ParserErrorCode(
+    'ABSTRACT_SEALED_CLASS',
+    "A class can't be declared both 'sealed' and 'abstract'.",
+    correctionMessage: "Try removing the 'abstract' or 'sealed' keyword.",
+  );
+
   static const ParserErrorCode ABSTRACT_STATIC_FIELD = ParserErrorCode(
     'ABSTRACT_STATIC_FIELD',
     "Static fields can't be declared 'abstract'.",

pkg/analyzer/lib/src/error/error_code_values.g.dart

@@ -700,6 +700,7 @@ const List<ErrorCode> errorCodeValues = [
   ParserErrorCode.ABSTRACT_ENUM,
   ParserErrorCode.ABSTRACT_EXTERNAL_FIELD,
   ParserErrorCode.ABSTRACT_LATE_FIELD,
+  ParserErrorCode.ABSTRACT_SEALED_CLASS,
   ParserErrorCode.ABSTRACT_STATIC_FIELD,
   ParserErrorCode.ABSTRACT_STATIC_METHOD,
   ParserErrorCode.ABSTRACT_TOP_LEVEL_FUNCTION,

pkg/analyzer/test/src/fasta/ast_builder_test.dart

@@ -15,6 +15,26 @@ main() {
 
 @reflectiveTest
 class AstBuilderTest extends ParserDiagnosticsTest {
+  void test_class_abstract_sealed() {
+    var parseResult = parseStringWithErrors(r'''
+abstract sealed class A {}
+''');
+    parseResult.assertErrors([
+      error(ParserErrorCode.ABSTRACT_SEALED_CLASS, 9, 6),
+    ]);
+
+    var node = parseResult.findNode.classDeclaration('class A {}');
+    assertParsedNodeText(node, r'''
+ClassDeclaration
+  abstractKeyword: abstract
+  sealedKeyword: sealed
+  classKeyword: class
+  name: A
+  leftBracket: {
+  rightBracket: }
+''');
+  }
+
   void test_class_augment() {
     var parseResult = parseStringWithErrors(r'''
 augment class A {}
@@ -294,6 +314,26 @@ ClassDeclaration
 ''');
   }
 
+  void test_class_sealed_abstract() {
+    var parseResult = parseStringWithErrors(r'''
+sealed abstract class A {}
+''');
+    parseResult.assertErrors([
+      error(ParserErrorCode.ABSTRACT_SEALED_CLASS, 0, 6),
+    ]);
+
+    var node = parseResult.findNode.classDeclaration('class A {}');
+    assertParsedNodeText(node, r'''
+ClassDeclaration
+  abstractKeyword: abstract
+  sealedKeyword: sealed
+  classKeyword: class
+  name: A
+  leftBracket: {
+  rightBracket: }
+''');
+  }
+
   void test_class_view() {
     var parseResult = parseStringWithErrors(r'''
 view class A {}

pkg/front_end/lib/src/fasta/source/source_class_builder.dart

@@ -1540,7 +1540,11 @@ class SourceClassBuilder extends ClassBuilderImpl
           procedure.isInstanceMember &&
           !procedure.isAbstract &&
           _isPrivateNameInThisLibrary(procedure.name)) {
-        unpromotablePrivateFieldNames.add(procedure.name.text);
+        ProcedureStubKind procedureStubKind = procedure.stubKind;
+        if (procedureStubKind == ProcedureStubKind.Regular ||
+            procedureStubKind == ProcedureStubKind.NoSuchMethodForwarder) {
+          unpromotablePrivateFieldNames.add(procedure.name.text);
+        }
       }
     }
   }

pkg/front_end/messages.yaml

@@ -788,6 +788,16 @@ AbstractLateField:
   script:
     - "abstract class C {abstract late var f;}"
 
+AbstractSealedClass:
+  index: 132
+  problemMessage: "A class can't be declared both 'sealed' and 'abstract'."
+  correctionMessage: "Try removing the 'abstract' or 'sealed' keyword."
+  analyzerCode: ParserErrorCode.ABSTRACT_SEALED_CLASS
+  experiments: sealed-class
+  script:
+    - "sealed abstract class C {}"
+    - "abstract sealed class C {}"
+
 ClassInClass:
   index: 53
   problemMessage: "Classes can't be declared inside other classes."

pkg/front_end/testcases/sealed_class/sealed_abstract_class_declaration.dart

@@ -0,0 +1,6 @@
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+abstract sealed class A {}
+sealed abstract class A {}

pkg/front_end/testcases/sealed_class/sealed_abstract_class_declaration.dart.strong.expect

@@ -0,0 +1,34 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/sealed_class/sealed_abstract_class_declaration.dart:5:10: Error: A class can't be declared both 'sealed' and 'abstract'.
+// Try removing the 'abstract' or 'sealed' keyword.
+// abstract sealed class A {}
+//          ^^^^^^
+//
+// pkg/front_end/testcases/sealed_class/sealed_abstract_class_declaration.dart:6:1: Error: A class can't be declared both 'sealed' and 'abstract'.
+// Try removing the 'abstract' or 'sealed' keyword.
+// sealed abstract class A {}
+// ^^^^^^
+//
+// pkg/front_end/testcases/sealed_class/sealed_abstract_class_declaration.dart:6:23: Error: 'A' is already declared in this scope.
+// sealed abstract class A {}
+//                       ^
+// pkg/front_end/testcases/sealed_class/sealed_abstract_class_declaration.dart:5:23: Context: Previous declaration of 'A'.
+// abstract sealed class A {}
+//                       ^
+//
+import self as self;
+import "dart:core" as core;
+
+abstract class A#1#0 extends core::Object {
+  synthetic constructor •() → self::A#1#0
+    : super core::Object::•()
+    ;
+}
+abstract class A extends core::Object {
+  synthetic constructor •() → self::A
+    : super core::Object::•()
+    ;
+}