| Index: pkg/analyzer/test/generated/resolver_test.dart
|
| diff --git a/pkg/analyzer/test/generated/resolver_test.dart b/pkg/analyzer/test/generated/resolver_test.dart
|
| index 0c45439bc9831c819fb7e9e33df2a5b52477c4d1..4f24b3abe76efdf10461c06f6cef44bfdcb0349f 100644
|
| --- a/pkg/analyzer/test/generated/resolver_test.dart
|
| +++ b/pkg/analyzer/test/generated/resolver_test.dart
|
| @@ -12760,14 +12760,22 @@ f() {
|
| }
|
|
|
| void test_mergePropagatedTypes_afterIfThen_different() {
|
| - _assertTypeOfMarkedExpression(r'''
|
| + String code = r'''
|
| main() {
|
| var v = 0;
|
| if (v != null) {
|
| v = '';
|
| }
|
| - return v; // marker
|
| -}''', null, null);
|
| + return v;
|
| +}''';
|
| + {
|
| + SimpleIdentifier identifier = _findMarkedIdentifier(code, "v;");
|
| + expect(identifier.propagatedType, null);
|
| + }
|
| + {
|
| + SimpleIdentifier identifier = _findMarkedIdentifier(code, "v = '';");
|
| + expect(identifier.propagatedType, typeProvider.stringType);
|
| + }
|
| }
|
|
|
| void test_mergePropagatedTypes_afterIfThen_same() {
|
|
|