Version 3.11.0-110.0.dev

Merge a6faf24 into dev

Author: Dart CI

DEPS

@@ -54,7 +54,7 @@ vars = {
 
   # co19 is a cipd package automatically generated for each co19 commit.
   # Use tests/co19/update.sh to update this hash.
-  "co19_rev": "dfea6e4100267a94e63563fb86fe3ad53bccb13b",
+  "co19_rev": "467016acdb5842571acc75a3f98ec08cf53376c6",
 
   # The internal benchmarks to use. See go/dart-benchmarks-internal
   "benchmarks_internal_rev": "13eb8dedf372e4255e64349b6e57960f7de4df2d",

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

@@ -2193,6 +2193,11 @@ class ForwardingListener implements Listener {
     listener?.handleWildcardPattern(keyword, wildcard);
   }
 
+  @override
+  void handleNoIdentifier(Token token) {
+    listener?.handleNoIdentifier(token);
+  }
+
   @override
   void handleNoType(Token lastConsumed) {
     listener?.handleNoType(lastConsumed);

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

@@ -2389,6 +2389,10 @@ abstract class Listener implements UnescapeErrorListener {
     logEvent("NoConstructorReferenceContinuationAfterTypeArguments");
   }
 
+  void handleNoIdentifier(Token token) {
+    logEvent("NoIdentifier");
+  }
+
   void handleNoTypeNameInConstructorReference(Token token) {
     logEvent("NoTypeNameInConstructorReference");
   }

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

@@ -4015,7 +4015,7 @@ class Parser {
     }
 
     Token beforeType = token;
-    if (varFinalOrConst != null) {
+    if (varFinalOrConst != null && !varFinalOrConst.isA(Keyword.CONST)) {
       Token? afterOuterPattern = skipOuterPattern(beforeType);
       if (afterOuterPattern != null &&
           (afterOuterPattern.next!.isA(TokenType.EQ))) {
@@ -5192,7 +5192,7 @@ class Parser {
     listener.beginMember();
 
     Token beforeType = token;
-    if (varFinalOrConst != null) {
+    if (varFinalOrConst != null && !varFinalOrConst.isA(Keyword.CONST)) {
       Token? afterOuterPattern = skipOuterPattern(beforeType);
       if (afterOuterPattern != null &&
           (afterOuterPattern.next!.isA(TokenType.EQ))) {
@@ -5267,9 +5267,31 @@ class Parser {
             externalToken,
             staticToken ?? covariantToken,
             varFinalOrConst,
+            /* hasName = */ true,
           );
           listener.endMember();
           return token;
+        } else if (_isDeclaringConstructorsFeatureEnabled &&
+            next2.isA(TokenType.OPEN_PAREN)) {
+          if (typeInfo == noType &&
+              covariantToken == null &&
+              //externalToken = null &&
+              lateToken == null &&
+              staticToken == null &&
+              (varFinalOrConst == null || varFinalOrConst.isA(Keyword.CONST)) &&
+              abstractToken == null) {
+            token = parseFactoryMethod(
+              token,
+              kind,
+              beforeStart,
+              externalToken,
+              staticToken ?? covariantToken,
+              varFinalOrConst,
+              /* hasName = */ false,
+            );
+            listener.endMember();
+            return token;
+          }
         }
         // Fall through to continue parsing `factory` as an identifier.
       } else if (identical(value, 'operator')) {
@@ -5832,6 +5854,7 @@ class Parser {
     Token? externalToken,
     Token? staticOrCovariant,
     Token? varFinalOrConst,
+    bool hasName,
   ) {
     Token factoryKeyword = token = token.next!;
     assert(factoryKeyword.isA(Keyword.FACTORY));
@@ -5870,11 +5893,15 @@ class Parser {
       externalToken,
       varFinalOrConst,
     );
-    token = ensureIdentifier(token, IdentifierContext.methodDeclaration);
-    token = parseQualifiedRestOpt(
-      token,
-      IdentifierContext.methodDeclarationContinuation,
-    );
+    if (!hasName) {
+      listener.handleNoIdentifier(token);
+    } else {
+      token = ensureIdentifier(token, IdentifierContext.methodDeclaration);
+      token = parseQualifiedRestOpt(
+        token,
+        IdentifierContext.methodDeclarationContinuation,
+      );
+    }
     token = parseMethodTypeVar(token);
     token = parseFormalParametersRequiredOpt(token, MemberKind.Factory);
     Token asyncToken = token.next!;

pkg/analyzer/lib/src/dart/resolver/extension_member_resolver.dart

@@ -159,7 +159,7 @@ class ExtensionMemberResolver {
   }
 
   /// Finds extensions applicable to [declaration] for static member lookups.
-  StaticExtensionResolutionResult findExtensionForDeclaration(
+  StaticExtensionResolutionResult findStaticExtension(
     InterfaceElement declaration,
     SyntacticEntity nameEntity,
     Name name,

pkg/analyzer/lib/src/dart/resolver/property_element_resolver.dart

@@ -802,7 +802,7 @@ class PropertyElementResolver with ScopeHelpers {
       if (readElement == null) {
         if (_definingLibrary.featureSet.isEnabled(Feature.static_extensions)) {
           // When direct lookups fail, try static extension resolution.
-          var result = _resolver.typePropertyResolver.resolveForDeclaration(
+          var result = _resolver.typePropertyResolver.resolveStaticExtension(
             declaration: typeReference,
             name: propertyName.name,
             hasRead: hasRead,
@@ -860,6 +860,31 @@ class PropertyElementResolver with ScopeHelpers {
           writeElementRecovery = writeElement;
           writeElement = null;
         }
+      } else if (_definingLibrary.featureSet.isEnabled(
+        Feature.static_extensions,
+      )) {
+        // When direct lookups fail, try static extension resolution.
+        var result = _resolver.typePropertyResolver.resolveStaticExtension(
+          declaration: typeReference,
+          name: propertyName.name,
+          hasRead: hasRead,
+          hasWrite: hasWrite,
+          propertyErrorEntity: propertyName,
+          nameErrorEntity: propertyName,
+        );
+        if (result.setter2 != null) {
+          writeElementRecovery = writeElement;
+          writeElement = result.setter2;
+        } else {
+          // Recovery, try to use getter.
+          writeElementRecovery = typeReference.getGetter(propertyName.name);
+          AssignmentVerifier(diagnosticReporter).verify(
+            node: propertyName,
+            requested: null,
+            recovery: writeElementRecovery,
+            receiverType: typeReference.thisType,
+          );
+        }
       } else {
         // Recovery, try to use getter.
         writeElementRecovery = typeReference.getGetter(propertyName.name);

pkg/analyzer/lib/src/dart/resolver/type_property_resolver.dart

@@ -241,7 +241,7 @@ class TypePropertyResolver {
   }
 
   /// Resolve static invocations for [declaration].
-  ResolutionResult resolveForDeclaration({
+  ResolutionResult resolveStaticExtension({
     required InterfaceElement declaration,
     required String name,
     required bool hasRead,
@@ -256,23 +256,28 @@ class TypePropertyResolver {
     _nameErrorEntity = nameErrorEntity;
     _resetResult();
 
-    var getterName = Name(_definingLibrary.uri, _name);
-    var result = _extensionResolver.findExtensionForDeclaration(
+    var memberName = Name(_definingLibrary.uri, _name);
+    var result = _extensionResolver.findStaticExtension(
       declaration,
       _nameErrorEntity,
-      getterName,
+      memberName,
     );
-    // TODO(cstefantsova): Add the support for setters and methods.
+
     _reportedGetterError =
         result == const AmbiguousStaticExtensionResolutionError();
-    _reportedSetterError = false;
+    _reportedSetterError =
+        result == const AmbiguousStaticExtensionResolutionError();
 
-    if (result.member != null) {
-      // TODO(cstefantsova): Add the support for setters and methods.
+    if (result.member != null && hasRead) {
       _needsGetterError = false;
       _getterRequested = result.member;
     }
 
+    if (result.member != null && hasWrite) {
+      _needsSetterError = false;
+      _setterRequested = result.member;
+    }
+
     return _toResult();
   }