Version 3.13.0-151.0.dev

Merge 3b81982 into dev

Author: Dart CI

DEPS

@@ -59,7 +59,7 @@ vars = {
 
   # co19 is a cipd package automatically generated for each co19 commit.
   # Use tests/co19/update.sh to update this hash.
-  "co19_rev": "8a302a4666a9adae63b52fb49f37e7407935f13c",
+  "co19_rev": "4d2914a4cbb97eeb67ebcc6618bead6a584beb1e",
 
   # The internal benchmarks to use. See go/dart-benchmarks-internal
   "benchmarks_internal_rev": "6058722b4643b62c757dadc006f00bc3e14c4380",

pkg/analysis_server/lib/src/services/correction/dart/convert_to_initializing_formal.dart

@@ -346,20 +346,24 @@ class ConvertToInitializingFormal extends ResolvedCorrectionProducer {
       if (parameterName == null) return;
       var container = node.thisOrAncestorOfType<CompilationUnitMember>();
       if (container == null) return;
-      if (parameter.functionTypedSuffix != null) return;
+
       await builder.addDartFileEdit(file, (builder) {
-        var type = parameter.type;
         // Remove the `var` or `final` keyword, and add `this.`.
         builder.addSimpleReplacement(
           range.startStart(keyword, parameterName),
           'this.',
         );
+        // Remove the function parameters, if there are any.
+        var suffix = parameter.functionTypedSuffix;
+        if (suffix != null) {
+          builder.addDeletion(range.node(suffix));
+        }
         // Add the field.
         builder.insertField(container, (builder) {
           builder.writeFieldDeclaration(
             parameterName.lexeme,
             isFinal: keyword.keyword == Keyword.FINAL,
-            type: type?.type,
+            type: parameter.declaredFragment?.element.type,
           );
         });
       });

pkg/analysis_server/test/src/services/correction/assist/convert_to_initializing_formal_test.dart

@@ -295,7 +295,11 @@ class C(this.test) {
     await resolveTestCode('''
 class C(var int ^test(String));
 ''');
-    await assertNoAssist();
+    await assertHasAssist('''
+class C(this.test) {
+  int Function(String) test;
+}
+''');
   }
 
   Future<void> test_parameterDeclaration_primary_declaring_var() async {

pkg/analyzer/lib/src/error/unused_local_elements_verifier.dart

@@ -115,19 +115,6 @@ class GatherUsedLocalElementsVisitor extends RecursiveAstVisitor<void> {
         );
       }
     }
-
-    for (var parameter in node.parameters.parameters) {
-      if (parameter is SuperFormalParameter) {
-        var element = parameter.declaredFragment?.element;
-        if (element is SuperFormalParameterElement) {
-          var superConstructorParameter = element.superConstructorParameter;
-          if (superConstructorParameter != null) {
-            usedElements.addElement(superConstructorParameter);
-          }
-        }
-      }
-    }
-
     super.visitConstructorDeclaration(node);
   }
 
@@ -368,6 +355,18 @@ class GatherUsedLocalElementsVisitor extends RecursiveAstVisitor<void> {
     super.visitSuperConstructorInvocation(node);
   }
 
+  @override
+  void visitSuperFormalParameter(SuperFormalParameter node) {
+    var element = node.declaredFragment?.element;
+    if (element is SuperFormalParameterElement) {
+      var superConstructorParameter = element.superConstructorParameter;
+      if (superConstructorParameter != null) {
+        usedElements.addElement(superConstructorParameter);
+      }
+    }
+    super.visitSuperFormalParameter(node);
+  }
+
   @override
   void visitVariableDeclarationList(VariableDeclarationList node) {
     node.metadata.accept(this);

pkg/analyzer/test/src/diagnostics/unused_element_test.dart

@@ -3266,6 +3266,30 @@ f() => A()._m(0);
 ''');
   }
 
+  test_parameter_isUsed_superParameter_inPrimaryConstructor_optionalNamed() async {
+    await resolveTestCodeWithDiagnostics(r'''
+class _BaseNamedOptional({final int? value});
+
+class SubNamedOptional({super.value}) extends _BaseNamedOptional;
+
+void main() {
+  print(SubNamedOptional(value: 42));
+}
+''');
+  }
+
+  test_parameter_isUsed_superParameter_inPrimaryConstructor_optionalPositional() async {
+    await resolveTestCodeWithDiagnostics(r'''
+class _BaseOptional([final int? value]);
+
+class SubOptional(super.value) extends _BaseOptional;
+
+void main() {
+  print(SubOptional(42));
+}
+''');
+  }
+
   test_parameter_isUsed_topLevel() async {
     await resolveTestCodeWithDiagnostics(r'''
 void _m([int? a]) {}

pkg/front_end/lib/src/base/incremental_compiler.dart

@@ -93,11 +93,8 @@ import '../kernel/benchmarker.dart' show BenchmarkPhases, Benchmarker;
 import '../kernel/dart_scope_calculator.dart' show DartScope, DartScopeBuilder2;
 import '../kernel/hierarchy/hierarchy_builder.dart' show ClassHierarchyBuilder;
 import '../kernel/internal_ast.dart'
-    show
-        VariableDeclarationImpl,
-        InternalVariableGet,
-        InternalVariableSet,
-        InternalVariable;
+    show InternalVariableGet, InternalVariableSet, InternalVariable;
+import '../kernel/internal_ast_helper.dart' as intern;
 import '../kernel/kernel_target.dart' show BuildResult, KernelTarget;
 import '../source/check_helper.dart';
 import '../source/source_compilation_unit.dart' show SourceCompilationUnitImpl;
@@ -1877,7 +1874,7 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
         return null;
       }
       LibraryBuilder libraryBuilder = compilationUnit.libraryBuilder;
