Version 3.5.0-67.0.dev

Merge 95d8710 into dev

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

@@ -1241,6 +1241,12 @@ CompileTimeErrorCode.NON_CONSTANT_MAP_VALUE_FROM_DEFERRED_LIBRARY:
   status: needsFix
   notes: |-
     Remove the `deferred` keyword from the import.
+CompileTimeErrorCode.NON_CONSTANT_RECORD_FIELD:
+  status: noFix
+CompileTimeErrorCode.NON_CONSTANT_RECORD_FIELD_FROM_DEFERRED_LIBRARY:
+  status: needsFix
+  notes: |-
+    Remove the `deferred` keyword from the import.
 CompileTimeErrorCode.NON_CONSTANT_RELATIONAL_PATTERN_EXPRESSION:
   status: hasFix
   notes: |-

pkg/analyzer/lib/src/dart/constant/constant_verifier.dart

@@ -256,7 +256,7 @@ class ConstantVerifier extends RecursiveAstVisitor<void> {
   @override
   void visitInstanceCreationExpression(InstanceCreationExpression node) {
     if (node.isConst) {
-      NamedType namedType = node.constructorName.type;
+      var namedType = node.constructorName.type;
       _checkForConstWithTypeParameters(
           namedType, CompileTimeErrorCode.CONST_WITH_TYPE_PARAMETERS);
 
@@ -299,13 +299,13 @@ class ConstantVerifier extends RecursiveAstVisitor<void> {
     super.visitListLiteral(node);
     if (node.isConst) {
       var nodeType = node.staticType as InterfaceType;
-      DartType elementType = nodeType.typeArguments[0];
+      var elementType = nodeType.typeArguments[0];
       var verifier = _ConstLiteralVerifier(
         this,
         errorCode: CompileTimeErrorCode.NON_CONSTANT_LIST_ELEMENT,
         listElementType: elementType,
       );
-      for (CollectionElement element in node.elements) {
+      for (var element in node.elements) {
         verifier.verify(element);
       }
     }
@@ -315,7 +315,7 @@ class ConstantVerifier extends RecursiveAstVisitor<void> {
   void visitMapPattern(MapPattern node) {
     node.typeArguments?.accept(this);
 
-    final featureSet = _currentLibrary.featureSet;
+    var featureSet = _currentLibrary.featureSet;
     var uniqueKeys = HashMap<DartObjectImpl, Expression>(
       hashCode: (_) => 0,
       equals: (a, b) {
@@ -367,6 +367,20 @@ class ConstantVerifier extends RecursiveAstVisitor<void> {
     _validateDefaultValues(node.parameters);
   }
 
+  @override
+  void visitRecordLiteral(RecordLiteral node) {
+    super.visitRecordLiteral(node);
+
+    if (node.isConst) {
+      for (var field in node.fields) {
+        _evaluateAndReportError(
+          field,
+          CompileTimeErrorCode.NON_CONSTANT_RECORD_FIELD,
+        );
+      }
+    }
+  }
+
   @override
   void visitRelationalPattern(RelationalPattern node) {
     super.visitRelationalPattern(node);
@@ -403,7 +417,6 @@ class ConstantVerifier extends RecursiveAstVisitor<void> {
         var nodeType = node.staticType as InterfaceType;
         var keyType = nodeType.typeArguments[0];
         var valueType = nodeType.typeArguments[1];
-        bool reportEqualKeys = true;
         var config = _MapVerifierConfig(
           keyType: keyType,
           valueType: valueType,
@@ -413,16 +426,12 @@ class ConstantVerifier extends RecursiveAstVisitor<void> {
           errorCode: CompileTimeErrorCode.NON_CONSTANT_MAP_ELEMENT,
           mapConfig: config,
         );
-        for (CollectionElement entry in node.elements) {
+        for (var entry in node.elements) {
           verifier.verify(entry);
         }
-        if (reportEqualKeys) {
-          for (var duplicateEntry in config.duplicateKeys.entries) {
-            _errorReporter.reportError(_diagnosticFactory.equalKeysInConstMap(
-                _errorReporter.source,
-                duplicateEntry.key,
-                duplicateEntry.value));
-          }
+        for (var duplicateEntry in config.duplicateKeys.entries) {
+          _errorReporter.reportError(_diagnosticFactory.equalKeysInConstMap(
+              _errorReporter.source, duplicateEntry.key, duplicateEntry.value));
         }
       }
     }
@@ -689,6 +698,10 @@ class ConstantVerifier extends RecursiveAstVisitor<void> {
             errorCode,
             CompileTimeErrorCode
                 .NON_CONSTANT_LIST_ELEMENT_FROM_DEFERRED_LIBRARY) ||
+        identical(
+            errorCode,
+            CompileTimeErrorCode
+                .NON_CONSTANT_RECORD_FIELD_FROM_DEFERRED_LIBRARY) ||
         identical(
             errorCode,
             CompileTimeErrorCode
@@ -1131,7 +1144,7 @@ class _ConstLiteralVerifier {
     );
   }
 
-  /// Return `true` if the [node] is a potential constant.
+  /// Returns whether the [node] is a potential constant.
   bool _reportNotPotentialConstants(AstNode node) {
     var notPotentiallyConstants = getNotPotentiallyConstants(
       node,

pkg/analyzer/lib/src/dart/constant/evaluation.dart

@@ -1721,8 +1721,8 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
         switch (evaluationResult) {
           case null:
             // The constant value isn't computed yet, or there is an error while
-            // computing. We will mark it and determine whether or not to continue
-            // the evaluation upstream.
+            // computing. We will mark it and determine whether or not to
+            // continue the evaluation upstream.
             return InvalidConstant.genericError(errorNode, isUnresolved: true);
           case DartObjectImpl():
             if (identifier == null) {
@@ -1856,6 +1856,9 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
             return CompileTimeErrorCode
                 .NON_CONSTANT_MAP_VALUE_FROM_DEFERRED_LIBRARY;
           }
+        } else if (current is RecordLiteral) {
+          return CompileTimeErrorCode
+              .NON_CONSTANT_RECORD_FIELD_FROM_DEFERRED_LIBRARY;
         } else if (current is SetOrMapLiteral) {
           return CompileTimeErrorCode.SET_ELEMENT_FROM_DEFERRED_LIBRARY;
         } else if (current is SpreadElement) {

pkg/analyzer/lib/src/dart/constant/utilities.dart

@@ -51,6 +51,15 @@ class ConstantExpressionsDependenciesFinder extends RecursiveAstVisitor {
     super.visitMapPatternEntry(node);
   }
 
+  @override
+  void visitRecordLiteral(RecordLiteral node) {
+    if (node.isConst) {
+      _find(node);
+    } else {
+      super.visitRecordLiteral(node);
+    }
+  }
+
   @override
   void visitRelationalPattern(RelationalPattern node) {
     _find(node.operand);

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

@@ -3779,6 +3779,26 @@ class CompileTimeErrorCode extends AnalyzerErrorCode {
     uniqueName: 'NON_CONSTANT_MAP_VALUE_FROM_DEFERRED_LIBRARY',
   );
 
+  ///  No parameters.
+  static const CompileTimeErrorCode NON_CONSTANT_RECORD_FIELD =
+      CompileTimeErrorCode(
+    'NON_CONSTANT_RECORD_FIELD',
+    "The fields in a const record literal must be constants.",
+    correctionMessage:
+        "Try removing the keyword 'const' from the record literal.",
+  );
+
+  ///  No parameters.
+  static const CompileTimeErrorCode
+      NON_CONSTANT_RECORD_FIELD_FROM_DEFERRED_LIBRARY = CompileTimeErrorCode(
+    'NON_CONSTANT_RECORD_FIELD_FROM_DEFERRED_LIBRARY',
+    "Constant values from a deferred library can't be used as fields in a "
+        "'const' record literal.",
+    correctionMessage:
+        "Try removing the keyword 'const' from the record literal or removing "
+        "the keyword 'deferred' from the import.",
+  );
+
   ///  No parameters.
   static const CompileTimeErrorCode NON_CONSTANT_RELATIONAL_PATTERN_EXPRESSION =
       CompileTimeErrorCode(

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

@@ -393,6 +393,8 @@ const List<ErrorCode> errorCodeValues = [
   CompileTimeErrorCode.NON_CONSTANT_MAP_PATTERN_KEY,
   CompileTimeErrorCode.NON_CONSTANT_MAP_VALUE,
   CompileTimeErrorCode.NON_CONSTANT_MAP_VALUE_FROM_DEFERRED_LIBRARY,
+  CompileTimeErrorCode.NON_CONSTANT_RECORD_FIELD,
+  CompileTimeErrorCode.NON_CONSTANT_RECORD_FIELD_FROM_DEFERRED_LIBRARY,
   CompileTimeErrorCode.NON_CONSTANT_RELATIONAL_PATTERN_EXPRESSION,
   CompileTimeErrorCode.NON_CONSTANT_SET_ELEMENT,
   CompileTimeErrorCode.NON_CONST_GENERATIVE_ENUM_CONSTRUCTOR,

pkg/analyzer/lib/src/lint/linter.dart

@@ -885,6 +885,7 @@ class _ConstantAnalysisErrorListener extends AnalysisErrorListener {
         case CompileTimeErrorCode.NON_CONSTANT_MAP_ELEMENT:
         case CompileTimeErrorCode.NON_CONSTANT_MAP_KEY:
         case CompileTimeErrorCode.NON_CONSTANT_MAP_VALUE:
+        case CompileTimeErrorCode.NON_CONSTANT_RECORD_FIELD:
         case CompileTimeErrorCode.NON_CONSTANT_SET_ELEMENT:
           hasConstError = true;
       }

pkg/analyzer/messages.yaml

@@ -1835,12 +1835,6 @@ CompileTimeErrorCode:
         const E();
       }
       ```
-  NON_CONSTANT_MAP_KEY_FROM_DEFERRED_LIBRARY:
-    sharedName: COLLECTION_ELEMENT_FROM_DEFERRED_LIBRARY
-    problemMessage: "Constant values from a deferred library can't be used as keys in a 'const' map literal."
-    correctionMessage: "Try removing the keyword 'const' from the map literal or removing the keyword 'deferred' from the import."
-    hasPublishedDocs: true
-    comment: No parameters.
   NON_CONSTANT_LIST_ELEMENT_FROM_DEFERRED_LIBRARY:
     sharedName: COLLECTION_ELEMENT_FROM_DEFERRED_LIBRARY
     problemMessage: "Constant values from a deferred library can't be used as values in a 'const' list literal."
@@ -1904,6 +1898,23 @@ CompileTimeErrorCode:
       ```dart
       var l = const [0];
       ```
+  NON_CONSTANT_MAP_KEY_FROM_DEFERRED_LIBRARY:
+    sharedName: COLLECTION_ELEMENT_FROM_DEFERRED_LIBRARY
+    problemMessage: "Constant values from a deferred library can't be used as keys in a 'const' map literal."
+    correctionMessage: "Try removing the keyword 'const' from the map literal or removing the keyword 'deferred' from the import."
+    hasPublishedDocs: true
+    comment: No parameters.
+  NON_CONSTANT_MAP_VALUE_FROM_DEFERRED_LIBRARY:
+    sharedName: COLLECTION_ELEMENT_FROM_DEFERRED_LIBRARY
+    problemMessage: "Constant values from a deferred library can't be used as values in a 'const' map literal."
+    correctionMessage: "Try removing the keyword 'const' from the map literal or removing the keyword 'deferred' from the import."
+    hasPublishedDocs: true
+    comment: No parameters.
+  NON_CONSTANT_RECORD_FIELD_FROM_DEFERRED_LIBRARY:
+    problemMessage: "Constant values from a deferred library can't be used as fields in a 'const' record literal."
+    correctionMessage: "Try removing the keyword 'const' from the record literal or removing the keyword 'deferred' from the import."
+    hasPublishedDocs: false
+    comment: No parameters.
   PATTERN_CONSTANT_FROM_DEFERRED_LIBRARY:
     problemMessage: Constant values from a deferred library can't be used in patterns.
     correctionMessage: Try removing the keyword 'deferred' from the import.
@@ -1997,12 +2008,6 @@ CompileTimeErrorCode:
     correctionMessage: "Try removing the keyword 'const' from the set literal or removing the keyword 'deferred' from the import."
     hasPublishedDocs: true
     comment: No parameters.
-  NON_CONSTANT_MAP_VALUE_FROM_DEFERRED_LIBRARY:
-    sharedName: COLLECTION_ELEMENT_FROM_DEFERRED_LIBRARY
-    problemMessage: "Constant values from a deferred library can't be used as values in a 'const' map literal."
-    correctionMessage: "Try removing the keyword 'const' from the map literal or removing the keyword 'deferred' from the import."
-    hasPublishedDocs: true
-    comment: No parameters.
   CONCRETE_CLASS_HAS_ENUM_SUPERINTERFACE:
     problemMessage: "Concrete classes can't have 'Enum' as a superinterface."
     correctionMessage: Try specifying a different interface, or remove it from the list.
@@ -11529,6 +11534,11 @@ CompileTimeErrorCode:
       var a = 'a';
       var m = {0: a};
       ```
+  NON_CONSTANT_RECORD_FIELD:
+    problemMessage: The fields in a const record literal must be constants.
+    correctionMessage: "Try removing the keyword 'const' from the record literal."
+    hasPublishedDocs: false
+    comment: No parameters.
   NON_CONSTANT_RELATIONAL_PATTERN_EXPRESSION:
     problemMessage: The relational pattern expression must be a constant.
     correctionMessage: Try using a constant instead.

pkg/analyzer/test/src/dart/constant/evaluation_test.dart

@@ -2702,6 +2702,15 @@ Record({int f1, int f2})
 ''');
   }
 
+  test_visitRecordLiteral_namedField_final() async {
+    await assertErrorsInCode(r'''
+final bar = '';
+({String bar, }) foo() => const (bar: bar, );
+''', [
+      error(CompileTimeErrorCode.NON_CONSTANT_RECORD_FIELD, 54, 3),
+    ]);
+  }
+
   test_visitRecordLiteral_objectField_generic() async {
     await assertNoErrorsInCode(r'''
 class A<T> {
@@ -2737,6 +2746,15 @@ Record(int, int, int)
 ''');
   }
 
+  test_visitRecordLiteral_positionalField_final() async {
+    await assertErrorsInCode(r'''
+final bar = '';
+(String, ) foo() => const (bar, );
+''', [
+      error(CompileTimeErrorCode.NON_CONSTANT_RECORD_FIELD, 43, 3),
+    ]);
+  }
+
   test_visitRecordLiteral_withoutEnvironment() async {
     await assertNoErrorsInCode(r'''
 const a = (1, 'b', c: false);
@@ -4881,18 +4899,6 @@ const a = bool.fromEnvironment('dart.library.js_util');
 ''');
   }
 
-  test_bool_fromEnvironment_dartLibraryJsUtil_ifElement_list() async {
-    await assertNoErrorsInCode('''
-const a = bool.fromEnvironment('dart.library.js_util');
-const x = [3, if (a) ...[1] else ...[1, 2], 4];
-''');
-    final result = _topLevelVar('x');
-    assertDartObjectText(result, '''
-<unknown> List<int>
-  variable: self::@variable::x
-''');
-  }
-
   test_bool_fromEnvironment_dartLibraryJsUtil_ifElement_list_eqeq_known() async {
     await assertNoErrorsInCode('''
 const a = bool.fromEnvironment('dart.library.js_util');
@@ -5059,6 +5065,32 @@ class A {
     ]);
   }
 
+  test_bool_fromEnvironment_dartLibraryJsUtil_ifStatement_list() async {
+    await assertNoErrorsInCode('''
+const a = bool.fromEnvironment('dart.library.js_util');
+const x = [3, if (a) ...[1] else ...[1, 2], 4];
+''');
+    final result = _topLevelVar('x');
+    assertDartObjectText(result, '''
+<unknown> List<int>
+  variable: self::@variable::x
+''');
+  }
+
+  test_bool_fromEnvironment_dartLibraryJsUtil_recordField_nonConstant() async {
+    await assertErrorsInCode('''
+const a = bool.fromEnvironment('dart.library.js_util');
+var b = 7;
+var x = const A((b, ));
+
+class A {
+  const A((int, ) p);
+}
+''', [
+      error(CompileTimeErrorCode.INVALID_CONSTANT, 84, 1),
+    ]);
+  }
+
   test_bool_hasEnvironment() async {
     await assertNoErrorsInCode('''
 const a = bool.hasEnvironment('a');
@@ -5307,6 +5339,20 @@ void main() {
     ]);
   }
 
+  @FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/55467')
+  test_listLiteral_expression_nonConstant() async {
+    await assertErrorsInCode('''
+var b = 7;
+var x = const A([b]);
+
+class A {
+  const A(List<int> p);
+}
+''', [
+      error(CompileTimeErrorCode.NON_CONSTANT_LIST_ELEMENT, 28, 1),
+    ]);
+  }
+
   test_redirectingConstructor_typeParameter() async {
     await assertNoErrorsInCode('''
 class A<T> {