Version 2.19.0-364.0.dev

Merge ad5fc84 into dev

Author: Dart CI

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

@@ -67,9 +67,9 @@ class ForwardingListener implements Listener {
 
   @override
   void beginClassDeclaration(Token begin, Token? abstractToken,
-      Token? macroToken, Token? augmentToken, Token name) {
+      Token? macroToken, Token? viewToken, Token? augmentToken, Token name) {
     listener?.beginClassDeclaration(
-        begin, abstractToken, macroToken, augmentToken, name);
+        begin, abstractToken, macroToken, viewToken, augmentToken, name);
   }
 
   @override
@@ -390,9 +390,9 @@ class ForwardingListener implements Listener {
 
   @override
   void beginNamedMixinApplication(Token begin, Token? abstractToken,
-      Token? macroToken, Token? augmentToken, Token name) {
+      Token? macroToken, Token? viewToken, Token? augmentToken, Token name) {
     listener?.beginNamedMixinApplication(
-        begin, abstractToken, macroToken, augmentToken, name);
+        begin, abstractToken, macroToken, viewToken, augmentToken, name);
   }
 
   @override

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

@@ -134,7 +134,7 @@ class Listener implements UnescapeErrorListener {
   ///
   /// At this point we have parsed the name and type parameter declarations.
   void beginClassDeclaration(Token begin, Token? abstractToken,
-      Token? macroToken, Token? augmentToken, Token name) {}
+      Token? macroToken, Token? viewToken, Token? augmentToken, Token name) {}
 
   /// Handle an extends clause in a class declaration. Substructures:
   /// - supertype (may be a mixin application)
@@ -760,7 +760,7 @@ class Listener implements UnescapeErrorListener {
   ///
   /// At this point we have parsed the name and type parameter declarations.
   void beginNamedMixinApplication(Token begin, Token? abstractToken,
-      Token? macroToken, Token? augmentToken, Token name) {}
+      Token? macroToken, Token? viewToken, Token? augmentToken, Token name) {}
 
   /// Handle a named mixin application with clause (e.g. "A with B, C").
   /// Substructures:

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

