Version 2.18.0-189.0.dev

Merge commit 'd6e5a0fc49cf47a3bfc9dc47c23de6abcbfa3435' into 'dev'

Author: Dart CI

pkg/analysis_server/lib/src/utilities/flutter.dart

@@ -266,7 +266,8 @@ class Flutter {
             parent is IfElement && parent.elseElement == node ||
             parent is ListLiteral ||
             parent is NamedExpression && parent.expression == node ||
-            parent is Statement) {
+            parent is Statement ||
+            parent is VariableDeclaration) {
           return node as Expression;
         }
       }

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

@@ -133,6 +133,27 @@ class FakeFlutter {
     }
   );
 }
+''');
+  }
+
+  Future<void> test_variableDeclaration() async {
+    await resolveTestCode('''
+import 'package:flutter/widgets.dart';
+
+void f() {
+  Widget w = /*caret*/Container();
+}
+''');
+    await assertHasAssist('''
+import 'package:flutter/widgets.dart';
+
+void f() {
+  Widget w = Builder(
+    builder: (context) {
+      return Container();
+    }
+  );
+}
 ''');
   }
 }

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

@@ -120,4 +120,32 @@ class FakeFlutter {
 }
 ''');
   }
+
+  Future<void> test_variableDeclaration() async {
+    await resolveTestCode('''
+import 'package:flutter/widgets.dart';
+
+void f() {
+  Widget w = /*caret*/Container();
+}
+''');
+    await assertHasAssist('''
+import 'package:flutter/widgets.dart';
+
+void f() {
+  Widget w = Center(child: Container());
+}
+''');
+  }
+
+  Future<void> test_variableDeclaration_name() async {
+    await resolveTestCode('''
+import 'package:flutter/widgets.dart';
+
+void f() {
+  Widget /*caret*/w = Container();
+}
+''');
+    await assertNoAssist();
+  }
 }

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

@@ -120,6 +120,23 @@ import 'package:flutter/widgets.dart';
 class FakeFlutter {
   Widget f() => SizedBox(child: Container());
 }
