Version 3.0.0-400.0.dev

Merge 489aefb into dev
dart-lang · Apr 3, 2023 · ca96c7c · ca96c7c
2 parents 8296054 + 489aefb
commit ca96c7c
Show file tree

Hide file tree

Showing 60 changed files with 2,647 additions and 21 deletions.
diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
@@ -9968,7 +9968,6 @@ class Parser {
           break;
         }
 
-        // TODO(paulberry): test this error recovery logic
         // Recovery
         if (!looksLikeLiteralEntry(next)) {
           if (beginToken.endGroup!.isSynthetic) {
@@ -10028,7 +10027,6 @@ class Parser {
         token = parseExpression(token);
         Token colon = token.next!;
         if (!optional(':', colon)) {
-          // TODO(paulberry): test this error recovery logic
           // Recover from a missing colon by inserting one.
           colon = rewriteAndRecover(
               token,
@@ -10051,7 +10049,6 @@ class Parser {
       }
 
       if (comma == null) {
-        // TODO(paulberry): test this error recovery logic
         // Recovery
         if (looksLikeLiteralEntry(next)) {
           // If this looks like the start of an expression,
@@ -10098,14 +10095,12 @@ class Parser {
         break;
       }
       Token? colon = null;
-      // TODO(paulberry): test error recovery
       if (optional(':', next)) {
         wasRecord = true;
         wasValidRecord = true;
         listener.handleNoName(token);
         colon = token = next;
-      } else if (optional(':', next.next!) || /* recovery */
-          optional(':', next)) {
+      } else if (optional(':', next.next!)) {
         // Record with named expression.
         wasRecord = true;
         token = ensureIdentifier(
@@ -10122,8 +10117,6 @@ class Parser {
       }
       ++count;
       if (!optional(',', next)) {
-        // TODO(paulberry): make sure to test the error case where there's a
-        // colon but it's not a record.
         break;
       } else {
         // It is a comma, i.e. it's a record.
@@ -10189,7 +10182,6 @@ class Parser {
           token = next;
           break;
         }
-        // TODO(paulberry): test error recovery
         // Recovery
         if (looksLikeExpressionStart(next)) {
           // If this looks like the start of an expression,
@@ -10353,7 +10345,6 @@ class Parser {
         }
 
         if (comma == null) {
-          // TODO(paulberry): test this error recovery logic
           // Recovery
           if (looksLikePatternStart(next)) {
             // If this looks like the start of a pattern, then report an error,

diff --git a/pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart b/pkg/analyzer/lib/src/error/deprecated_member_use_verifier.dart
@@ -183,13 +183,12 @@ abstract class BaseDeprecatedMemberUseVerifier {
 
     String displayName = element!.displayName;
     if (element is ConstructorElement) {
-      // TODO(jwren) We should modify ConstructorElement.getDisplayName(),
+      // TODO(jwren) We should modify ConstructorElement.displayName,
       // or have the logic centralized elsewhere, instead of doing this logic
       // here.
-      displayName = element.enclosingElement.displayName;
-      if (element.displayName.isNotEmpty) {
-        displayName = "$displayName.${element.displayName}";
-      }
+      displayName = element.name == ''
+          ? '${element.displayName}.new'
+          : element.displayName;
     } else if (element is LibraryElement) {
       displayName = element.definingCompilationUnit.source.uri.toString();
     } else if (node is MethodInvocation &&