@@ -507,8 +507,12 @@ class Parser {
     token = parseMetadataStar(token);
     Token next = token.next!;
     if (next.isTopLevelKeyword) {
-      return parseTopLevelKeywordDeclaration(/* start = */ token,
-          /* keyword = */ next, /* macroToken = */ null, directiveState);
+      return parseTopLevelKeywordDeclaration(
+          /* start = */ token,
+          /* keyword = */ next,
+          /* macroToken = */ null,
+          /* viewToken = */ null,
+          directiveState);
     }
     Token start = token;
     // Skip modifiers to find a top level keyword or identifier
@@ -528,15 +532,25 @@ class Parser {
     }
     next = token.next!;
     Token? macroToken;
+    Token? viewToken;
     if (next.isIdentifier &&
+        next.lexeme == 'view' &&
+        optional('class', next.next!)) {
+      viewToken = next;
+      next = next.next!;
+    } else if (next.isIdentifier &&
         next.lexeme == 'macro' &&
         optional('class', next.next!)) {
       macroToken = next;
       next = next.next!;
     }
     if (next.isTopLevelKeyword) {
-      return parseTopLevelKeywordDeclaration(/* start = */ start,
-          /* keyword = */ next, /* macroToken = */ macroToken, directiveState);
+      return parseTopLevelKeywordDeclaration(
+          /* start = */ start,
+          /* keyword = */ next,
+          /* macroToken = */ macroToken,
+          /* viewToken = */ viewToken,
+          directiveState);
     } else if (next.isKeywordOrIdentifier) {
       // TODO(danrubel): improve parseTopLevelMember
       // so that we don't parse modifiers twice.
@@ -569,7 +583,7 @@ class Parser {
   /// Parse any top-level declaration that begins with a keyword.
   /// [start] is the token before any modifiers preceding [keyword].
   Token parseTopLevelKeywordDeclaration(Token start, Token keyword,
-      Token? macroToken, DirectiveContext? directiveState) {
+      Token? macroToken, Token? viewToken, DirectiveContext? directiveState) {
     assert(keyword.isTopLevelKeyword);
     final String? value = keyword.stringValue;
     if (identical(value, 'class')) {
@@ -579,7 +593,7 @@ class Parser {
       Token? abstractToken = context.abstractToken;
       Token? augmentToken = context.augmentToken;
       return parseClassOrNamedMixinApplication(
-          abstractToken, macroToken, augmentToken, keyword);
+          abstractToken, macroToken, viewToken, augmentToken, keyword);
     } else if (identical(value, 'enum')) {
       directiveState?.checkDeclaration();
       ModifierContext context = new ModifierContext(this);
@@ -2415,8 +2429,12 @@ class Parser {
     return token;
   }
 
-  Token parseClassOrNamedMixinApplication(Token? abstractToken,
-      Token? macroToken, Token? augmentToken, Token classKeyword) {
+  Token parseClassOrNamedMixinApplication(
+      Token? abstractToken,
+      Token? macroToken,
+      Token? viewToken,
+      Token? augmentToken,
+      Token classKeyword) {
     assert(optional('class', classKeyword));
     Token begin = abstractToken ?? classKeyword;
     listener.beginClassOrMixinOrNamedMixinApplicationPrelude(begin);
@@ -2427,11 +2445,11 @@ class Parser {
         .parseVariables(name, this);
     if (optional('=', token.next!)) {
       listener.beginNamedMixinApplication(
-          begin, abstractToken, macroToken, augmentToken, name);
+          begin, abstractToken, macroToken, viewToken, augmentToken, name);
       return parseNamedMixinApplication(token, begin, classKeyword);
     } else {
       listener.beginClassDeclaration(
-          begin, abstractToken, macroToken, augmentToken, name);
+          begin, abstractToken, macroToken, viewToken, augmentToken, name);
       return parseClass(token, begin, classKeyword, name.lexeme);
     }
   }

pkg/analyzer/lib/dart/analysis/features.dart

@@ -72,6 +72,9 @@ abstract class Feature {
   /// Feature information for unnamed libraries.
   static final unnamedLibraries = ExperimentalFeatures.unnamed_libraries;
 
+  /// Feature information for views.
+  static final views = ExperimentalFeatures.views;
+
   /// Feature information for variance.
   static final variance = ExperimentalFeatures.variance;
 

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -85,7 +85,7 @@ import 'package:analyzer/src/util/performance/operation_performance.dart';
 /// TODO(scheglov) Clean up the list of implicitly analyzed files.
 class AnalysisDriver implements AnalysisDriverGeneric {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 246;
+  static const int DATA_VERSION = 247;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.

pkg/analyzer/lib/src/dart/analysis/experiments.g.dart

@@ -43,6 +43,7 @@ final _knownFeatures = <String, ExperimentalFeature>{
   EnableString.unnamed_libraries: ExperimentalFeatures.unnamed_libraries,
   EnableString.value_class: ExperimentalFeatures.value_class,
   EnableString.variance: ExperimentalFeatures.variance,
+  EnableString.views: ExperimentalFeatures.views,
 };
 
 /// Constant strings for enabling each of the currently known experimental
@@ -119,6 +120,9 @@ class EnableString {
 
   /// String to enable the experiment "variance"
   static const String variance = 'variance';
+
+  /// String to enable the experiment "views"
+  static const String views = 'views';
 }
 
 class ExperimentalFeatures {
@@ -366,6 +370,16 @@ class ExperimentalFeatures {
     experimentalReleaseVersion: null,
     releaseVersion: null,
   );
+
+  static final views = ExperimentalFeature(
+    index: 24,
+    enableString: EnableString.views,
+    isEnabledByDefault: IsEnabledByDefault.views,
+    isExpired: IsExpired.views,
+    documentation: 'Views',
+    experimentalReleaseVersion: null,
+    releaseVersion: null,
+  );
 }
 
 /// Constant bools indicating whether each experimental flag is currently
@@ -442,6 +456,9 @@ class IsEnabledByDefault {
 
   /// Default state of the experiment "variance"
   static const bool variance = false;
+
+  /// Default state of the experiment "views"
+  static const bool views = false;
 }
 
 /// Constant bools indicating whether each experimental flag is currently
@@ -519,6 +536,9 @@ class IsExpired {
 
   /// Expiration status of the experiment "variance"
   static const bool variance = false;
+
+  /// Expiration status of the experiment "views"
+  static const bool views = false;
 }
 
 mixin _CurrentState {
@@ -604,5 +624,8 @@ mixin _CurrentState {
   /// Current state for the flag "variance"
   bool get variance => isEnabled(ExperimentalFeatures.variance);
 
+  /// Current state for the flag "views"
+  bool get views => isEnabled(ExperimentalFeatures.views);
+
   bool isEnabled(covariant ExperimentalFeature feature);
 }

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -1844,6 +1844,9 @@ class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl
   /// The 'macro' keyword, or `null` if the keyword was absent.
   final Token? macroKeyword;
 
+  /// The 'view' keyword, or `null` if the keyword was absent.
+  final Token? viewKeyword;
+
   /// The 'augment' keyword, or `null` if the keyword was absent.
   final Token? augmentKeyword;
 
@@ -1898,6 +1901,7 @@ class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl
     required super.metadata,
     required this.abstractKeyword,
     required this.macroKeyword,
+    required this.viewKeyword,
     required this.augmentKeyword,
     required this.classKeyword,
     required super.name,
@@ -1938,7 +1942,11 @@ class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl
 
   @override
   Token get firstTokenAfterCommentAndMetadata {
-    return abstractKeyword ?? macroKeyword ?? augmentKeyword ?? classKeyword;
+    return abstractKeyword ??
+        macroKeyword ??
+        viewKeyword ??
+        augmentKeyword ??
+        classKeyword;
   }
 
   @override
@@ -1976,6 +1984,7 @@ class ClassDeclarationImpl extends NamedCompilationUnitMemberImpl
   ChildEntities get _childEntities => super._childEntities
     ..addToken('abstractKeyword', abstractKeyword)
     ..addToken('macroKeyword', macroKeyword)
+    ..addToken('viewKeyword', viewKeyword)
     ..addToken('augmentKeyword', augmentKeyword)
     ..addToken('classKeyword', classKeyword)
     ..addToken('name', name)
@@ -2040,6 +2049,10 @@ class ClassTypeAliasImpl extends TypeAliasImpl implements ClassTypeAlias {
   /// macro class.
   final Token? macroKeyword;
 
+  /// The token for the 'view' keyword, or `null` if this is not defining a
+  /// view class.
+  final Token? viewKeyword;
+
   /// The token for the 'augment' keyword, or `null` if this is not defining an
   /// augmentation class.
   final Token? augmentKeyword;
@@ -2072,6 +2085,7 @@ class ClassTypeAliasImpl extends TypeAliasImpl implements ClassTypeAlias {
     required this.equals,
     required this.abstractKeyword,
     required this.macroKeyword,
+    required this.viewKeyword,
     required this.augmentKeyword,
     required NamedTypeImpl superclass,
     required WithClauseImpl withClause,
@@ -2093,7 +2107,11 @@ class ClassTypeAliasImpl extends TypeAliasImpl implements ClassTypeAlias {
 
   @override
   Token get firstTokenAfterCommentAndMetadata {
-    return abstractKeyword ?? macroKeyword ?? augmentKeyword ?? typedefKeyword;
+    return abstractKeyword ??
+        macroKeyword ??
+        viewKeyword ??
+        augmentKeyword ??
+        typedefKeyword;
   }
 
   @override
@@ -2131,6 +2149,7 @@ class ClassTypeAliasImpl extends TypeAliasImpl implements ClassTypeAlias {
     ..addNode('typeParameters', typeParameters)
     ..addToken('equals', equals)
     ..addToken('abstractKeyword', abstractKeyword)
+    ..addToken('viewKeyword', viewKeyword)
     ..addToken('macroKeyword', macroKeyword)
     ..addToken('augmentKeyword', augmentKeyword)
     ..addNode('superclass', superclass)