+''');
+  }
+
+  Future<void> test_variableDeclaration() async {
+    await resolveTestCode('''
+import 'package:flutter/widgets.dart';
+
+void f() {
+  Widget w = /*caret*/Container();
+}
+''');
+    await assertHasAssist('''
+import 'package:flutter/widgets.dart';
+
+void f() {
+  Widget w = SizedBox(child: Container());
+}
 ''');
   }
 }

pkg/front_end/lib/src/fasta/kernel/constant_evaluator.dart

@@ -2689,7 +2689,7 @@ class ConstantEvaluator implements ExpressionVisitor<Constant> {
       return unevaluated(
           node,
           new ConditionalExpression(extract(condition), extract(then),
-              extract(otherwise), node.staticType));
+              extract(otherwise), env.substituteType(node.staticType)));
     } else {
       return createEvaluationErrorConstant(
           node.condition,

pkg/front_end/lib/src/fasta/kernel/inference_visitor.dart

@@ -48,22 +48,36 @@ class InferenceVisitor
 
   Class? mapEntryClass;
 
+  /// Context information for the current closure, or `null` if we are not
+  /// inside a closure.
+  ClosureContext? _closureContext;
+
   InferenceVisitor(this.inferrer);
 
+  ClosureContext get closureContext => _closureContext!;
+
   /// Performs type inference on the given [statement].
   ///
-  /// Derived classes should override this method with logic that dispatches on
-  /// the statement type and calls the appropriate specialized "infer" method.
-  StatementInferenceResult inferStatement(Statement statement) {
+  /// If [closureContext] is not null, the [statement] is inferred using
+  /// [closureContext] as the current context.
+  StatementInferenceResult inferStatement(Statement statement,
+      [ClosureContext? closureContext]) {
+    ClosureContext? oldClosureContext = _closureContext;
+    if (closureContext != null) {
+      _closureContext = closureContext;
+    }
     inferrer.registerIfUnreachableForTesting(statement);
 
     // For full (non-top level) inference, we need access to the
     // ExpressionGeneratorHelper so that we can perform error recovery.
+    StatementInferenceResult result;
     if (statement is InternalStatement) {
-      return statement.acceptInference(this);
+      result = statement.acceptInference(this);
     } else {
-      return statement.accept(this);
+      result = statement.accept(this);
     }
+    _closureContext = oldClosureContext;
+    return result;
   }
 
   /// Performs type inference on the given [expression].
@@ -6093,7 +6107,6 @@ class InferenceVisitor
   @override
   StatementInferenceResult visitReturnStatement(
       covariant ReturnStatementImpl node) {
-    ClosureContext closureContext = inferrer.closureContext!;
     DartType typeContext = closureContext.returnContext;
     DartType inferredType;
     if (node.expression != null) {
@@ -7075,7 +7088,6 @@ class InferenceVisitor
 
   @override
   StatementInferenceResult visitYieldStatement(YieldStatement node) {
-    ClosureContext closureContext = inferrer.closureContext!;
     ExpressionInferenceResult expressionResult;
     DartType typeContext = closureContext.yieldContext;
     if (node.isYieldStar && typeContext is! UnknownType) {

pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart

@@ -275,10 +275,6 @@ class TypeInferrerImpl implements TypeInferrer {
 
   InferenceHelper? _helper;
 
-  /// Context information for the current closure, or `null` if we are not
-  /// inside a closure.
-  ClosureContext? closureContext;
-
   TypeInferrerImpl(
       this.engine,
       this.uriForInstrumentation,
@@ -2047,7 +2043,6 @@ class TypeInferrerImpl implements TypeInferrer {
   @override
   ExpressionInferenceResult inferFieldInitializer(
       InferenceHelper helper, DartType declaredType, Expression initializer) {
-    assert(closureContext == null);
     assert(!isTopLevel);
     this.helper = helper;
     InferenceVisitor visitor = _createInferenceVisitor();
@@ -2064,24 +2059,23 @@ class TypeInferrerImpl implements TypeInferrer {
       DartType returnType, AsyncMarker asyncMarker, Statement body) {
     // ignore: unnecessary_null_comparison
     assert(body != null);
-    // ignore: unnecessary_null_comparison
-    assert(closureContext == null);
     this.helper = helper;
-    closureContext = new ClosureContext(this, asyncMarker, returnType, false);
+    ClosureContext closureContext =
+        new ClosureContext(this, asyncMarker, returnType, false);
     InferenceVisitor visitor = _createInferenceVisitor();
-    StatementInferenceResult result = visitor.inferStatement(body);
+    StatementInferenceResult result =
+        visitor.inferStatement(body, closureContext);
     if (dataForTesting != null) {
       if (!flowAnalysis.isReachable) {
         dataForTesting!.flowAnalysisResult.functionBodiesThatDontComplete
             .add(body);
       }
     }
     result =
-        closureContext!.handleImplicitReturn(this, body, result, fileOffset);
-    DartType? futureValueType = closureContext!.futureValueType;
+        closureContext.handleImplicitReturn(this, body, result, fileOffset);
+    DartType? futureValueType = closureContext.futureValueType;
     assert(!(asyncMarker == AsyncMarker.Async && futureValueType == null),
         "No future value type computed.");
-    closureContext = null;
     _helper = null;
     flowAnalysis.finish();
     return new InferredFunctionBody(
@@ -2913,12 +2907,10 @@ class TypeInferrerImpl implements TypeInferrer {
     // Apply type inference to `B` in return context `N’`, with any references
     // to `xi` in `B` having type `Pi`.  This produces `B’`.
     bool needToSetReturnType = hasImplicitReturnType;
-    ClosureContext? oldClosureContext = this.closureContext;
     ClosureContext closureContext = new ClosureContext(
         this, function.asyncMarker, returnContext, needToSetReturnType);
-    this.closureContext = closureContext;
     StatementInferenceResult bodyResult =
-        visitor.inferStatement(function.body!);
+        visitor.inferStatement(function.body!, closureContext);
 
     // If the closure is declared with `async*` or `sync*`, let `M` be the
     // least upper bound of the types of the `yield` expressions in `B’`, or
@@ -2947,7 +2939,6 @@ class TypeInferrerImpl implements TypeInferrer {
     if (bodyResult.hasChanged) {
       function.body = bodyResult.statement..parent = function;
     }
-    this.closureContext = oldClosureContext;
     return function.computeFunctionType(libraryBuilder.nonNullable);
   }
 
@@ -4149,7 +4140,6 @@ class TypeInferrerImpl implements TypeInferrer {
       Expression initializer,
       DartType declaredType,
       bool hasDeclaredInitializer) {
-    assert(closureContext == null);
     this.helper = helper;
     // ignore: unnecessary_null_comparison
     assert(declaredType != null);

pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245.dart

@@ -0,0 +1,16 @@
+// Copyright (c) 2022, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+class Foo<T> {
+  const Foo(T Function(String)? foo) : _foo = foo ?? bar;
+  final T Function(String) _foo;
+}
+
+T bar<T>(String o) => o as T;
+
+void main() {
+  const Foo<int> myValue = Foo<int>(
+    bool.fromEnvironment("baz") ? int.parse : null,
+  );
+}

pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245.dart.textual_outline.expect

@@ -0,0 +1,7 @@
+class Foo<T> {
+  const Foo(T Function(String)? foo) : _foo = foo ?? bar;
+  final T Function(String) _foo;
+}
+
+T bar<T>(String o) => o as T;
+void main() {}

pkg/front_end/testcases/general/constants/with_unevaluated_agnostic/issue_49245.dart.textual_outline_modelled.expect

@@ -0,0 +1,8 @@
+T bar<T>(String o) => o as T;
+
+class Foo<T> {
+  const Foo(T Function(String)? foo) : _foo = foo ?? bar;
+  final T Function(String) _foo;
+}
+
+void main() {}