-      List<VariableDeclarationImpl> extraKnownVariables = [];
+      List<InternalVariable> extraKnownVariables = [];
       String? usedMethodName = methodName;
       Substitution? substitution;
       if (scriptUri != null && offset != TreeNode.noOffset) {
@@ -1942,8 +1939,11 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
                   def.value.isConst &&
                   def.value.initializer is ConstantExpression) {
                 extraKnownVariables.add(
-                  new VariableDeclarationImpl(
-                    def.key,
+                  intern.createLocalVariable(
+                    isClosureContextLoweringEnabled: lastGoodKernelTarget
+                        .loader
+                        .isClosureContextLoweringEnabled,
+                    name: def.key,
                     type: substitution.substituteType(def.value.type),
                     isConst: true,
                     hasDeclaredInitializer: true,
@@ -1962,8 +1962,11 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
                 // captured? Either way there's something shadowing any fields
                 // etc.
                 extraKnownVariables.add(
-                  new VariableDeclarationImpl(
-                    def.key,
+                  intern.createLocalVariable(
+                    isClosureContextLoweringEnabled: lastGoodKernelTarget
+                        .loader
+                        .isClosureContextLoweringEnabled,
+                    name: def.key,
                     type: substitution.substituteType(def.value.type),
                     isConst: false,
                     fileOffset: def.value.fileOffset,
@@ -2225,7 +2228,7 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
       MemoryFileSystem fs = hfs.memory;
       fs.entityForUri(debugExprUri).writeAsStringSync(expression);
 
-      Variable? extensionThis;
+      InternalVariable? extensionThis;
 
       // TODO: pass variable declarations instead of
       // parameter names for proper location detection.
@@ -2236,8 +2239,10 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
         positionalParameters: usedDefinitions.entries.map<Variable>((
           MapEntry<String, DartType> def,
         ) {
-          VariableDeclarationImpl variable = new VariableDeclarationImpl(
-            def.key,
+          InternalVariable variable = intern.createPositionalParameter(
+            isClosureContextLoweringEnabled:
+                lastGoodKernelTarget.loader.isClosureContextLoweringEnabled,
+            cosmeticName: def.key,
             type: def.value,
             fileOffset: offsetToUse ?? libraryBuilder.library.fileOffset,
           );
@@ -2248,7 +2253,7 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
             // The `#this` variable is special.
             extensionThis = variable..isLowered = true;
           }
-          return variable;
+          return variable.astVariable;
         }).toList(),
       );
 
@@ -2390,13 +2395,18 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
         String path = importUri.path;
         int firstSlash = path.indexOf('/');
         String packageName = path.substring(0, firstSlash);
+        Package? previousPackage = _previousPackagesMap?[packageName];
+        Package? currentPackage = _currentPackagesMap![packageName];
         if (_previousPackagesMap == null ||
-            !_packagesEqual(
-              _previousPackagesMap![packageName],
-              _currentPackagesMap![packageName],
-            )) {
+            !_packagesEqual(previousPackage, currentPackage)) {
+          // TODO(jensj): If the package has changed do we need to check the
+          // uri/language version before bailing? If for instance we don't care
+          // about the "extraData" field, we should probably just not check that
+          // in "_packagesEqual".
           Uri? newFileUri = uriTranslator.translate(importUri, false);
-          if (newFileUri != fileUri) {
+          if (newFileUri != fileUri ||
+              previousPackage?.languageVersion !=
+                  currentPackage?.languageVersion) {
             invalidatedBecauseOfPackageUpdate = true;
             return true;
           }
@@ -2555,10 +2565,10 @@ class ExpressionEvaluationHelperImpl implements ExpressionEvaluationHelper {
   final ClassHierarchy hierarchy;
 
   ExpressionEvaluationHelperImpl(
-    List<VariableDeclarationImpl> extraKnown,
+    List<InternalVariable> extraKnown,
     this.hierarchy,
   ) {
-    for (VariableDeclarationImpl variable in extraKnown) {
+    for (InternalVariable variable in extraKnown) {
       if (variable.isConst) {
         // We allow const variables - these are inlined (we check
         // `alwaysInlineConstants` in `compileExpression`).

pkg/front_end/lib/src/base/modifiers.dart

@@ -332,6 +332,7 @@ extension type const Modifiers(int _mask) implements Object {
   /// ```
   static const Modifiers Required = const Modifiers(_requiredMask);
 
+  // Coverage-ignore(suite): Not run.
   /// Returns `true` if the set of modifiers contains `required'.
   bool get isRequired => (_mask & _requiredMask) != 0;