From 5e29849393822dcecc0508f6f7dab8d4d5a7a5a4 Mon Sep 17 00:00:00 2001
From: Paul Berry <paulberry@google.com>
Date: Sat, 15 Oct 2022 13:51:59 +0000
Subject: [PATCH] Parser: consolidate handleCaseMatch and endCaseExpression.

There was no need for both of these listener callbacks, because they
were always called together.  Since `beginCaseExpression` is actually
used, it makes sense to keep `endCaseExpression` and get rid of
`handleCaseMatch`.

Change-Id: I544096b2c2b2814e8cc0c8606455855cb77c9e60
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/264102
Reviewed-by: Jens Johansen <jensj@google.com>
Commit-Queue: Paul Berry <paulberry@google.com>
---
 .../lib/src/parser/forwarding_listener.dart   |  9 +--
 .../lib/src/parser/listener.dart              |  6 +-
 .../lib/src/parser/parser_impl.dart           |  3 +-
 .../lib/src/parser/stack_listener.dart        |  2 +-
 pkg/analyzer/lib/src/fasta/ast_builder.dart   | 68 +++++++++----------
 .../test/generated/parser_fasta_listener.dart |  4 +-
 .../lib/src/fasta/kernel/body_builder.dart    |  8 +--
 .../fasta/kernel/macro/annotation_parser.dart |  7 +-
 .../lib/src/fasta/util/parser_ast_helper.dart | 35 ++--------
 .../nnbd/issue_40267_case_01.dart.expect      |  3 +-
 ...ssue_40267_case_01.dart.intertwined.expect |  3 +-
 .../nnbd/issue_40267_case_02.dart.expect      |  3 +-
 ...ssue_40267_case_02.dart.intertwined.expect |  3 +-
 .../nnbd/issue_40267_case_03.dart.expect      |  3 +-
 ...ssue_40267_case_03.dart.intertwined.expect |  3 +-
 .../nnbd/issue_40267_case_04.dart.expect      |  3 +-
 ...ssue_40267_case_04.dart.intertwined.expect |  3 +-
 .../nnbd/issue_40267_case_05.dart.expect      |  3 +-
 ...ssue_40267_case_05.dart.intertwined.expect |  3 +-
 .../boolean_literal_inside_case.dart.expect   |  3 +-
 ...iteral_inside_case.dart.intertwined.expect |  3 +-
 .../boolean_literal_inside_cast.dart.expect   |  3 +-
 ...iteral_inside_cast.dart.intertwined.expect |  3 +-
 ...ean_literal_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 ...lean_literal_inside_null_check.dart.expect |  3 +-
 ..._inside_null_check.dart.intertwined.expect |  3 +-
 ..._guarded_insideSwitchStatement.dart.expect |  3 +-
 ...ideSwitchStatement.dart.intertwined.expect |  3 +-
 ...nguarded_insideSwitchStatement.dart.expect |  3 +-
 ...ideSwitchStatement.dart.intertwined.expect |  3 +-
 ..._guarded_insideSwitchStatement.dart.expect |  3 +-
 ...ideSwitchStatement.dart.intertwined.expect |  3 +-
 ...nguarded_insideSwitchStatement.dart.expect |  3 +-
 ...ideSwitchStatement.dart.intertwined.expect |  3 +-
 .../patterns/cast_inside_case.dart.expect     |  3 +-
 .../cast_inside_case.dart.intertwined.expect  |  3 +-
 .../cast_inside_extractor_pattern.dart.expect |  3 +-
 ..._extractor_pattern.dart.intertwined.expect |  3 +-
 ...actor_pattern_implicitly_named.dart.expect |  3 +-
 ...n_implicitly_named.dart.intertwined.expect |  3 +-
 .../cast_inside_list_pattern.dart.expect      |  3 +-
 ...nside_list_pattern.dart.intertwined.expect |  3 +-
 .../cast_inside_logical_and_lhs.dart.expect   |  3 +-
 ...de_logical_and_lhs.dart.intertwined.expect |  3 +-
 .../cast_inside_logical_and_rhs.dart.expect   |  3 +-
 ...de_logical_and_rhs.dart.intertwined.expect |  3 +-
 .../cast_inside_logical_or_lhs.dart.expect    |  3 +-
 ...ide_logical_or_lhs.dart.intertwined.expect |  3 +-
 .../cast_inside_logical_or_rhs.dart.expect    |  3 +-
 ...ide_logical_or_rhs.dart.intertwined.expect |  3 +-
 .../cast_inside_map_pattern.dart.expect       |  3 +-
 ...inside_map_pattern.dart.intertwined.expect |  3 +-
 ...t_inside_parenthesized_pattern.dart.expect |  3 +-
 ...enthesized_pattern.dart.intertwined.expect |  3 +-
 ...ecord_pattern_implicitly_named.dart.expect |  3 +-
 ...n_implicitly_named.dart.intertwined.expect |  3 +-
 ...st_inside_record_pattern_named.dart.expect |  3 +-
 ...cord_pattern_named.dart.intertwined.expect |  3 +-
 ..._inside_record_pattern_unnamed.dart.expect |  3 +-
 ...rd_pattern_unnamed.dart.intertwined.expect |  3 +-
 ...fier_doublyPrefixed_insideCase.dart.expect |  3 +-
 ...refixed_insideCase.dart.intertwined.expect |  3 +-
 ...fier_doublyPrefixed_insideCast.dart.expect |  3 +-
 ...refixed_insideCast.dart.intertwined.expect |  3 +-
 ...oublyPrefixed_insideNullAssert.dart.expect |  3 +-
 ...d_insideNullAssert.dart.intertwined.expect |  3 +-
 ...doublyPrefixed_insideNullCheck.dart.expect |  3 +-
 ...ed_insideNullCheck.dart.intertwined.expect |  3 +-
 ...onstant_identifier_inside_case.dart.expect |  3 +-
 ...tifier_inside_case.dart.intertwined.expect |  3 +-
 ...onstant_identifier_inside_cast.dart.expect |  3 +-
 ...tifier_inside_cast.dart.intertwined.expect |  3 +-
 ..._identifier_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 ...t_identifier_inside_null_check.dart.expect |  3 +-
 ..._inside_null_check.dart.intertwined.expect |  3 +-
 ...fixedWithUnderscore_insideCase.dart.expect |  3 +-
 ...erscore_insideCase.dart.intertwined.expect |  3 +-
 ...identifier_prefixed_insideCase.dart.expect |  3 +-
 ...refixed_insideCase.dart.intertwined.expect |  3 +-
 ...identifier_prefixed_insideCast.dart.expect |  3 +-
 ...refixed_insideCast.dart.intertwined.expect |  3 +-
 ...fier_prefixed_insideNullAssert.dart.expect |  3 +-
 ...d_insideNullAssert.dart.intertwined.expect |  3 +-
 ...ifier_prefixed_insideNullCheck.dart.expect |  3 +-
 ...ed_insideNullCheck.dart.intertwined.expect |  3 +-
 ...nt_list_typed_empty_insideCase.dart.expect |  3 +-
 ...d_empty_insideCase.dart.intertwined.expect |  3 +-
 ...nt_list_typed_empty_insideCast.dart.expect |  3 +-
 ...d_empty_insideCast.dart.intertwined.expect |  3 +-
 ...t_typed_empty_insideNullAssert.dart.expect |  3 +-
 ...y_insideNullAssert.dart.intertwined.expect |  3 +-
 ...st_typed_empty_insideNullCheck.dart.expect |  3 +-
 ...ty_insideNullCheck.dart.intertwined.expect |  3 +-
 ...list_typed_nonEmpty_insideCase.dart.expect |  3 +-
 ...onEmpty_insideCase.dart.intertwined.expect |  3 +-
 ...list_typed_nonEmpty_insideCast.dart.expect |  3 +-
 ...onEmpty_insideCast.dart.intertwined.expect |  3 +-
 ...yped_nonEmpty_insideNullAssert.dart.expect |  3 +-
 ...y_insideNullAssert.dart.intertwined.expect |  3 +-
 ...typed_nonEmpty_insideNullCheck.dart.expect |  3 +-
 ...ty_insideNullCheck.dart.intertwined.expect |  3 +-
 ..._list_untyped_empty_insideCase.dart.expect |  3 +-
 ...d_empty_insideCase.dart.intertwined.expect |  3 +-
 ..._list_untyped_empty_insideCast.dart.expect |  3 +-
 ...d_empty_insideCast.dart.intertwined.expect |  3 +-
 ...untyped_empty_insideNullAssert.dart.expect |  3 +-
 ...y_insideNullAssert.dart.intertwined.expect |  3 +-
 ..._untyped_empty_insideNullCheck.dart.expect |  3 +-
 ...ty_insideNullCheck.dart.intertwined.expect |  3 +-
 ...st_untyped_nonEmpty_insideCase.dart.expect |  3 +-
 ...onEmpty_insideCase.dart.intertwined.expect |  3 +-
 ...st_untyped_nonEmpty_insideCast.dart.expect |  3 +-
 ...onEmpty_insideCast.dart.intertwined.expect |  3 +-
 ...yped_nonEmpty_insideNullAssert.dart.expect |  3 +-
 ...y_insideNullAssert.dart.intertwined.expect |  3 +-
 ...typed_nonEmpty_insideNullCheck.dart.expect |  3 +-
 ...ty_insideNullCheck.dart.intertwined.expect |  3 +-
 .../constant_map_typed_insideCase.dart.expect |  3 +-
 ...p_typed_insideCase.dart.intertwined.expect |  3 +-
 .../constant_map_typed_insideCast.dart.expect |  3 +-
 ...p_typed_insideCast.dart.intertwined.expect |  3 +-
 ...ant_map_typed_insideNullAssert.dart.expect |  3 +-
 ...d_insideNullAssert.dart.intertwined.expect |  3 +-
 ...tant_map_typed_insideNullCheck.dart.expect |  3 +-
 ...ed_insideNullCheck.dart.intertwined.expect |  3 +-
 ...onstant_map_untyped_insideCase.dart.expect |  3 +-
 ...untyped_insideCase.dart.intertwined.expect |  3 +-
 ...onstant_map_untyped_insideCast.dart.expect |  3 +-
 ...untyped_insideCast.dart.intertwined.expect |  3 +-
 ...t_map_untyped_insideNullAssert.dart.expect |  3 +-
 ...d_insideNullAssert.dart.intertwined.expect |  3 +-
 ...nt_map_untyped_insideNullCheck.dart.expect |  3 +-
 ...ed_insideNullCheck.dart.intertwined.expect |  3 +-
 ...nt_objectExpression_insideCase.dart.expect |  3 +-
 ...ression_insideCase.dart.intertwined.expect |  3 +-
 ...nt_objectExpression_insideCast.dart.expect |  3 +-
 ...ression_insideCast.dart.intertwined.expect |  3 +-
 ...ectExpression_insideNullAssert.dart.expect |  3 +-
 ...n_insideNullAssert.dart.intertwined.expect |  3 +-
 ...jectExpression_insideNullCheck.dart.expect |  3 +-
 ...on_insideNullCheck.dart.intertwined.expect |  3 +-
 ...stant_parenthesized_insideCase.dart.expect |  3 +-
 ...hesized_insideCase.dart.intertwined.expect |  3 +-
 ...stant_parenthesized_insideCast.dart.expect |  3 +-
 ...hesized_insideCast.dart.intertwined.expect |  3 +-
 ...parenthesized_insideNullAssert.dart.expect |  3 +-
 ...d_insideNullAssert.dart.intertwined.expect |  3 +-
 ..._parenthesized_insideNullCheck.dart.expect |  3 +-
 ...ed_insideNullCheck.dart.intertwined.expect |  3 +-
 .../constant_set_typed_insideCase.dart.expect |  3 +-
 ...t_typed_insideCase.dart.intertwined.expect |  3 +-
 .../constant_set_typed_insideCast.dart.expect |  3 +-
 ...t_typed_insideCast.dart.intertwined.expect |  3 +-
 ...ant_set_typed_insideNullAssert.dart.expect |  3 +-
 ...d_insideNullAssert.dart.intertwined.expect |  3 +-
 ...tant_set_typed_insideNullCheck.dart.expect |  3 +-
 ...ed_insideNullCheck.dart.intertwined.expect |  3 +-
 ...onstant_set_untyped_insideCase.dart.expect |  3 +-
 ...untyped_insideCase.dart.intertwined.expect |  3 +-
 ...onstant_set_untyped_insideCast.dart.expect |  3 +-
 ...untyped_insideCast.dart.intertwined.expect |  3 +-
 ...t_set_untyped_insideNullAssert.dart.expect |  3 +-
 ...d_insideNullAssert.dart.intertwined.expect |  3 +-
 ...nt_set_untyped_insideNullCheck.dart.expect |  3 +-
 ...ed_insideNullCheck.dart.intertwined.expect |  3 +-
 .../double_literal_inside_case.dart.expect    |  3 +-
 ...iteral_inside_case.dart.intertwined.expect |  3 +-
 .../double_literal_inside_cast.dart.expect    |  3 +-
 ...iteral_inside_cast.dart.intertwined.expect |  3 +-
 ...ble_literal_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 ...uble_literal_inside_null_check.dart.expect |  3 +-
 ..._inside_null_check.dart.intertwined.expect |  3 +-
 .../extractor_pattern_inside_cast.dart.expect |  3 +-
 ...attern_inside_cast.dart.intertwined.expect |  3 +-
 ...tor_pattern_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 ...ctor_pattern_inside_null_check.dart.expect |  3 +-
 ..._inside_null_check.dart.intertwined.expect |  3 +-
 ...tractor_pattern_with_type_args.dart.expect |  3 +-
 ...ern_with_type_args.dart.intertwined.expect |  3 +-
 ...h_type_args_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 ...rscore_withTypeArgs_insideCase.dart.expect |  3 +-
 ...ypeArgs_insideCase.dart.intertwined.expect |  3 +-
 ...ore_withoutTypeArgs_insideCase.dart.expect |  3 +-
 ...ypeArgs_insideCase.dart.intertwined.expect |  3 +-
 ...rscore_withTypeArgs_insideCase.dart.expect |  3 +-
 ...ypeArgs_insideCase.dart.intertwined.expect |  3 +-
 ...ore_withoutTypeArgs_insideCase.dart.expect |  3 +-
 ...ypeArgs_insideCase.dart.intertwined.expect |  3 +-
 .../final_variable_inside_case.dart.expect    |  3 +-
 ...riable_inside_case.dart.intertwined.expect |  3 +-
 .../final_variable_inside_cast.dart.expect    |  3 +-
 ...riable_inside_cast.dart.intertwined.expect |  3 +-
 ...al_variable_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 ...nal_variable_inside_null_check.dart.expect |  3 +-
 ..._inside_null_check.dart.intertwined.expect |  3 +-
 .../integer_literal_inside_case.dart.expect   |  3 +-
 ...iteral_inside_case.dart.intertwined.expect |  3 +-
 .../integer_literal_inside_cast.dart.expect   |  3 +-
 ...iteral_inside_cast.dart.intertwined.expect |  3 +-
 ...ger_literal_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 ...eger_literal_inside_null_check.dart.expect |  3 +-
 ..._inside_null_check.dart.intertwined.expect |  3 +-
 .../list_pattern_inside_case.dart.expect      |  3 +-
 ...attern_inside_case.dart.intertwined.expect |  3 +-
 ...list_pattern_inside_case_empty.dart.expect |  3 +-
 ..._inside_case_empty.dart.intertwined.expect |  3 +-
 ...n_inside_case_empty_whitespace.dart.expect |  3 +-
 ...e_empty_whitespace.dart.intertwined.expect |  3 +-
 ...nside_case_with_type_arguments.dart.expect |  3 +-
 ...ith_type_arguments.dart.intertwined.expect |  3 +-
 .../list_pattern_inside_cast.dart.expect      |  3 +-
 ...attern_inside_cast.dart.intertwined.expect |  3 +-
 ...ist_pattern_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 ...list_pattern_inside_null_check.dart.expect |  3 +-
 ..._inside_null_check.dart.intertwined.expect |  3 +-
 ...cal_and_inside_logical_and_lhs.dart.expect |  3 +-
 ...de_logical_and_lhs.dart.intertwined.expect |  3 +-
 ...ical_and_inside_logical_or_lhs.dart.expect |  3 +-
 ...ide_logical_or_lhs.dart.intertwined.expect |  3 +-
 ...ical_and_inside_logical_or_rhs.dart.expect |  3 +-
 ...ide_logical_or_rhs.dart.intertwined.expect |  3 +-
 ...gical_or_inside_logical_or_lhs.dart.expect |  3 +-
 ...ide_logical_or_lhs.dart.intertwined.expect |  3 +-
 .../map_pattern_inside_case.dart.expect       |  3 +-
 ...attern_inside_case.dart.intertwined.expect |  3 +-
 .../map_pattern_inside_case_empty.dart.expect |  3 +-
 ..._inside_case_empty.dart.intertwined.expect |  3 +-
 ...nside_case_with_type_arguments.dart.expect |  3 +-
 ...ith_type_arguments.dart.intertwined.expect |  3 +-
 .../map_pattern_inside_cast.dart.expect       |  3 +-
 ...attern_inside_cast.dart.intertwined.expect |  3 +-
 ...map_pattern_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 .../map_pattern_inside_null_check.dart.expect |  3 +-
 ..._inside_null_check.dart.intertwined.expect |  3 +-
 .../null_assert_inside_case.dart.expect       |  3 +-
 ...assert_inside_case.dart.intertwined.expect |  3 +-
 ...ssert_inside_extractor_pattern.dart.expect |  3 +-
 ..._extractor_pattern.dart.intertwined.expect |  3 +-
 ...actor_pattern_implicitly_named.dart.expect |  3 +-
 ...n_implicitly_named.dart.intertwined.expect |  3 +-
 ...ull_assert_inside_list_pattern.dart.expect |  3 +-
 ...nside_list_pattern.dart.intertwined.expect |  3 +-
 ..._assert_inside_logical_and_lhs.dart.expect |  3 +-
 ...de_logical_and_lhs.dart.intertwined.expect |  3 +-
 ..._assert_inside_logical_and_rhs.dart.expect |  3 +-
 ...de_logical_and_rhs.dart.intertwined.expect |  3 +-
 ...l_assert_inside_logical_or_lhs.dart.expect |  3 +-
 ...ide_logical_or_lhs.dart.intertwined.expect |  3 +-
 ...l_assert_inside_logical_or_rhs.dart.expect |  3 +-
 ...ide_logical_or_rhs.dart.intertwined.expect |  3 +-
 ...null_assert_inside_map_pattern.dart.expect |  3 +-
 ...inside_map_pattern.dart.intertwined.expect |  3 +-
 ...t_inside_parenthesized_pattern.dart.expect |  3 +-
 ...enthesized_pattern.dart.intertwined.expect |  3 +-
 ...ecord_pattern_implicitly_named.dart.expect |  3 +-
 ...n_implicitly_named.dart.intertwined.expect |  3 +-
 ...rt_inside_record_pattern_named.dart.expect |  3 +-
 ...cord_pattern_named.dart.intertwined.expect |  3 +-
 ..._inside_record_pattern_unnamed.dart.expect |  3 +-
 ...rd_pattern_unnamed.dart.intertwined.expect |  3 +-
 .../null_check_inside_case.dart.expect        |  3 +-
 ..._check_inside_case.dart.intertwined.expect |  3 +-
 ...check_inside_extractor_pattern.dart.expect |  3 +-
 ..._extractor_pattern.dart.intertwined.expect |  3 +-
 ...actor_pattern_implicitly_named.dart.expect |  3 +-
 ...n_implicitly_named.dart.intertwined.expect |  3 +-
 ...null_check_inside_list_pattern.dart.expect |  3 +-
 ...nside_list_pattern.dart.intertwined.expect |  3 +-
 ...l_check_inside_logical_and_lhs.dart.expect |  3 +-
 ...de_logical_and_lhs.dart.intertwined.expect |  3 +-
 ...l_check_inside_logical_and_rhs.dart.expect |  3 +-
 ...de_logical_and_rhs.dart.intertwined.expect |  3 +-
 ...ll_check_inside_logical_or_lhs.dart.expect |  3 +-
 ...ide_logical_or_lhs.dart.intertwined.expect |  3 +-
 ...ll_check_inside_logical_or_rhs.dart.expect |  3 +-
 ...ide_logical_or_rhs.dart.intertwined.expect |  3 +-
 .../null_check_inside_map_pattern.dart.expect |  3 +-
 ...inside_map_pattern.dart.intertwined.expect |  3 +-
 ...k_inside_parenthesized_pattern.dart.expect |  3 +-
 ...enthesized_pattern.dart.intertwined.expect |  3 +-
 ...ecord_pattern_implicitly_named.dart.expect |  3 +-
 ...n_implicitly_named.dart.intertwined.expect |  3 +-
 ...ck_inside_record_pattern_named.dart.expect |  3 +-
 ...cord_pattern_named.dart.intertwined.expect |  3 +-
 ..._inside_record_pattern_unnamed.dart.expect |  3 +-
 ...rd_pattern_unnamed.dart.intertwined.expect |  3 +-
 .../null_literal_inside_case.dart.expect      |  3 +-
 ...iteral_inside_case.dart.intertwined.expect |  3 +-
 .../null_literal_inside_cast.dart.expect      |  3 +-
 ...iteral_inside_cast.dart.intertwined.expect |  3 +-
 ...ull_literal_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 ...null_literal_inside_null_check.dart.expect |  3 +-
 ..._inside_null_check.dart.intertwined.expect |  3 +-
 .../parenthesized_insideCase.dart.expect      |  3 +-
 ...hesized_insideCase.dart.intertwined.expect |  3 +-
 ...enthesized_pattern_inside_cast.dart.expect |  3 +-
 ...attern_inside_cast.dart.intertwined.expect |  3 +-
 ...zed_pattern_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 ...ized_pattern_inside_null_check.dart.expect |  3 +-
 ..._inside_null_check.dart.intertwined.expect |  3 +-
 ...tractor_pattern_with_type_args.dart.expect |  3 +-
 ...ern_with_type_args.dart.intertwined.expect |  3 +-
 ...ern_with_type_args_inside_cast.dart.expect |  3 +-
 ...e_args_inside_cast.dart.intertwined.expect |  3 +-
 ...h_type_args_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 ...th_type_args_inside_null_check.dart.expect |  3 +-
 ..._inside_null_check.dart.intertwined.expect |  3 +-
 .../record_pattern_inside_case.dart.expect    |  3 +-
 ...attern_inside_case.dart.intertwined.expect |  3 +-
 ...cord_pattern_inside_case_empty.dart.expect |  3 +-
 ..._inside_case_empty.dart.intertwined.expect |  3 +-
 ..._pattern_inside_case_singleton.dart.expect |  3 +-
 ...ide_case_singleton.dart.intertwined.expect |  3 +-
 .../record_pattern_inside_cast.dart.expect    |  3 +-
 ...attern_inside_cast.dart.intertwined.expect |  3 +-
 ...ord_pattern_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 ...cord_pattern_inside_null_check.dart.expect |  3 +-
 ..._inside_null_check.dart.intertwined.expect |  3 +-
 .../relational_inside_case_equal.dart.expect  |  3 +-
 ..._inside_case_equal.dart.intertwined.expect |  3 +-
 ...ional_inside_case_greater_than.dart.expect |  3 +-
 ..._case_greater_than.dart.intertwined.expect |  3 +-
 ...ide_case_greater_than_or_equal.dart.expect |  3 +-
 ...ater_than_or_equal.dart.intertwined.expect |  3 +-
 ...lational_inside_case_less_than.dart.expect |  3 +-
 ...ide_case_less_than.dart.intertwined.expect |  3 +-
 ...inside_case_less_than_or_equal.dart.expect |  3 +-
 ...less_than_or_equal.dart.intertwined.expect |  3 +-
 ...lational_inside_case_not_equal.dart.expect |  3 +-
 ...ide_case_not_equal.dart.intertwined.expect |  3 +-
 ...ional_inside_extractor_pattern.dart.expect |  3 +-
 ..._extractor_pattern.dart.intertwined.expect |  3 +-
 ...relational_inside_list_pattern.dart.expect |  3 +-
 ...nside_list_pattern.dart.intertwined.expect |  3 +-
 ...ational_inside_logical_and_lhs.dart.expect |  3 +-
 ...de_logical_and_lhs.dart.intertwined.expect |  3 +-
 ...ational_inside_logical_and_rhs.dart.expect |  3 +-
 ...de_logical_and_rhs.dart.intertwined.expect |  3 +-
 ...lational_inside_logical_or_lhs.dart.expect |  3 +-
 ...ide_logical_or_lhs.dart.intertwined.expect |  3 +-
 ...lational_inside_logical_or_rhs.dart.expect |  3 +-
 ...ide_logical_or_rhs.dart.intertwined.expect |  3 +-
 .../relational_inside_map_pattern.dart.expect |  3 +-
 ...inside_map_pattern.dart.intertwined.expect |  3 +-
 ...l_inside_parenthesized_pattern.dart.expect |  3 +-
 ...enthesized_pattern.dart.intertwined.expect |  3 +-
 ...al_inside_record_pattern_named.dart.expect |  3 +-
 ...cord_pattern_named.dart.intertwined.expect |  3 +-
 ..._inside_record_pattern_unnamed.dart.expect |  3 +-
 ...rd_pattern_unnamed.dart.intertwined.expect |  3 +-
 .../string_literal_inside_case.dart.expect    |  3 +-
 ...iteral_inside_case.dart.intertwined.expect |  3 +-
 .../string_literal_inside_cast.dart.expect    |  3 +-
 ...iteral_inside_cast.dart.intertwined.expect |  3 +-
 ...ing_literal_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 ...ring_literal_inside_null_check.dart.expect |  3 +-
 ..._inside_null_check.dart.intertwined.expect |  3 +-
 ...ped_final_variable_inside_case.dart.expect |  3 +-
 ...riable_inside_case.dart.intertwined.expect |  3 +-
 ...ped_final_variable_inside_cast.dart.expect |  3 +-
 ...riable_inside_cast.dart.intertwined.expect |  3 +-
 ...al_variable_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 ...nal_variable_inside_null_check.dart.expect |  3 +-
 ..._inside_null_check.dart.intertwined.expect |  3 +-
 .../typed_variable_inside_case.dart.expect    |  3 +-
 ...riable_inside_case.dart.intertwined.expect |  3 +-
 .../typed_variable_inside_cast.dart.expect    |  3 +-
 ...riable_inside_cast.dart.intertwined.expect |  3 +-
 ...ed_variable_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 ...ped_variable_inside_null_check.dart.expect |  3 +-
 ..._inside_null_check.dart.intertwined.expect |  3 +-
 ..._variable_named_as_inside_case.dart.expect |  3 +-
 ...med_as_inside_case.dart.intertwined.expect |  3 +-
 ..._variable_named_as_inside_cast.dart.expect |  3 +-
 ...med_as_inside_cast.dart.intertwined.expect |  3 +-
 ...ed_as_inside_extractor_pattern.dart.expect |  3 +-
 ..._extractor_pattern.dart.intertwined.expect |  3 +-
 ...actor_pattern_implicitly_named.dart.expect |  3 +-
 ...n_implicitly_named.dart.intertwined.expect |  3 +-
 ...e_named_as_inside_list_pattern.dart.expect |  3 +-
 ...nside_list_pattern.dart.intertwined.expect |  3 +-
 ...amed_as_inside_logical_and_lhs.dart.expect |  3 +-
 ...de_logical_and_lhs.dart.intertwined.expect |  3 +-
 ...amed_as_inside_logical_and_rhs.dart.expect |  3 +-
 ...de_logical_and_rhs.dart.intertwined.expect |  3 +-
 ...named_as_inside_logical_or_lhs.dart.expect |  3 +-
 ...ide_logical_or_lhs.dart.intertwined.expect |  3 +-
 ...named_as_inside_logical_or_rhs.dart.expect |  3 +-
 ...ide_logical_or_rhs.dart.intertwined.expect |  3 +-
 ...le_named_as_inside_map_pattern.dart.expect |  3 +-
 ...inside_map_pattern.dart.intertwined.expect |  3 +-
 ...le_named_as_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 ...ble_named_as_inside_null_check.dart.expect |  3 +-
 ..._inside_null_check.dart.intertwined.expect |  3 +-
 ...s_inside_parenthesized_pattern.dart.expect |  3 +-
 ...enthesized_pattern.dart.intertwined.expect |  3 +-
 ...ecord_pattern_implicitly_named.dart.expect |  3 +-
 ...n_implicitly_named.dart.intertwined.expect |  3 +-
 ...as_inside_record_pattern_named.dart.expect |  3 +-
 ...cord_pattern_named.dart.intertwined.expect |  3 +-
 ..._inside_record_pattern_unnamed.dart.expect |  3 +-
 ...rd_pattern_unnamed.dart.intertwined.expect |  3 +-
 .../var_variable_inside_case.dart.expect      |  3 +-
 ...riable_inside_case.dart.intertwined.expect |  3 +-
 .../var_variable_inside_cast.dart.expect      |  3 +-
 ...riable_inside_cast.dart.intertwined.expect |  3 +-
 ...ar_variable_inside_null_assert.dart.expect |  3 +-
 ...inside_null_assert.dart.intertwined.expect |  3 +-
 ...var_variable_inside_null_check.dart.expect |  3 +-
 ..._inside_null_check.dart.intertwined.expect |  3 +-
 ...ypedNamedUnderscore_insideCase.dart.expect |  3 +-
 ...erscore_insideCase.dart.intertwined.expect |  3 +-
 .../wildcard_bare_insideCase.dart.expect      |  3 +-
 ...rd_bare_insideCase.dart.intertwined.expect |  3 +-
 .../wildcard_bare_insideCast.dart.expect      |  3 +-
 ...rd_bare_insideCast.dart.intertwined.expect |  3 +-
 ...wildcard_bare_insideNullAssert.dart.expect |  3 +-
 ...e_insideNullAssert.dart.intertwined.expect |  3 +-
 .../wildcard_bare_insideNullCheck.dart.expect |  3 +-
 ...re_insideNullCheck.dart.intertwined.expect |  3 +-
 ...ildcard_final_typed_insideCase.dart.expect |  3 +-
 ...l_typed_insideCase.dart.intertwined.expect |  3 +-
 ...ildcard_final_typed_insideCast.dart.expect |  3 +-
 ...l_typed_insideCast.dart.intertwined.expect |  3 +-
 ...d_final_typed_insideNullAssert.dart.expect |  3 +-
 ...d_insideNullAssert.dart.intertwined.expect |  3 +-
 ...rd_final_typed_insideNullCheck.dart.expect |  3 +-
 ...ed_insideNullCheck.dart.intertwined.expect |  3 +-
 ...dcard_final_untyped_insideCase.dart.expect |  3 +-
 ...untyped_insideCase.dart.intertwined.expect |  3 +-
 ...dcard_final_untyped_insideCast.dart.expect |  3 +-
 ...untyped_insideCast.dart.intertwined.expect |  3 +-
 ...final_untyped_insideNullAssert.dart.expect |  3 +-
 ...d_insideNullAssert.dart.intertwined.expect |  3 +-
 ..._final_untyped_insideNullCheck.dart.expect |  3 +-
 ...ed_insideNullCheck.dart.intertwined.expect |  3 +-
 .../wildcard_typed_insideCase.dart.expect     |  3 +-
 ...d_typed_insideCase.dart.intertwined.expect |  3 +-
 .../wildcard_typed_insideCast.dart.expect     |  3 +-
 ...d_typed_insideCast.dart.intertwined.expect |  3 +-
 ...ildcard_typed_insideNullAssert.dart.expect |  3 +-
 ...d_insideNullAssert.dart.intertwined.expect |  3 +-
 ...wildcard_typed_insideNullCheck.dart.expect |  3 +-
 ...ed_insideNullCheck.dart.intertwined.expect |  3 +-
 .../wildcard_var_insideCase.dart.expect       |  3 +-
 ...ard_var_insideCase.dart.intertwined.expect |  3 +-
 .../wildcard_var_insideCast.dart.expect       |  3 +-
 ...ard_var_insideCast.dart.intertwined.expect |  3 +-
 .../wildcard_var_insideNullAssert.dart.expect |  3 +-
 ...r_insideNullAssert.dart.intertwined.expect |  3 +-
 .../wildcard_var_insideNullCheck.dart.expect  |  3 +-
 ...ar_insideNullCheck.dart.intertwined.expect |  3 +-
 pkg/front_end/test/parser_test_listener.dart  | 13 +---
 470 files changed, 513 insertions(+), 1022 deletions(-)

diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart b/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart
index 540731abf3d..6b134a2145f 100644
--- a/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart
@@ -577,8 +577,8 @@ class ForwardingListener implements Listener {
   }
 
   @override
-  void endCaseExpression(Token? when, Token colon) {
-    listener?.endCaseExpression(when, colon);
+  void endCaseExpression(Token caseKeyword, Token? when, Token colon) {
+    listener?.endCaseExpression(caseKeyword, when, colon);
   }
 
   @override
@@ -1291,11 +1291,6 @@ class ForwardingListener implements Listener {
     listener?.handleBreakStatement(hasTarget, breakKeyword, endToken);
   }
 
-  @override
-  void handleCaseMatch(Token caseKeyword, Token? when, Token colon) {
-    listener?.handleCaseMatch(caseKeyword, when, colon);
-  }
-
   @override
   void handleCatchBlock(Token? onKeyword, Token? catchKeyword, Token? comma) {
     listener?.handleCatchBlock(onKeyword, catchKeyword, comma);
diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart b/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart
index 1dd54bf0d7e..6c14e72617f 100644
--- a/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/parser/listener.dart
@@ -100,7 +100,7 @@ class Listener implements UnescapeErrorListener {
 
   void beginCaseExpression(Token caseKeyword) {}
 
-  void endCaseExpression(Token? when, Token colon) {
+  void endCaseExpression(Token caseKeyword, Token? when, Token colon) {
     logEvent("CaseExpression");
   }
 
@@ -1351,10 +1351,6 @@ class Listener implements UnescapeErrorListener {
 
   void beginTryStatement(Token token) {}
 
-  void handleCaseMatch(Token caseKeyword, Token? when, Token colon) {
-    logEvent("CaseMatch");
-  }
-
   void beginCatchClause(Token token) {}
 
   void endCatchClause(Token token) {
diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
index 3ad19539f46..5279680f014 100644
--- a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
@@ -8271,8 +8271,7 @@ class Parser {
             token = parseExpression(token);
           }
           token = ensureColon(token);
-          listener.endCaseExpression(when, token);
-          listener.handleCaseMatch(caseKeyword, when, token);
+          listener.endCaseExpression(caseKeyword, when, token);
           expressionCount++;
           peek = peekPastLabels(token.next!);
         } else if (expressionCount > 0) {
diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/stack_listener.dart b/pkg/_fe_analyzer_shared/lib/src/parser/stack_listener.dart
index b2d7766e176..e7a29a57ee5 100644
--- a/pkg/_fe_analyzer_shared/lib/src/parser/stack_listener.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/parser/stack_listener.dart
@@ -482,7 +482,7 @@ abstract class StackListener extends Listener {
   }
 
   @override
-  void endCaseExpression(Token? when, Token colon) {
+  void endCaseExpression(Token caseKeyword, Token? when, Token colon) {
     debugEvent("CaseExpression");
   }
 
diff --git a/pkg/analyzer/lib/src/fasta/ast_builder.dart b/pkg/analyzer/lib/src/fasta/ast_builder.dart
index 95467fe19c8..278b01e881a 100644
--- a/pkg/analyzer/lib/src/fasta/ast_builder.dart
+++ b/pkg/analyzer/lib/src/fasta/ast_builder.dart
@@ -893,6 +893,40 @@ class AstBuilder extends StackListener {
     );
   }
 
+  @override
+  void endCaseExpression(Token caseKeyword, Token? when, Token colon) {
+    assert(optional('case', caseKeyword));
+    assert(optional(':', colon));
+    debugEvent("CaseMatch");
+
+    if (_featureSet.isEnabled(Feature.patterns)) {
+      WhenClauseImpl? whenClause;
+      if (when != null) {
+        var expression = pop() as ExpressionImpl;
+        whenClause = WhenClauseImpl(whenKeyword: when, expression: expression);
+      }
+      var pattern = pop() as DartPatternImpl;
+      push(SwitchPatternCaseImpl(
+          labels: <Label>[],
+          keyword: caseKeyword,
+          pattern: pattern,
+          whenClause: whenClause,
+          colon: colon,
+          statements: <Statement>[]));
+    } else {
+      var expression = pop() as ExpressionImpl;
+      push(
+        SwitchCaseImpl(
+          labels: <Label>[],
+          keyword: caseKeyword,
+          expression: expression,
+          colon: colon,
+          statements: <Statement>[],
+        ),
+      );
+    }
+  }
+
   @override
   void endClassConstructor(Token? getOrSet, Token beginToken, Token beginParam,
       Token? beginInitializers, Token endToken) {
@@ -3275,40 +3309,6 @@ class AstBuilder extends StackListener {
     );
   }
 
-  @override
-  void handleCaseMatch(Token caseKeyword, Token? when, Token colon) {
-    assert(optional('case', caseKeyword));
-    assert(optional(':', colon));
-    debugEvent("CaseMatch");
-
-    if (_featureSet.isEnabled(Feature.patterns)) {
-      WhenClauseImpl? whenClause;
-      if (when != null) {
-        var expression = pop() as ExpressionImpl;
-        whenClause = WhenClauseImpl(whenKeyword: when, expression: expression);
-      }
-      var pattern = pop() as DartPatternImpl;
-      push(SwitchPatternCaseImpl(
-          labels: <Label>[],
-          keyword: caseKeyword,
-          pattern: pattern,
-          whenClause: whenClause,
-          colon: colon,
-          statements: <Statement>[]));
-    } else {
-      var expression = pop() as ExpressionImpl;
-      push(
-        SwitchCaseImpl(
-          labels: <Label>[],
-          keyword: caseKeyword,
-          expression: expression,
-          colon: colon,
-          statements: <Statement>[],
-        ),
-      );
-    }
-  }
-
   @override
   void handleCastPattern(Token asOperator) {
     assert(optional('as', asOperator));
diff --git a/pkg/analyzer/test/generated/parser_fasta_listener.dart b/pkg/analyzer/test/generated/parser_fasta_listener.dart
index 958ce6c67c4..71c033ca942 100644
--- a/pkg/analyzer/test/generated/parser_fasta_listener.dart
+++ b/pkg/analyzer/test/generated/parser_fasta_listener.dart
@@ -598,9 +598,9 @@ class ForwardingTestListener extends ForwardingListener {
   }
 
   @override
-  void endCaseExpression(Token? when, Token colon) {
+  void endCaseExpression(Token caseKeyword, Token? when, Token colon) {
     end('CaseExpression');
-    super.endCaseExpression(when, colon);
+    super.endCaseExpression(caseKeyword, when, colon);
   }
 
   @override
diff --git a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
index c7fc6087885..2652c75253a 100644
--- a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
@@ -2529,7 +2529,7 @@ class BodyBuilder extends StackListenerImpl
   }
 
   @override
-  void endCaseExpression(Token? when, Token colon) {
+  void endCaseExpression(Token caseKeyword, Token? when, Token colon) {
     // ignore: unused_local_variable
     Expression? guard;
     if (when != null) {
@@ -7251,12 +7251,6 @@ class BodyBuilder extends StackListenerImpl
     push(cases);
   }
 
-  @override
-  void handleCaseMatch(Token caseKeyword, Token? when, Token colon) {
-    debugEvent("CaseMatch");
-    // Do nothing. Handled by [handleSwitchCase].
-  }
-
   @override
   void handleBreakStatement(
       bool hasTarget, Token breakKeyword, Token endToken) {
diff --git a/pkg/front_end/lib/src/fasta/kernel/macro/annotation_parser.dart b/pkg/front_end/lib/src/fasta/kernel/macro/annotation_parser.dart
index 78e630a9ee4..e740d5ffb74 100644
--- a/pkg/front_end/lib/src/fasta/kernel/macro/annotation_parser.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/macro/annotation_parser.dart
@@ -986,7 +986,7 @@ class _MacroListener implements Listener {
   }
 
   @override
-  void endCaseExpression(Token? when, Token colon) {
+  void endCaseExpression(Token caseKeyword, Token? when, Token colon) {
     _unsupported();
   }
 
@@ -1579,11 +1579,6 @@ class _MacroListener implements Listener {
     _unsupported();
   }
 
-  @override
-  void handleCaseMatch(Token caseKeyword, Token? when, Token colon) {
-    _unsupported();
-  }
-
   @override
   void handleCatchBlock(Token? onKeyword, Token? catchKeyword, Token? comma) {
     _unsupported();
diff --git a/pkg/front_end/lib/src/fasta/util/parser_ast_helper.dart b/pkg/front_end/lib/src/fasta/util/parser_ast_helper.dart
index 8bca25bce87..61a2a7a75e4 100644
--- a/pkg/front_end/lib/src/fasta/util/parser_ast_helper.dart
+++ b/pkg/front_end/lib/src/fasta/util/parser_ast_helper.dart
@@ -141,9 +141,9 @@ abstract class AbstractParserAstListener implements Listener {
   }
 
   @override
-  void endCaseExpression(Token? when, Token colon) {
-    CaseExpressionEnd data =
-        new CaseExpressionEnd(ParserAstType.END, when: when, colon: colon);
+  void endCaseExpression(Token caseKeyword, Token? when, Token colon) {
+    CaseExpressionEnd data = new CaseExpressionEnd(ParserAstType.END,
+        caseKeyword: caseKeyword, when: when, colon: colon);
     seen(data);
   }
 
@@ -1779,13 +1779,6 @@ abstract class AbstractParserAstListener implements Listener {
     seen(data);
   }
 
-  @override
-  void handleCaseMatch(Token caseKeyword, Token? when, Token colon) {
-    CaseMatchHandle data = new CaseMatchHandle(ParserAstType.HANDLE,
-        caseKeyword: caseKeyword, when: when, colon: colon);
-    seen(data);
-  }
-
   @override
   void beginCatchClause(Token token) {
     CatchClauseBegin data =
@@ -3025,14 +3018,17 @@ class CaseExpressionBegin extends ParserAstNode {
 }
 
 class CaseExpressionEnd extends ParserAstNode {
+  final Token caseKeyword;
   final Token? when;
   final Token colon;
 
-  CaseExpressionEnd(ParserAstType type, {this.when, required this.colon})
+  CaseExpressionEnd(ParserAstType type,
+      {required this.caseKeyword, this.when, required this.colon})
       : super("CaseExpression", type);
 
   @override
   Map<String, Object?> get deprecatedArguments => {
+        "caseKeyword": caseKeyword,
         "when": when,
         "colon": colon,
       };
@@ -6006,23 +6002,6 @@ class TryStatementBegin extends ParserAstNode {
       };
 }
 
-class CaseMatchHandle extends ParserAstNode {
-  final Token caseKeyword;
-  final Token? when;
-  final Token colon;
-
-  CaseMatchHandle(ParserAstType type,
-      {required this.caseKeyword, this.when, required this.colon})
-      : super("CaseMatch", type);
-
-  @override
-  Map<String, Object?> get deprecatedArguments => {
-        "caseKeyword": caseKeyword,
-        "when": when,
-        "colon": colon,
-      };
-}
-
 class CatchClauseBegin extends ParserAstNode {
   final Token token;
 
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_01.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_01.dart.expect
index 7c1757b0748..0145c87b609 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_01.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_01.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(main)
                 handleNoArguments(:)
                 handleSend(d, :)
               endConditionalExpression(?, :)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleIdentifier(e, expression)
               handleNoTypeArguments(;)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_01.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_01.dart.intertwined.expect
index d825b499c8a..749246b9c04 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_01.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_01.dart.intertwined.expect
@@ -130,8 +130,7 @@ parseUnit(main)
                                     listener: handleSend(d, :)
                         listener: endConditionalExpression(?, :)
                   ensureColon(d)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(e)
                   parseStatementsInSwitchCase(:, e, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_02.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_02.dart.expect
index f01af6257e9..a59fac170d8 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_02.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_02.dart.expect
@@ -27,8 +27,7 @@ beginCompilationUnit(main)
               handleNoArguments(])
               handleSend(c, ])
               handleIndexedExpression(?, [, ])
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               beginBlock({, BlockKind(statement))
                 beginBlock({, BlockKind(statement))
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_02.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_02.dart.intertwined.expect
index 8a11a75ac2e..cc33d35e923 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_02.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_02.dart.intertwined.expect
@@ -120,8 +120,7 @@ parseUnit(main)
                                     listener: handleSend(c, ])
                         listener: handleIndexedExpression(?, [, ])
                   ensureColon(])
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels({)
                   parseStatementsInSwitchCase(:, {, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_03.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_03.dart.expect
index be66f80da55..3d6272a6543 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_03.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_03.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(main)
                 handleNoArguments(:)
                 handleSend(baz, :)
               endConditionalExpression(?, :)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_03.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_03.dart.intertwined.expect
index afaf50051cd..38b7e79986f 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_03.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_03.dart.intertwined.expect
@@ -119,8 +119,7 @@ parseUnit(main)
                                     listener: handleSend(baz, :)
                         listener: endConditionalExpression(?, :)
                   ensureColon(baz)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_04.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_04.dart.expect
index 5d5ad6b0a51..2cc6172c9ce 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_04.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_04.dart.expect
@@ -42,8 +42,7 @@ beginCompilationUnit(main)
                 handleLiteralSetOrMap(1, {, null, }, true)
               endConditionalExpression(?, :)
               handleRecoverableError(Message[ExpectedButGot, Expected ':' before this., null, {string: :}], ;, ;)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleEmptyStatement(;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_04.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_04.dart.intertwined.expect
index 9ca17039366..b9b1f35105b 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_04.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_04.dart.intertwined.expect
@@ -148,8 +148,7 @@ parseUnit(main)
                       reportRecoverableError(;, Message[ExpectedButGot, Expected ':' before this., null, {string: :}])
                         listener: handleRecoverableError(Message[ExpectedButGot, Expected ':' before this., null, {string: :}], ;, ;)
                       rewriter()
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(;)
                   parseStatementsInSwitchCase(:, ;, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_05.dart.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_05.dart.expect
index 0c11759fc3e..01bff865e9e 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_05.dart.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_05.dart.expect
@@ -24,8 +24,7 @@ beginCompilationUnit(main)
               handleSend(x, ?)
               handleLiteralInt(4)
               handleIndexedExpression(?, [, ])
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               beginBlock({, BlockKind(statement))
                 beginBlock({, BlockKind(statement))
diff --git a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_05.dart.intertwined.expect b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_05.dart.intertwined.expect
index 680dcfbc13f..5aadbccbb0d 100644
--- a/pkg/front_end/parser_testcases/nnbd/issue_40267_case_05.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/nnbd/issue_40267_case_05.dart.intertwined.expect
@@ -108,8 +108,7 @@ parseUnit(main)
                                   listener: handleLiteralInt(4)
                         listener: handleIndexedExpression(?, [, ])
                   ensureColon(])
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels({)
                   parseStatementsInSwitchCase(:, {, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_case.dart.expect b/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_case.dart.expect
index 2b531bd52c7..21c5aacc1b5 100644
--- a/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_case.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_case.dart.expect
@@ -29,8 +29,7 @@ beginCompilationUnit(test)
             beginCaseExpression(case)
               handleLiteralBool(true)
               handleConstantPattern(null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_case.dart.intertwined.expect
index 06430526d9d..868dc53f375 100644
--- a/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_case.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_case.dart.intertwined.expect
@@ -75,8 +75,7 @@ parseUnit(test)
                               listener: handleLiteralBool(true)
                       listener: handleConstantPattern(null)
                   ensureColon(true)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_cast.dart.expect
index 88f2b80aa30..d4cb1e02278 100644
--- a/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_cast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_cast.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_cast.dart.intertwined.expect
index f927e652763..7996aaf5ea9 100644
--- a/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_cast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_cast.dart.intertwined.expect
@@ -82,8 +82,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_null_assert.dart.expect
index 8293662b4c3..6d50fe4e79d 100644
--- a/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_null_assert.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(test)
               handleLiteralBool(true)
               handleConstantPattern(null)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_null_assert.dart.intertwined.expect
index b0e06b736a2..1c84a71fa90 100644
--- a/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_null_assert.dart.intertwined.expect
@@ -76,8 +76,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_null_check.dart.expect
index 0f4823ed2fe..52f61653178 100644
--- a/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_null_check.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_null_check.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(test)
               handleLiteralBool(true)
               handleConstantPattern(null)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_null_check.dart.intertwined.expect
index 78d81ae66e3..86b41da2068 100644
--- a/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_null_check.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/boolean_literal_inside_null_check.dart.intertwined.expect
@@ -76,8 +76,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/caseHead_withClassicPattern_guarded_insideSwitchStatement.dart.expect b/pkg/front_end/parser_testcases/patterns/caseHead_withClassicPattern_guarded_insideSwitchStatement.dart.expect
index 78ebb901bd3..2f8253b1b3f 100644
--- a/pkg/front_end/parser_testcases/patterns/caseHead_withClassicPattern_guarded_insideSwitchStatement.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/caseHead_withClassicPattern_guarded_insideSwitchStatement.dart.expect
@@ -28,8 +28,7 @@ beginCompilationUnit(void)
               handleLiteralInt(0)
               handleConstantPattern(null)
               handleLiteralBool(true)
-            endCaseExpression(when, :)
-            handleCaseMatch(case, when, :)
+            endCaseExpression(case, when, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/caseHead_withClassicPattern_guarded_insideSwitchStatement.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/caseHead_withClassicPattern_guarded_insideSwitchStatement.dart.intertwined.expect
index a8dfcbec2d2..ad43f1923e9 100644
--- a/pkg/front_end/parser_testcases/patterns/caseHead_withClassicPattern_guarded_insideSwitchStatement.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/caseHead_withClassicPattern_guarded_insideSwitchStatement.dart.intertwined.expect
@@ -78,8 +78,7 @@ parseUnit(void)
                           parseLiteralBool(when)
                             listener: handleLiteralBool(true)
                   ensureColon(true)
-                  listener: endCaseExpression(when, :)
-                  listener: handleCaseMatch(case, when, :)
+                  listener: endCaseExpression(case, when, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/caseHead_withClassicPattern_unguarded_insideSwitchStatement.dart.expect b/pkg/front_end/parser_testcases/patterns/caseHead_withClassicPattern_unguarded_insideSwitchStatement.dart.expect
index ac84fe9ae38..d9a63c19e95 100644
--- a/pkg/front_end/parser_testcases/patterns/caseHead_withClassicPattern_unguarded_insideSwitchStatement.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/caseHead_withClassicPattern_unguarded_insideSwitchStatement.dart.expect
@@ -27,8 +27,7 @@ beginCompilationUnit(void)
             beginCaseExpression(case)
               handleLiteralInt(0)
               handleConstantPattern(null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/caseHead_withClassicPattern_unguarded_insideSwitchStatement.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/caseHead_withClassicPattern_unguarded_insideSwitchStatement.dart.intertwined.expect
index 363a2102a4b..f0f83666ec0 100644
--- a/pkg/front_end/parser_testcases/patterns/caseHead_withClassicPattern_unguarded_insideSwitchStatement.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/caseHead_withClassicPattern_unguarded_insideSwitchStatement.dart.intertwined.expect
@@ -72,8 +72,7 @@ parseUnit(void)
                               listener: handleLiteralInt(0)
                       listener: handleConstantPattern(null)
                   ensureColon(0)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/caseHead_withNewPattern_guarded_insideSwitchStatement.dart.expect b/pkg/front_end/parser_testcases/patterns/caseHead_withNewPattern_guarded_insideSwitchStatement.dart.expect
index 27defd7121e..85280db0f77 100644
--- a/pkg/front_end/parser_testcases/patterns/caseHead_withNewPattern_guarded_insideSwitchStatement.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/caseHead_withNewPattern_guarded_insideSwitchStatement.dart.expect
@@ -34,8 +34,7 @@ beginCompilationUnit(void)
               endAsOperatorType(as)
               handleCastPattern(as)
               handleLiteralBool(true)
-            endCaseExpression(when, :)
-            handleCaseMatch(case, when, :)
+            endCaseExpression(case, when, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/caseHead_withNewPattern_guarded_insideSwitchStatement.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/caseHead_withNewPattern_guarded_insideSwitchStatement.dart.intertwined.expect
index aef127f8561..9af53cc7c01 100644
--- a/pkg/front_end/parser_testcases/patterns/caseHead_withNewPattern_guarded_insideSwitchStatement.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/caseHead_withNewPattern_guarded_insideSwitchStatement.dart.intertwined.expect
@@ -85,8 +85,7 @@ parseUnit(void)
                           parseLiteralBool(when)
                             listener: handleLiteralBool(true)
                   ensureColon(true)
-                  listener: endCaseExpression(when, :)
-                  listener: handleCaseMatch(case, when, :)
+                  listener: endCaseExpression(case, when, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/caseHead_withNewPattern_unguarded_insideSwitchStatement.dart.expect b/pkg/front_end/parser_testcases/patterns/caseHead_withNewPattern_unguarded_insideSwitchStatement.dart.expect
index be1a9a69afb..14cb2d4b7de 100644
--- a/pkg/front_end/parser_testcases/patterns/caseHead_withNewPattern_unguarded_insideSwitchStatement.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/caseHead_withNewPattern_unguarded_insideSwitchStatement.dart.expect
@@ -33,8 +33,7 @@ beginCompilationUnit(void)
                 handleType(int, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/caseHead_withNewPattern_unguarded_insideSwitchStatement.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/caseHead_withNewPattern_unguarded_insideSwitchStatement.dart.intertwined.expect
index 4b3aab4cd62..12c9b6c7db1 100644
--- a/pkg/front_end/parser_testcases/patterns/caseHead_withNewPattern_unguarded_insideSwitchStatement.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/caseHead_withNewPattern_unguarded_insideSwitchStatement.dart.intertwined.expect
@@ -79,8 +79,7 @@ parseUnit(void)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(int)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_case.dart.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_case.dart.expect
index 3d127023a2c..13b4c46a59f 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_case.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_case.dart.expect
@@ -49,8 +49,7 @@ beginCompilationUnit(test)
                 handleType(int, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_case.dart.intertwined.expect
index d3aa7be7d01..2d5363d21a9 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_case.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_case.dart.intertwined.expect
@@ -116,8 +116,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(int)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.expect
index 2d0267f7dba..b2680fee8fc 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.expect
@@ -66,8 +66,7 @@ beginCompilationUnit(class)
               handlePatternField(:)
               handleExtractorPatternFields(1, (, ))
               handleExtractorPattern(C, null, null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.intertwined.expect
index 36651a7bdc3..42f00c84040 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern.dart.intertwined.expect
@@ -135,8 +135,7 @@ parseUnit(class)
                         listener: handleExtractorPatternFields(1, (, ))
                       listener: handleExtractorPattern(C, null, null)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.expect
index d86250f8cc5..69099af38bc 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.expect
@@ -66,8 +66,7 @@ beginCompilationUnit(class)
               handlePatternField(:)
               handleExtractorPatternFields(1, (, ))
               handleExtractorPattern(C, null, null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.intertwined.expect
index c0bceaf9660..811880c9d89 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_extractor_pattern_implicitly_named.dart.intertwined.expect
@@ -131,8 +131,7 @@ parseUnit(class)
                         listener: handleExtractorPatternFields(1, (, ))
                       listener: handleExtractorPattern(C, null, null)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_list_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_list_pattern.dart.expect
index c1f0205b96c..882e6653f3a 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_list_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_list_pattern.dart.expect
@@ -37,8 +37,7 @@ beginCompilationUnit(test)
               endAsOperatorType(as)
               handleCastPattern(as)
               handleListPattern(1, [, ])
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_list_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_list_pattern.dart.intertwined.expect
index 47023841c62..3257cb36964 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_list_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_list_pattern.dart.intertwined.expect
@@ -87,8 +87,7 @@ parseUnit(test)
                           listener: handleCastPattern(as)
                         listener: handleListPattern(1, [, ])
                   ensureColon(])
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_logical_and_lhs.dart.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_logical_and_lhs.dart.expect
index 0b591b828d9..2752e9e4545 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_logical_and_lhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_logical_and_lhs.dart.expect
@@ -43,8 +43,7 @@ beginCompilationUnit(test)
                 handleType(Object, ?)
                 handleVariablePattern(null, _)
               endBinaryPattern(&)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_logical_and_lhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_logical_and_lhs.dart.intertwined.expect
index 6fb418e5a00..8d5e4c5cb5d 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_logical_and_lhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_logical_and_lhs.dart.intertwined.expect
@@ -90,8 +90,7 @@ parseUnit(test)
                           listener: handleVariablePattern(null, _)
                     listener: endBinaryPattern(&)
                   ensureColon(_)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_logical_and_rhs.dart.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_logical_and_rhs.dart.expect
index fa6161a64b1..41c85e0b409 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_logical_and_rhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_logical_and_rhs.dart.expect
@@ -43,8 +43,7 @@ beginCompilationUnit(test)
                 endAsOperatorType(as)
                 handleCastPattern(as)
               endBinaryPattern(&)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_logical_and_rhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_logical_and_rhs.dart.intertwined.expect
index 3576bfaf0f2..69abbb33574 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_logical_and_rhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_logical_and_rhs.dart.intertwined.expect
@@ -90,8 +90,7 @@ parseUnit(test)
                       listener: handleCastPattern(as)
                     listener: endBinaryPattern(&)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_logical_or_lhs.dart.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_logical_or_lhs.dart.expect
index c984b41ce40..ca2e1e55ae2 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_logical_or_lhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_logical_or_lhs.dart.expect
@@ -43,8 +43,7 @@ beginCompilationUnit(test)
                 handleType(Object, ?)
                 handleVariablePattern(null, _)
               endBinaryPattern(|)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_logical_or_lhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_logical_or_lhs.dart.intertwined.expect
index 522d23f225b..af19e4c22c9 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_logical_or_lhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_logical_or_lhs.dart.intertwined.expect
@@ -90,8 +90,7 @@ parseUnit(test)
                           listener: handleVariablePattern(null, _)
                     listener: endBinaryPattern(|)
                   ensureColon(_)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_logical_or_rhs.dart.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_logical_or_rhs.dart.expect
index 25fb0a8e52d..9440d9be539 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_logical_or_rhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_logical_or_rhs.dart.expect
@@ -43,8 +43,7 @@ beginCompilationUnit(test)
                 endAsOperatorType(as)
                 handleCastPattern(as)
               endBinaryPattern(|)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_logical_or_rhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_logical_or_rhs.dart.intertwined.expect
index fffebc9bd6c..8100474d4ca 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_logical_or_rhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_logical_or_rhs.dart.intertwined.expect
@@ -90,8 +90,7 @@ parseUnit(test)
                       listener: handleCastPattern(as)
                     listener: endBinaryPattern(|)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_map_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_map_pattern.dart.expect
index 2615a35b7d3..5bf920fc696 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_map_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_map_pattern.dart.expect
@@ -40,8 +40,7 @@ beginCompilationUnit(test)
               handleCastPattern(as)
               handleMapPatternEntry(:, })
               handleMapPattern(1, {, })
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_map_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_map_pattern.dart.intertwined.expect
index 00b208b04fe..399132c3ca2 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_map_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_map_pattern.dart.intertwined.expect
@@ -96,8 +96,7 @@ parseUnit(test)
                         listener: handleMapPatternEntry(:, })
                         listener: handleMapPattern(1, {, })
                   ensureColon(})
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_parenthesized_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_parenthesized_pattern.dart.expect
index 4f21c0f36c3..a828c10c7ce 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_parenthesized_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_parenthesized_pattern.dart.expect
@@ -36,8 +36,7 @@ beginCompilationUnit(test)
               endAsOperatorType(as)
               handleCastPattern(as)
               handleParenthesizedPattern(()
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_parenthesized_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_parenthesized_pattern.dart.intertwined.expect
index 80527f9e54d..e5e6e7c5ae2 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_parenthesized_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_parenthesized_pattern.dart.intertwined.expect
@@ -87,8 +87,7 @@ parseUnit(test)
                         ensureCloseParen(int, ()
                         listener: handleParenthesizedPattern(()
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_implicitly_named.dart.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_implicitly_named.dart.expect
index 10e607cc75d..dabdcb9f8d6 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_implicitly_named.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_implicitly_named.dart.expect
@@ -41,8 +41,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handlePatternField(null)
               handleRecordPattern((, 2)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_implicitly_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_implicitly_named.dart.intertwined.expect
index 80352dbd25c..ead732091d2 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_implicitly_named.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_implicitly_named.dart.intertwined.expect
@@ -95,8 +95,7 @@ parseUnit(test)
                         ensureCloseParen(2, ()
                         listener: handleRecordPattern((, 2)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_named.dart.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_named.dart.expect
index f40e0b524fc..5519915d9b5 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_named.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_named.dart.expect
@@ -41,8 +41,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handlePatternField(null)
               handleRecordPattern((, 2)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_named.dart.intertwined.expect
index f8b89462e23..ac02dd4f0cc 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_named.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_named.dart.intertwined.expect
@@ -99,8 +99,7 @@ parseUnit(test)
                         ensureCloseParen(2, ()
                         listener: handleRecordPattern((, 2)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_unnamed.dart.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_unnamed.dart.expect
index b76f6d1ddcb..3c3703e9127 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_unnamed.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_unnamed.dart.expect
@@ -40,8 +40,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handlePatternField(null)
               handleRecordPattern((, 2)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_unnamed.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_unnamed.dart.intertwined.expect
index 297f6bc50dd..76aa2eb5508 100644
--- a/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_unnamed.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/cast_inside_record_pattern_unnamed.dart.intertwined.expect
@@ -97,8 +97,7 @@ parseUnit(test)
                         ensureCloseParen(2, ()
                         listener: handleRecordPattern((, 2)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideCase.dart.expect
index dbc2e8d37b3..cb66aa5be3e 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideCase.dart.expect
@@ -42,8 +42,7 @@ beginCompilationUnit(test)
               handleSend(c, :)
               handleEndingBinaryExpression(.)
               handleConstantPattern(null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideCase.dart.intertwined.expect
index 6829c052f6e..0dc00e86777 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideCase.dart.intertwined.expect
@@ -104,8 +104,7 @@ parseUnit(test)
                         listener: handleEndingBinaryExpression(.)
                       listener: handleConstantPattern(null)
                   ensureColon(c)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideCast.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideCast.dart.expect
index 1db554a80ad..0f23b2860ec 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideCast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideCast.dart.expect
@@ -48,8 +48,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideCast.dart.intertwined.expect
index 17c8eb5f6ce..2971f53f665 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideCast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideCast.dart.intertwined.expect
@@ -111,8 +111,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideNullAssert.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideNullAssert.dart.expect
index 28b798f61ae..54269e4c1b9 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideNullAssert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideNullAssert.dart.expect
@@ -43,8 +43,7 @@ beginCompilationUnit(test)
               handleEndingBinaryExpression(.)
               handleConstantPattern(null)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideNullAssert.dart.intertwined.expect
index 6f7589cbb8f..c4a574252a8 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideNullAssert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideNullAssert.dart.intertwined.expect
@@ -105,8 +105,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideNullCheck.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideNullCheck.dart.expect
index ccf50a3e8b5..0990bfdc795 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideNullCheck.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideNullCheck.dart.expect
@@ -43,8 +43,7 @@ beginCompilationUnit(test)
               handleEndingBinaryExpression(.)
               handleConstantPattern(null)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideNullCheck.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideNullCheck.dart.intertwined.expect
index 38efd9d27d9..a88abe2d032 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideNullCheck.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_doublyPrefixed_insideNullCheck.dart.intertwined.expect
@@ -105,8 +105,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_case.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_case.dart.expect
index 9381ee64672..53b0f892735 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_case.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_case.dart.expect
@@ -43,8 +43,7 @@ beginCompilationUnit(test)
               handleNoArguments(:)
               handleSend(y, :)
               handleConstantPattern(null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_case.dart.intertwined.expect
index fd37a964586..e813925c6ca 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_case.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_case.dart.intertwined.expect
@@ -109,8 +109,7 @@ parseUnit(test)
                                 listener: handleSend(y, :)
                       listener: handleConstantPattern(null)
                   ensureColon(y)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_cast.dart.expect
index 642c78fd257..547a555470a 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_cast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_cast.dart.expect
@@ -49,8 +49,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_cast.dart.intertwined.expect
index c4ebeac15fb..be768533a8d 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_cast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_cast.dart.intertwined.expect
@@ -116,8 +116,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_assert.dart.expect
index 7cee2955d08..464199eba87 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_assert.dart.expect
@@ -44,8 +44,7 @@ beginCompilationUnit(test)
               handleSend(y, !)
               handleConstantPattern(null)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_assert.dart.intertwined.expect
index 697ae354aa8..8b7eb5db4a9 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_assert.dart.intertwined.expect
@@ -110,8 +110,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_check.dart.expect
index 8b5f5344ea3..15e31665b83 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_check.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_check.dart.expect
@@ -44,8 +44,7 @@ beginCompilationUnit(test)
               handleSend(y, ?)
               handleConstantPattern(null)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_check.dart.intertwined.expect
index 01ab5a14dc5..75c5cb9cf0e 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_check.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_inside_null_check.dart.intertwined.expect
@@ -110,8 +110,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixedWithUnderscore_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixedWithUnderscore_insideCase.dart.expect
index 107b8318183..43910b51191 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixedWithUnderscore_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixedWithUnderscore_insideCase.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(void)
               handleSend(b, :)
               handleEndingBinaryExpression(.)
               handleConstantPattern(null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixedWithUnderscore_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixedWithUnderscore_insideCase.dart.intertwined.expect
index aafeaa60f23..768b4fdc2a7 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixedWithUnderscore_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixedWithUnderscore_insideCase.dart.intertwined.expect
@@ -90,8 +90,7 @@ parseUnit(void)
                         listener: handleEndingBinaryExpression(.)
                       listener: handleConstantPattern(null)
                   ensureColon(b)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideCase.dart.expect
index 648494e1925..de7d87afd83 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideCase.dart.expect
@@ -37,8 +37,7 @@ beginCompilationUnit(test)
               handleSend(b, :)
               handleEndingBinaryExpression(.)
               handleConstantPattern(null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideCase.dart.intertwined.expect
index bc5c9c541d5..583f782f9df 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideCase.dart.intertwined.expect
@@ -93,8 +93,7 @@ parseUnit(test)
                         listener: handleEndingBinaryExpression(.)
                       listener: handleConstantPattern(null)
                   ensureColon(b)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideCast.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideCast.dart.expect
index 569dda112cc..7f83c25ef00 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideCast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideCast.dart.expect
@@ -43,8 +43,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideCast.dart.intertwined.expect
index e20edb5d38f..b0254249f2c 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideCast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideCast.dart.intertwined.expect
@@ -100,8 +100,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideNullAssert.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideNullAssert.dart.expect
index ef450b96c64..b65b0217794 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideNullAssert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideNullAssert.dart.expect
@@ -38,8 +38,7 @@ beginCompilationUnit(test)
               handleEndingBinaryExpression(.)
               handleConstantPattern(null)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideNullAssert.dart.intertwined.expect
index de5770f816e..98379af3d35 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideNullAssert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideNullAssert.dart.intertwined.expect
@@ -94,8 +94,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideNullCheck.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideNullCheck.dart.expect
index 8ef536277bc..e3166b4db40 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideNullCheck.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideNullCheck.dart.expect
@@ -38,8 +38,7 @@ beginCompilationUnit(test)
               handleEndingBinaryExpression(.)
               handleConstantPattern(null)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideNullCheck.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideNullCheck.dart.intertwined.expect
index 19c45ae5e23..0731a6a22bd 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideNullCheck.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_identifier_prefixed_insideNullCheck.dart.intertwined.expect
@@ -94,8 +94,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideCase.dart.expect
index 7f8e0dc8c39..16526e72071 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideCase.dart.expect
@@ -34,8 +34,7 @@ beginCompilationUnit(test)
               endTypeArguments(1, <, >)
               handleLiteralList(0, [, null, ])
               handleConstantPattern(const)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideCase.dart.intertwined.expect
index dffcdded96e..2c450672dca 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideCase.dart.intertwined.expect
@@ -84,8 +84,7 @@ parseUnit(test)
                                 listener: handleLiteralList(0, [, null, ])
                       listener: handleConstantPattern(const)
                   ensureColon(])
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideCast.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideCast.dart.expect
index 6cbb335872a..676524dd500 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideCast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideCast.dart.expect
@@ -40,8 +40,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideCast.dart.intertwined.expect
index ad77d119842..92f0c005eb3 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideCast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideCast.dart.intertwined.expect
@@ -91,8 +91,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideNullAssert.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideNullAssert.dart.expect
index 453f8476794..070038d2aa1 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideNullAssert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideNullAssert.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
               handleLiteralList(0, [, null, ])
               handleConstantPattern(const)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideNullAssert.dart.intertwined.expect
index 0c967cb2644..bf78bf516d2 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideNullAssert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideNullAssert.dart.intertwined.expect
@@ -85,8 +85,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideNullCheck.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideNullCheck.dart.expect
index c11394fa2b4..866dbf1902b 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideNullCheck.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideNullCheck.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
               handleLiteralList(0, [, null, ])
               handleConstantPattern(const)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideNullCheck.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideNullCheck.dart.intertwined.expect
index 2d4268a64ec..25113aaee83 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideNullCheck.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_typed_empty_insideNullCheck.dart.intertwined.expect
@@ -85,8 +85,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideCase.dart.expect
index 321b38c7aee..1bfef15609b 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideCase.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
               handleLiteralInt(1)
               handleLiteralList(1, [, null, ])
               handleConstantPattern(const)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideCase.dart.intertwined.expect
index be22e62f326..685ebb33f1d 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideCase.dart.intertwined.expect
@@ -87,8 +87,7 @@ parseUnit(test)
                                 listener: handleLiteralList(1, [, null, ])
                       listener: handleConstantPattern(const)
                   ensureColon(])
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideCast.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideCast.dart.expect
index 16e6deb8a72..89b2e0f018c 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideCast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideCast.dart.expect
@@ -41,8 +41,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideCast.dart.intertwined.expect
index cb63f7cff9a..5d943a847fb 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideCast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideCast.dart.intertwined.expect
@@ -94,8 +94,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideNullAssert.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideNullAssert.dart.expect
index ac8a2818fa5..9f1021c6530 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideNullAssert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideNullAssert.dart.expect
@@ -36,8 +36,7 @@ beginCompilationUnit(test)
               handleLiteralList(1, [, null, ])
               handleConstantPattern(const)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideNullAssert.dart.intertwined.expect
index cf716e8b476..38e65785f32 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideNullAssert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideNullAssert.dart.intertwined.expect
@@ -88,8 +88,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideNullCheck.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideNullCheck.dart.expect
index a383fc646ef..206ffab5c5e 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideNullCheck.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideNullCheck.dart.expect
@@ -36,8 +36,7 @@ beginCompilationUnit(test)
               handleLiteralList(1, [, null, ])
               handleConstantPattern(const)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideNullCheck.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideNullCheck.dart.intertwined.expect
index 79527cee7be..779c18ec787 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideNullCheck.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_typed_nonEmpty_insideNullCheck.dart.intertwined.expect
@@ -88,8 +88,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideCase.dart.expect
index 84d61e94f1c..bd1150d7ba1 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideCase.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(test)
               handleNoTypeArguments([])
               handleLiteralList(0, [, null, ])
               handleConstantPattern(const)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideCase.dart.intertwined.expect
index 65efe32aec6..8723e0d76ff 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideCase.dart.intertwined.expect
@@ -79,8 +79,7 @@ parseUnit(test)
                               listener: handleLiteralList(0, [, null, ])
                       listener: handleConstantPattern(const)
                   ensureColon(])
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideCast.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideCast.dart.expect
index 6b95a366e27..a380d805485 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideCast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideCast.dart.expect
@@ -36,8 +36,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideCast.dart.intertwined.expect
index af08de1984a..85e606a8406 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideCast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideCast.dart.intertwined.expect
@@ -86,8 +86,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideNullAssert.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideNullAssert.dart.expect
index 784e057045d..08a1960fc07 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideNullAssert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideNullAssert.dart.expect
@@ -31,8 +31,7 @@ beginCompilationUnit(test)
               handleLiteralList(0, [, null, ])
               handleConstantPattern(const)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideNullAssert.dart.intertwined.expect
index 8fd62b641bb..0561593666a 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideNullAssert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideNullAssert.dart.intertwined.expect
@@ -80,8 +80,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideNullCheck.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideNullCheck.dart.expect
index fe730b8b3fd..6ab0fdaa550 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideNullCheck.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideNullCheck.dart.expect
@@ -31,8 +31,7 @@ beginCompilationUnit(test)
               handleLiteralList(0, [, null, ])
               handleConstantPattern(const)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideNullCheck.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideNullCheck.dart.intertwined.expect
index 3cb08af20ed..95a52c6aaea 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideNullCheck.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_empty_insideNullCheck.dart.intertwined.expect
@@ -80,8 +80,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideCase.dart.expect
index d7dd9045bed..3ed42ac7c7e 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideCase.dart.expect
@@ -31,8 +31,7 @@ beginCompilationUnit(test)
               handleLiteralInt(1)
               handleLiteralList(1, [, null, ])
               handleConstantPattern(const)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideCase.dart.intertwined.expect
index 1a8d474ae2b..717753c78b5 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideCase.dart.intertwined.expect
@@ -82,8 +82,7 @@ parseUnit(test)
                               listener: handleLiteralList(1, [, null, ])
                       listener: handleConstantPattern(const)
                   ensureColon(])
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideCast.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideCast.dart.expect
index be645293bb9..74500972165 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideCast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideCast.dart.expect
@@ -37,8 +37,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideCast.dart.intertwined.expect
index aac2b4825c5..b77ab04a821 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideCast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideCast.dart.intertwined.expect
@@ -89,8 +89,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideNullAssert.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideNullAssert.dart.expect
index 8aeebbab26b..9fb2d9f096f 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideNullAssert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideNullAssert.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
               handleLiteralList(1, [, null, ])
               handleConstantPattern(const)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideNullAssert.dart.intertwined.expect
index a1bd83e461e..ee59b05c54a 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideNullAssert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideNullAssert.dart.intertwined.expect
@@ -83,8 +83,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideNullCheck.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideNullCheck.dart.expect
index 07f75278946..a9cc83380de 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideNullCheck.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideNullCheck.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
               handleLiteralList(1, [, null, ])
               handleConstantPattern(const)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideNullCheck.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideNullCheck.dart.intertwined.expect
index fa07a2a5c7f..99f329fb52b 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideNullCheck.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_list_untyped_nonEmpty_insideNullCheck.dart.intertwined.expect
@@ -83,8 +83,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideCase.dart.expect
index 5b84b34fd6c..ca1070007a8 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideCase.dart.expect
@@ -40,8 +40,7 @@ beginCompilationUnit(test)
               handleLiteralMapEntry(:, })
               handleLiteralSetOrMap(1, {, null, }, false)
               handleConstantPattern(const)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideCase.dart.intertwined.expect
index d7c1fd4a0b9..d4dc21259c2 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideCase.dart.intertwined.expect
@@ -97,8 +97,7 @@ parseUnit(test)
                                 listener: handleLiteralSetOrMap(1, {, null, }, false)
                       listener: handleConstantPattern(const)
                   ensureColon(})
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideCast.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideCast.dart.expect
index 112ca8c3b4f..bee31e9db3f 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideCast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideCast.dart.expect
@@ -46,8 +46,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideCast.dart.intertwined.expect
index 90ddedcff50..fedcdcf6e38 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideCast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideCast.dart.intertwined.expect
@@ -104,8 +104,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideNullAssert.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideNullAssert.dart.expect
index 73d577c375b..818f18a5b5d 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideNullAssert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideNullAssert.dart.expect
@@ -41,8 +41,7 @@ beginCompilationUnit(test)
               handleLiteralSetOrMap(1, {, null, }, false)
               handleConstantPattern(const)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideNullAssert.dart.intertwined.expect
index 1a79cfe4a0f..0d6653c0b9f 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideNullAssert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideNullAssert.dart.intertwined.expect
@@ -98,8 +98,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideNullCheck.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideNullCheck.dart.expect
index 9c86ff04a91..6f768521e5d 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideNullCheck.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideNullCheck.dart.expect
@@ -41,8 +41,7 @@ beginCompilationUnit(test)
               handleLiteralSetOrMap(1, {, null, }, false)
               handleConstantPattern(const)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideNullCheck.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideNullCheck.dart.intertwined.expect
index 5d77c7ca037..27b17122220 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideNullCheck.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_map_typed_insideNullCheck.dart.intertwined.expect
@@ -98,8 +98,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideCase.dart.expect
index d8aa2d1a368..203c285606b 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideCase.dart.expect
@@ -33,8 +33,7 @@ beginCompilationUnit(test)
               handleLiteralMapEntry(:, })
               handleLiteralSetOrMap(1, {, null, }, false)
               handleConstantPattern(const)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideCase.dart.intertwined.expect
index a0e5043abbc..9d055d39fa4 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideCase.dart.intertwined.expect
@@ -89,8 +89,7 @@ parseUnit(test)
                               listener: handleLiteralSetOrMap(1, {, null, }, false)
                       listener: handleConstantPattern(const)
                   ensureColon(})
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideCast.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideCast.dart.expect
index 4463029ad23..e899fda5756 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideCast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideCast.dart.expect
@@ -39,8 +39,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideCast.dart.intertwined.expect
index 7dfcb44b2a5..fcabfdfb161 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideCast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideCast.dart.intertwined.expect
@@ -96,8 +96,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideNullAssert.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideNullAssert.dart.expect
index fe11ec2d3bb..232f214daef 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideNullAssert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideNullAssert.dart.expect
@@ -34,8 +34,7 @@ beginCompilationUnit(test)
               handleLiteralSetOrMap(1, {, null, }, false)
               handleConstantPattern(const)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideNullAssert.dart.intertwined.expect
index 213c919e7d5..d3e33b9d48c 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideNullAssert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideNullAssert.dart.intertwined.expect
@@ -90,8 +90,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideNullCheck.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideNullCheck.dart.expect
index c3e088256e0..d7dc38af6d0 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideNullCheck.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideNullCheck.dart.expect
@@ -34,8 +34,7 @@ beginCompilationUnit(test)
               handleLiteralSetOrMap(1, {, null, }, false)
               handleConstantPattern(const)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideNullCheck.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideNullCheck.dart.intertwined.expect
index 45cb44c23fa..b5cf32bc375 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideNullCheck.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_map_untyped_insideNullCheck.dart.intertwined.expect
@@ -90,8 +90,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideCase.dart.expect
index 677cb9e41af..b7b652f55ad 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideCase.dart.expect
@@ -34,8 +34,7 @@ beginCompilationUnit(test)
               endArguments(1, (, ))
               handleSend(Foo, :)
               handleConstantPattern(const)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideCase.dart.intertwined.expect
index d8c55b283c5..21c635de9c3 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideCase.dart.intertwined.expect
@@ -92,8 +92,7 @@ parseUnit(test)
                                 listener: handleSend(Foo, :)
                       listener: handleConstantPattern(const)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideCast.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideCast.dart.expect
index 1f903356bf8..3f1d6aaa0c9 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideCast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideCast.dart.expect
@@ -40,8 +40,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideCast.dart.intertwined.expect
index 506e05e636c..fd13ae8e195 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideCast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideCast.dart.intertwined.expect
@@ -99,8 +99,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideNullAssert.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideNullAssert.dart.expect
index 5a437465638..66e74b97ef7 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideNullAssert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideNullAssert.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
               handleSend(Foo, !)
               handleConstantPattern(const)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideNullAssert.dart.intertwined.expect
index 91596a70263..63f019ae2f8 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideNullAssert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideNullAssert.dart.intertwined.expect
@@ -93,8 +93,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideNullCheck.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideNullCheck.dart.expect
index 2cf96fcea22..ff36d6d6e3a 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideNullCheck.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideNullCheck.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
               handleSend(Foo, ?)
               handleConstantPattern(const)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideNullCheck.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideNullCheck.dart.intertwined.expect
index 1fbf5c47cb6..2b1bc48b045 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideNullCheck.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_objectExpression_insideNullCheck.dart.intertwined.expect
@@ -93,8 +93,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideCase.dart.expect
index 06398678d0e..1a7e56c5511 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideCase.dart.expect
@@ -31,8 +31,7 @@ beginCompilationUnit(test)
                 handleLiteralInt(1)
               endParenthesizedExpression(()
               handleConstantPattern(const)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideCase.dart.intertwined.expect
index 6aa44b3cb0a..df46abd1d1b 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideCase.dart.intertwined.expect
@@ -84,8 +84,7 @@ parseUnit(test)
                                 listener: endParenthesizedExpression(()
                       listener: handleConstantPattern(const)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideCast.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideCast.dart.expect
index 26cb069e0a8..e08a5c6756b 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideCast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideCast.dart.expect
@@ -37,8 +37,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideCast.dart.intertwined.expect
index 77f9a878164..81ae82c6838 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideCast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideCast.dart.intertwined.expect
@@ -91,8 +91,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideNullAssert.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideNullAssert.dart.expect
index a100e661836..0c0df0a0d15 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideNullAssert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideNullAssert.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
               endParenthesizedExpression(()
               handleConstantPattern(const)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideNullAssert.dart.intertwined.expect
index c7d8716ccfc..18fa24cd8ca 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideNullAssert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideNullAssert.dart.intertwined.expect
@@ -85,8 +85,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideNullCheck.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideNullCheck.dart.expect
index 5c6143aaad7..becc2fbcda3 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideNullCheck.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideNullCheck.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
               endParenthesizedExpression(()
               handleConstantPattern(const)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideNullCheck.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideNullCheck.dart.intertwined.expect
index 775f1ba39dd..80cbe50007f 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideNullCheck.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_parenthesized_insideNullCheck.dart.intertwined.expect
@@ -85,8 +85,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideCase.dart.expect
index f5c4c583e7c..238e744edcc 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideCase.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
               handleLiteralInt(1)
               handleLiteralSetOrMap(1, {, null, }, true)
               handleConstantPattern(const)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideCase.dart.intertwined.expect
index 2a27773a750..8beac7c9010 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideCase.dart.intertwined.expect
@@ -87,8 +87,7 @@ parseUnit(test)
                                 listener: handleLiteralSetOrMap(1, {, null, }, true)
                       listener: handleConstantPattern(const)
                   ensureColon(})
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideCast.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideCast.dart.expect
index 500eef07098..2edf452178b 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideCast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideCast.dart.expect
@@ -41,8 +41,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideCast.dart.intertwined.expect
index 7475b912c2a..0160f94b78f 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideCast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideCast.dart.intertwined.expect
@@ -94,8 +94,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideNullAssert.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideNullAssert.dart.expect
index 6030a0f41d5..31a91c45b20 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideNullAssert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideNullAssert.dart.expect
@@ -36,8 +36,7 @@ beginCompilationUnit(test)
               handleLiteralSetOrMap(1, {, null, }, true)
               handleConstantPattern(const)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideNullAssert.dart.intertwined.expect
index 1d152a7106e..2d703cdbd2f 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideNullAssert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideNullAssert.dart.intertwined.expect
@@ -88,8 +88,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideNullCheck.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideNullCheck.dart.expect
index a107a8ec8ba..6801bb3a9e8 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideNullCheck.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideNullCheck.dart.expect
@@ -36,8 +36,7 @@ beginCompilationUnit(test)
               handleLiteralSetOrMap(1, {, null, }, true)
               handleConstantPattern(const)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideNullCheck.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideNullCheck.dart.intertwined.expect
index 29aaec40298..497132e8d4c 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideNullCheck.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_set_typed_insideNullCheck.dart.intertwined.expect
@@ -88,8 +88,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideCase.dart.expect
index f0362c81e08..367b39fa2ab 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideCase.dart.expect
@@ -31,8 +31,7 @@ beginCompilationUnit(test)
               handleLiteralInt(1)
               handleLiteralSetOrMap(1, {, null, }, true)
               handleConstantPattern(const)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideCase.dart.intertwined.expect
index 22dbfca7cbe..5e8a01b1bf9 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideCase.dart.intertwined.expect
@@ -82,8 +82,7 @@ parseUnit(test)
                               listener: handleLiteralSetOrMap(1, {, null, }, true)
                       listener: handleConstantPattern(const)
                   ensureColon(})
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideCast.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideCast.dart.expect
index e53e423f4dd..5945f688682 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideCast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideCast.dart.expect
@@ -37,8 +37,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideCast.dart.intertwined.expect
index 9437de13bdf..9bc194764e0 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideCast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideCast.dart.intertwined.expect
@@ -89,8 +89,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideNullAssert.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideNullAssert.dart.expect
index 665f7f07472..df9b9f610b4 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideNullAssert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideNullAssert.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
               handleLiteralSetOrMap(1, {, null, }, true)
               handleConstantPattern(const)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideNullAssert.dart.intertwined.expect
index e833db4adf5..a1c32b29b78 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideNullAssert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideNullAssert.dart.intertwined.expect
@@ -83,8 +83,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideNullCheck.dart.expect b/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideNullCheck.dart.expect
index 8b3f1e10d32..a7e40985bae 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideNullCheck.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideNullCheck.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
               handleLiteralSetOrMap(1, {, null, }, true)
               handleConstantPattern(const)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideNullCheck.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideNullCheck.dart.intertwined.expect
index b83f1119244..975ebe75a37 100644
--- a/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideNullCheck.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/constant_set_untyped_insideNullCheck.dart.intertwined.expect
@@ -83,8 +83,7 @@ parseUnit(test)
                       listener: handleConstantPattern(const)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/double_literal_inside_case.dart.expect b/pkg/front_end/parser_testcases/patterns/double_literal_inside_case.dart.expect
index 9e80b7b244e..234945fbca0 100644
--- a/pkg/front_end/parser_testcases/patterns/double_literal_inside_case.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/double_literal_inside_case.dart.expect
@@ -29,8 +29,7 @@ beginCompilationUnit(test)
             beginCaseExpression(case)
               handleLiteralDouble(1.0)
               handleConstantPattern(null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/double_literal_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/double_literal_inside_case.dart.intertwined.expect
index 93ae28fc05f..e0d3d288f0a 100644
--- a/pkg/front_end/parser_testcases/patterns/double_literal_inside_case.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/double_literal_inside_case.dart.intertwined.expect
@@ -75,8 +75,7 @@ parseUnit(test)
                               listener: handleLiteralDouble(1.0)
                       listener: handleConstantPattern(null)
                   ensureColon(1.0)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/double_literal_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/double_literal_inside_cast.dart.expect
index 7d51e75d0b8..0cb68c15245 100644
--- a/pkg/front_end/parser_testcases/patterns/double_literal_inside_cast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/double_literal_inside_cast.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/double_literal_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/double_literal_inside_cast.dart.intertwined.expect
index f1341eb84c5..d98b164d356 100644
--- a/pkg/front_end/parser_testcases/patterns/double_literal_inside_cast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/double_literal_inside_cast.dart.intertwined.expect
@@ -82,8 +82,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/double_literal_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/double_literal_inside_null_assert.dart.expect
index caf21bc7007..b1dd16be74c 100644
--- a/pkg/front_end/parser_testcases/patterns/double_literal_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/double_literal_inside_null_assert.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(test)
               handleLiteralDouble(1.0)
               handleConstantPattern(null)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/double_literal_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/double_literal_inside_null_assert.dart.intertwined.expect
index 06ce3d1304c..ce1b3e6926b 100644
--- a/pkg/front_end/parser_testcases/patterns/double_literal_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/double_literal_inside_null_assert.dart.intertwined.expect
@@ -76,8 +76,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/double_literal_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/double_literal_inside_null_check.dart.expect
index 96f59236c00..8aacc01bd2e 100644
--- a/pkg/front_end/parser_testcases/patterns/double_literal_inside_null_check.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/double_literal_inside_null_check.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(test)
               handleLiteralDouble(1.0)
               handleConstantPattern(null)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/double_literal_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/double_literal_inside_null_check.dart.intertwined.expect
index cdfc4df225b..018394371de 100644
--- a/pkg/front_end/parser_testcases/patterns/double_literal_inside_null_check.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/double_literal_inside_null_check.dart.intertwined.expect
@@ -76,8 +76,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.expect
index b27c2543a3a..e58c4352ffa 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.expect
@@ -66,8 +66,7 @@ beginCompilationUnit(class)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.intertwined.expect
index 8080ea84532..9ece21a23ae 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_cast.dart.intertwined.expect
@@ -135,8 +135,7 @@ parseUnit(class)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.expect
index 57a4a5217d6..52a1144530b 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.expect
@@ -61,8 +61,7 @@ beginCompilationUnit(class)
               handleExtractorPatternFields(1, (, ))
               handleExtractorPattern(C, null, null)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.intertwined.expect
index 20c981ad2c0..fca01a1e616 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_assert.dart.intertwined.expect
@@ -129,8 +129,7 @@ parseUnit(class)
                       listener: handleExtractorPattern(C, null, null)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.expect
index 04d786b9133..d432ed2baae 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.expect
@@ -61,8 +61,7 @@ beginCompilationUnit(class)
               handleExtractorPatternFields(1, (, ))
               handleExtractorPattern(C, null, null)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.intertwined.expect
index 6760fc4e663..a35c015564e 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_inside_null_check.dart.intertwined.expect
@@ -129,8 +129,7 @@ parseUnit(class)
                       listener: handleExtractorPattern(C, null, null)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.expect
index d49080c77ab..be2eb0dbb6b 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.expect
@@ -57,8 +57,7 @@ beginCompilationUnit(class)
               endTypeArguments(1, <, >)
               handleExtractorPatternFields(0, (, ))
               handleExtractorPattern(C, null, null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.intertwined.expect
index 2fb5c026367..9b326ef3b5f 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args.dart.intertwined.expect
@@ -112,8 +112,7 @@ parseUnit(class)
                         listener: handleExtractorPatternFields(0, (, ))
                       listener: handleExtractorPattern(C, null, null)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.expect
index b212d8e89d2..6ccb1f3a4af 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.expect
@@ -73,8 +73,7 @@ beginCompilationUnit(class)
               handleExtractorPatternFields(1, (, ))
               handleExtractorPattern(C, null, null)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect
index 8fa680d838f..da65071ed43 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect
@@ -141,8 +141,7 @@ parseUnit(class)
                       listener: handleExtractorPattern(C, null, null)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_prefixedNamedUnderscore_withTypeArgs_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_prefixedNamedUnderscore_withTypeArgs_insideCase.dart.expect
index b9f3b5f6e08..6e136936907 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_prefixedNamedUnderscore_withTypeArgs_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_prefixedNamedUnderscore_withTypeArgs_insideCase.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(void)
               endTypeArguments(1, <, >)
               handleExtractorPatternFields(0, (, ))
               handleExtractorPattern(_, ., Future)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_prefixedNamedUnderscore_withTypeArgs_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_prefixedNamedUnderscore_withTypeArgs_insideCase.dart.intertwined.expect
index db5d0c1cabe..815e1eed032 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_prefixedNamedUnderscore_withTypeArgs_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_prefixedNamedUnderscore_withTypeArgs_insideCase.dart.intertwined.expect
@@ -74,8 +74,7 @@ parseUnit(void)
                         listener: handleExtractorPatternFields(0, (, ))
                       listener: handleExtractorPattern(_, ., Future)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_prefixedNamedUnderscore_withoutTypeArgs_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_prefixedNamedUnderscore_withoutTypeArgs_insideCase.dart.expect
index 9a19bbdbd46..56c9cfa9247 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_prefixedNamedUnderscore_withoutTypeArgs_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_prefixedNamedUnderscore_withoutTypeArgs_insideCase.dart.expect
@@ -28,8 +28,7 @@ beginCompilationUnit(void)
               handleNoTypeArguments(()
               handleExtractorPatternFields(0, (, ))
               handleExtractorPattern(_, ., Future)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_prefixedNamedUnderscore_withoutTypeArgs_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_prefixedNamedUnderscore_withoutTypeArgs_insideCase.dart.intertwined.expect
index f3bc18345db..5c10837498d 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_prefixedNamedUnderscore_withoutTypeArgs_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_prefixedNamedUnderscore_withoutTypeArgs_insideCase.dart.intertwined.expect
@@ -70,8 +70,7 @@ parseUnit(void)
                         listener: handleExtractorPatternFields(0, (, ))
                       listener: handleExtractorPattern(_, ., Future)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_unprefixedNamedUnderscore_withTypeArgs_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_unprefixedNamedUnderscore_withTypeArgs_insideCase.dart.expect
index 75127a962be..ff565334477 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_unprefixedNamedUnderscore_withTypeArgs_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_unprefixedNamedUnderscore_withTypeArgs_insideCase.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(void)
               endTypeArguments(1, <, >)
               handleExtractorPatternFields(0, (, ))
               handleExtractorPattern(_, null, null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_unprefixedNamedUnderscore_withTypeArgs_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_unprefixedNamedUnderscore_withTypeArgs_insideCase.dart.intertwined.expect
index 1e5176d59b0..2a448db3558 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_unprefixedNamedUnderscore_withTypeArgs_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_unprefixedNamedUnderscore_withTypeArgs_insideCase.dart.intertwined.expect
@@ -74,8 +74,7 @@ parseUnit(void)
                         listener: handleExtractorPatternFields(0, (, ))
                       listener: handleExtractorPattern(_, null, null)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_unprefixedNamedUnderscore_withoutTypeArgs_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/extractor_unprefixedNamedUnderscore_withoutTypeArgs_insideCase.dart.expect
index f2931954fc8..aa3d55015c2 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_unprefixedNamedUnderscore_withoutTypeArgs_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_unprefixedNamedUnderscore_withoutTypeArgs_insideCase.dart.expect
@@ -28,8 +28,7 @@ beginCompilationUnit(void)
               handleNoTypeArguments(()
               handleExtractorPatternFields(0, (, ))
               handleExtractorPattern(_, null, null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/extractor_unprefixedNamedUnderscore_withoutTypeArgs_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/extractor_unprefixedNamedUnderscore_withoutTypeArgs_insideCase.dart.intertwined.expect
index ce3d2607ee7..d986d1a64c8 100644
--- a/pkg/front_end/parser_testcases/patterns/extractor_unprefixedNamedUnderscore_withoutTypeArgs_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/extractor_unprefixedNamedUnderscore_withoutTypeArgs_insideCase.dart.intertwined.expect
@@ -70,8 +70,7 @@ parseUnit(void)
                         listener: handleExtractorPatternFields(0, (, ))
                       listener: handleExtractorPattern(_, null, null)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/final_variable_inside_case.dart.expect b/pkg/front_end/parser_testcases/patterns/final_variable_inside_case.dart.expect
index 65ffd5b617b..1d75c91fc93 100644
--- a/pkg/front_end/parser_testcases/patterns/final_variable_inside_case.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/final_variable_inside_case.dart.expect
@@ -29,8 +29,7 @@ beginCompilationUnit(test)
             beginCaseExpression(case)
               handleNoType(final)
               handleVariablePattern(final, y)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/final_variable_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/final_variable_inside_case.dart.intertwined.expect
index 63f070c8ffa..ecab1c9b329 100644
--- a/pkg/front_end/parser_testcases/patterns/final_variable_inside_case.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/final_variable_inside_case.dart.intertwined.expect
@@ -72,8 +72,7 @@ parseUnit(test)
                         listener: handleNoType(final)
                         listener: handleVariablePattern(final, y)
                   ensureColon(y)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/final_variable_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/final_variable_inside_cast.dart.expect
index fe7d33de05b..80d63f7d883 100644
--- a/pkg/front_end/parser_testcases/patterns/final_variable_inside_cast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/final_variable_inside_cast.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/final_variable_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/final_variable_inside_cast.dart.intertwined.expect
index 1f752d10c93..f5f84cb17b1 100644
--- a/pkg/front_end/parser_testcases/patterns/final_variable_inside_cast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/final_variable_inside_cast.dart.intertwined.expect
@@ -79,8 +79,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/final_variable_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/final_variable_inside_null_assert.dart.expect
index 3d7b6239f7a..c9bf2aeb842 100644
--- a/pkg/front_end/parser_testcases/patterns/final_variable_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/final_variable_inside_null_assert.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(test)
               handleNoType(final)
               handleVariablePattern(final, y)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/final_variable_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/final_variable_inside_null_assert.dart.intertwined.expect
index 4f0e5c845a1..0b7c30a4405 100644
--- a/pkg/front_end/parser_testcases/patterns/final_variable_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/final_variable_inside_null_assert.dart.intertwined.expect
@@ -73,8 +73,7 @@ parseUnit(test)
                         listener: handleVariablePattern(final, y)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/final_variable_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/final_variable_inside_null_check.dart.expect
index 2dd679789ec..9f5f3805405 100644
--- a/pkg/front_end/parser_testcases/patterns/final_variable_inside_null_check.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/final_variable_inside_null_check.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(test)
               handleNoType(final)
               handleVariablePattern(final, y)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/final_variable_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/final_variable_inside_null_check.dart.intertwined.expect
index 78b7605e3c1..9603bd27d39 100644
--- a/pkg/front_end/parser_testcases/patterns/final_variable_inside_null_check.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/final_variable_inside_null_check.dart.intertwined.expect
@@ -73,8 +73,7 @@ parseUnit(test)
                         listener: handleVariablePattern(final, y)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/integer_literal_inside_case.dart.expect b/pkg/front_end/parser_testcases/patterns/integer_literal_inside_case.dart.expect
index 67d1df15cae..c2ac5afd588 100644
--- a/pkg/front_end/parser_testcases/patterns/integer_literal_inside_case.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/integer_literal_inside_case.dart.expect
@@ -29,8 +29,7 @@ beginCompilationUnit(test)
             beginCaseExpression(case)
               handleLiteralInt(1)
               handleConstantPattern(null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/integer_literal_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/integer_literal_inside_case.dart.intertwined.expect
index 1f79491913e..1f5762a7e03 100644
--- a/pkg/front_end/parser_testcases/patterns/integer_literal_inside_case.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/integer_literal_inside_case.dart.intertwined.expect
@@ -75,8 +75,7 @@ parseUnit(test)
                               listener: handleLiteralInt(1)
                       listener: handleConstantPattern(null)
                   ensureColon(1)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/integer_literal_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/integer_literal_inside_cast.dart.expect
index 02dbe12a418..57a8fd3a2f3 100644
--- a/pkg/front_end/parser_testcases/patterns/integer_literal_inside_cast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/integer_literal_inside_cast.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/integer_literal_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/integer_literal_inside_cast.dart.intertwined.expect
index e7c15a28fd7..c88cf9e10eb 100644
--- a/pkg/front_end/parser_testcases/patterns/integer_literal_inside_cast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/integer_literal_inside_cast.dart.intertwined.expect
@@ -82,8 +82,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/integer_literal_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/integer_literal_inside_null_assert.dart.expect
index 43dd35a086c..30bc4cef5e1 100644
--- a/pkg/front_end/parser_testcases/patterns/integer_literal_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/integer_literal_inside_null_assert.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(test)
               handleLiteralInt(1)
               handleConstantPattern(null)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/integer_literal_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/integer_literal_inside_null_assert.dart.intertwined.expect
index 4b7601b9d41..f4cf9bf7b70 100644
--- a/pkg/front_end/parser_testcases/patterns/integer_literal_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/integer_literal_inside_null_assert.dart.intertwined.expect
@@ -76,8 +76,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/integer_literal_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/integer_literal_inside_null_check.dart.expect
index 29bb5f5b875..8875e141b13 100644
--- a/pkg/front_end/parser_testcases/patterns/integer_literal_inside_null_check.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/integer_literal_inside_null_check.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(test)
               handleLiteralInt(1)
               handleConstantPattern(null)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/integer_literal_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/integer_literal_inside_null_check.dart.intertwined.expect
index 14513ba13a3..ceea25d4d7b 100644
--- a/pkg/front_end/parser_testcases/patterns/integer_literal_inside_null_check.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/integer_literal_inside_null_check.dart.intertwined.expect
@@ -76,8 +76,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case.dart.expect b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case.dart.expect
index 7466fbb28e6..9dcbced6797 100644
--- a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case.dart.expect
@@ -33,8 +33,7 @@ beginCompilationUnit(test)
               handleLiteralInt(2)
               handleConstantPattern(null)
               handleListPattern(2, [, ])
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case.dart.intertwined.expect
index 4aad8092346..60ebb41e43d 100644
--- a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case.dart.intertwined.expect
@@ -88,8 +88,7 @@ parseUnit(test)
                             listener: handleConstantPattern(null)
                         listener: handleListPattern(2, [, ])
                   ensureColon(])
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_empty.dart.expect b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_empty.dart.expect
index f5739d744a8..7b2c42e6506 100644
--- a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_empty.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_empty.dart.expect
@@ -29,8 +29,7 @@ beginCompilationUnit(test)
             beginCaseExpression(case)
               handleNoTypeArguments([])
               handleListPattern(0, [, ])
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_empty.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_empty.dart.intertwined.expect
index b9904d46312..a98151dde25 100644
--- a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_empty.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_empty.dart.intertwined.expect
@@ -75,8 +75,7 @@ parseUnit(test)
                           rewriter()
                         listener: handleListPattern(0, [, ])
                   ensureColon(])
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_empty_whitespace.dart.expect b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_empty_whitespace.dart.expect
index e5e91a79021..3912e74121f 100644
--- a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_empty_whitespace.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_empty_whitespace.dart.expect
@@ -29,8 +29,7 @@ beginCompilationUnit(test)
             beginCaseExpression(case)
               handleNoTypeArguments([)
               handleListPattern(0, [, ])
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_empty_whitespace.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_empty_whitespace.dart.intertwined.expect
index 72f27b8f81b..79474fce3fc 100644
--- a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_empty_whitespace.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_empty_whitespace.dart.intertwined.expect
@@ -72,8 +72,7 @@ parseUnit(test)
                       parseListPatternSuffix(case)
                         listener: handleListPattern(0, [, ])
                   ensureColon(])
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_with_type_arguments.dart.expect b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_with_type_arguments.dart.expect
index 1a60bd932ec..4157c8ea365 100644
--- a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_with_type_arguments.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_with_type_arguments.dart.expect
@@ -37,8 +37,7 @@ beginCompilationUnit(test)
               handleLiteralInt(2)
               handleConstantPattern(null)
               handleListPattern(2, [, ])
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_with_type_arguments.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_with_type_arguments.dart.intertwined.expect
index 28f5895227e..952bcd2c0fe 100644
--- a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_with_type_arguments.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_case_with_type_arguments.dart.intertwined.expect
@@ -92,8 +92,7 @@ parseUnit(test)
                             listener: handleConstantPattern(null)
                         listener: handleListPattern(2, [, ])
                   ensureColon(])
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_cast.dart.expect
index a3a35b348f8..853bdee0554 100644
--- a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_cast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_cast.dart.expect
@@ -37,8 +37,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_cast.dart.intertwined.expect
index 183104ebb78..6e80e126fba 100644
--- a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_cast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_cast.dart.intertwined.expect
@@ -87,8 +87,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_null_assert.dart.expect
index 4a62d0caa2c..cb51afb81f9 100644
--- a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_null_assert.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handleListPattern(1, [, ])
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_null_assert.dart.intertwined.expect
index 2aae680cfe1..1c4d23f28f3 100644
--- a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_null_assert.dart.intertwined.expect
@@ -81,8 +81,7 @@ parseUnit(test)
                         listener: handleListPattern(1, [, ])
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_null_check.dart.expect
index ac55155475c..2687a944967 100644
--- a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_null_check.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_null_check.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handleListPattern(1, [, ])
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_null_check.dart.intertwined.expect
index 0ef91697d2d..ca9514f4971 100644
--- a/pkg/front_end/parser_testcases/patterns/list_pattern_inside_null_check.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/list_pattern_inside_null_check.dart.intertwined.expect
@@ -81,8 +81,7 @@ parseUnit(test)
                         listener: handleListPattern(1, [, ])
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_and_lhs.dart.expect b/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_and_lhs.dart.expect
index 0ca36d52d1f..4102abded47 100644
--- a/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_and_lhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_and_lhs.dart.expect
@@ -43,8 +43,7 @@ beginCompilationUnit(test)
                 handleType(Object, ?)
                 handleVariablePattern(null, _)
               endBinaryPattern(&)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_and_lhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_and_lhs.dart.intertwined.expect
index c9990b36de6..71ea2fe54f1 100644
--- a/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_and_lhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_and_lhs.dart.intertwined.expect
@@ -92,8 +92,7 @@ parseUnit(test)
                           listener: handleVariablePattern(null, _)
                     listener: endBinaryPattern(&)
                   ensureColon(_)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_or_lhs.dart.expect b/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_or_lhs.dart.expect
index 2995bae89a5..5c204664061 100644
--- a/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_or_lhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_or_lhs.dart.expect
@@ -43,8 +43,7 @@ beginCompilationUnit(test)
                 handleType(Object, ?)
                 handleVariablePattern(null, _)
               endBinaryPattern(|)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_or_lhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_or_lhs.dart.intertwined.expect
index 841788efee4..fe2d2123535 100644
--- a/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_or_lhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_or_lhs.dart.intertwined.expect
@@ -92,8 +92,7 @@ parseUnit(test)
                           listener: handleVariablePattern(null, _)
                     listener: endBinaryPattern(|)
                   ensureColon(_)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_or_rhs.dart.expect b/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_or_rhs.dart.expect
index b1baf5562db..ca50ac19bea 100644
--- a/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_or_rhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_or_rhs.dart.expect
@@ -43,8 +43,7 @@ beginCompilationUnit(test)
                   handleVariablePattern(null, _)
                 endBinaryPattern(&)
               endBinaryPattern(|)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_or_rhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_or_rhs.dart.intertwined.expect
index 3aa502ee393..07d942c281f 100644
--- a/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_or_rhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/logical_and_inside_logical_or_rhs.dart.intertwined.expect
@@ -92,8 +92,7 @@ parseUnit(test)
                       listener: endBinaryPattern(&)
                     listener: endBinaryPattern(|)
                   ensureColon(_)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/logical_or_inside_logical_or_lhs.dart.expect b/pkg/front_end/parser_testcases/patterns/logical_or_inside_logical_or_lhs.dart.expect
index ad9411794e6..6d2af8c4ede 100644
--- a/pkg/front_end/parser_testcases/patterns/logical_or_inside_logical_or_lhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/logical_or_inside_logical_or_lhs.dart.expect
@@ -43,8 +43,7 @@ beginCompilationUnit(test)
                 handleType(Object, ?)
                 handleVariablePattern(null, _)
               endBinaryPattern(|)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/logical_or_inside_logical_or_lhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/logical_or_inside_logical_or_lhs.dart.intertwined.expect
index e987b910bee..39c78442696 100644
--- a/pkg/front_end/parser_testcases/patterns/logical_or_inside_logical_or_lhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/logical_or_inside_logical_or_lhs.dart.intertwined.expect
@@ -92,8 +92,7 @@ parseUnit(test)
                           listener: handleVariablePattern(null, _)
                     listener: endBinaryPattern(|)
                   ensureColon(_)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case.dart.expect b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case.dart.expect
index 5eea079edef..030822c2155 100644
--- a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case.dart.expect
@@ -39,8 +39,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handleMapPatternEntry(:, })
               handleMapPattern(2, {, })
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case.dart.intertwined.expect
index bfac1c345a8..390aa00207b 100644
--- a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case.dart.intertwined.expect
@@ -106,8 +106,7 @@ parseUnit(test)
                         listener: handleMapPatternEntry(:, })
                         listener: handleMapPattern(2, {, })
                   ensureColon(})
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case_empty.dart.expect b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case_empty.dart.expect
index 5c1f51b164b..12c75cfa50e 100644
--- a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case_empty.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case_empty.dart.expect
@@ -29,8 +29,7 @@ beginCompilationUnit(test)
             beginCaseExpression(case)
               handleNoTypeArguments({)
               handleMapPattern(0, {, })
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case_empty.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case_empty.dart.intertwined.expect
index 75008450b57..08f1d550103 100644
--- a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case_empty.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case_empty.dart.intertwined.expect
@@ -72,8 +72,7 @@ parseUnit(test)
                       parseMapPatternSuffix(case)
                         listener: handleMapPattern(0, {, })
                   ensureColon(})
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case_with_type_arguments.dart.expect b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case_with_type_arguments.dart.expect
index 8badd3f5035..dd3be45e12f 100644
--- a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case_with_type_arguments.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case_with_type_arguments.dart.expect
@@ -46,8 +46,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handleMapPatternEntry(:, })
               handleMapPattern(2, {, })
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case_with_type_arguments.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case_with_type_arguments.dart.intertwined.expect
index 79acb690d75..afe592368c5 100644
--- a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case_with_type_arguments.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_case_with_type_arguments.dart.intertwined.expect
@@ -113,8 +113,7 @@ parseUnit(test)
                         listener: handleMapPatternEntry(:, })
                         listener: handleMapPattern(2, {, })
                   ensureColon(})
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_cast.dart.expect
index 7a46b4cafa9..0c8e875757e 100644
--- a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_cast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_cast.dart.expect
@@ -40,8 +40,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_cast.dart.intertwined.expect
index 0f47c78b10e..45ff66fcb87 100644
--- a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_cast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_cast.dart.intertwined.expect
@@ -96,8 +96,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_null_assert.dart.expect
index 65f7f11a4b1..ff1a39051f4 100644
--- a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_null_assert.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
               handleMapPatternEntry(:, })
               handleMapPattern(1, {, })
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_null_assert.dart.intertwined.expect
index ca92a758b55..9a901d5f945 100644
--- a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_null_assert.dart.intertwined.expect
@@ -90,8 +90,7 @@ parseUnit(test)
                         listener: handleMapPattern(1, {, })
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_null_check.dart.expect
index b1f4c17bb48..fbe53e3675a 100644
--- a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_null_check.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_null_check.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
               handleMapPatternEntry(:, })
               handleMapPattern(1, {, })
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_null_check.dart.intertwined.expect
index 09104745632..05722bd4850 100644
--- a/pkg/front_end/parser_testcases/patterns/map_pattern_inside_null_check.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/map_pattern_inside_null_check.dart.intertwined.expect
@@ -90,8 +90,7 @@ parseUnit(test)
                         listener: handleMapPattern(1, {, })
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_case.dart.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_case.dart.expect
index 7cee2955d08..464199eba87 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_case.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_case.dart.expect
@@ -44,8 +44,7 @@ beginCompilationUnit(test)
               handleSend(y, !)
               handleConstantPattern(null)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_case.dart.intertwined.expect
index 697ae354aa8..8b7eb5db4a9 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_case.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_case.dart.intertwined.expect
@@ -110,8 +110,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.expect
index 2542b07f1de..a154f033e67 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.expect
@@ -61,8 +61,7 @@ beginCompilationUnit(class)
               handlePatternField(:)
               handleExtractorPatternFields(1, (, ))
               handleExtractorPattern(C, null, null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.intertwined.expect
index 62ff7d3c575..3dc630e01f3 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern.dart.intertwined.expect
@@ -129,8 +129,7 @@ parseUnit(class)
                         listener: handleExtractorPatternFields(1, (, ))
                       listener: handleExtractorPattern(C, null, null)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.expect
index 47cb336715d..624caadb121 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.expect
@@ -61,8 +61,7 @@ beginCompilationUnit(class)
               handlePatternField(:)
               handleExtractorPatternFields(1, (, ))
               handleExtractorPattern(C, null, null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.intertwined.expect
index 946e1693cef..0948c7d7ac0 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_extractor_pattern_implicitly_named.dart.intertwined.expect
@@ -125,8 +125,7 @@ parseUnit(class)
                         listener: handleExtractorPatternFields(1, (, ))
                       listener: handleExtractorPattern(C, null, null)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_list_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_list_pattern.dart.expect
index 2c51f2ae660..3dd08d535e9 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_list_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_list_pattern.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handleNullAssertPattern(!)
               handleListPattern(1, [, ])
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_list_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_list_pattern.dart.intertwined.expect
index 214e7bfc0f0..32d738aa8ce 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_list_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_list_pattern.dart.intertwined.expect
@@ -81,8 +81,7 @@ parseUnit(test)
                           listener: handleNullAssertPattern(!)
                         listener: handleListPattern(1, [, ])
                   ensureColon(])
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_and_lhs.dart.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_and_lhs.dart.expect
index 5e229d6ca96..46fbbf81068 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_and_lhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_and_lhs.dart.expect
@@ -34,8 +34,7 @@ beginCompilationUnit(test)
                 handleLiteralInt(2)
                 handleConstantPattern(null)
               endBinaryPattern(&)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_and_lhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_and_lhs.dart.intertwined.expect
index ebf4da94b8f..6e096e797db 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_and_lhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_and_lhs.dart.intertwined.expect
@@ -86,8 +86,7 @@ parseUnit(test)
                         listener: handleConstantPattern(null)
                     listener: endBinaryPattern(&)
                   ensureColon(2)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_and_rhs.dart.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_and_rhs.dart.expect
index ba0b878c340..a4f9a8a256c 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_and_rhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_and_rhs.dart.expect
@@ -34,8 +34,7 @@ beginCompilationUnit(test)
                 handleConstantPattern(null)
                 handleNullAssertPattern(!)
               endBinaryPattern(&)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_and_rhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_and_rhs.dart.intertwined.expect
index 0a28df53f75..9000f33c52f 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_and_rhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_and_rhs.dart.intertwined.expect
@@ -86,8 +86,7 @@ parseUnit(test)
                       listener: handleNullAssertPattern(!)
                     listener: endBinaryPattern(&)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_or_lhs.dart.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_or_lhs.dart.expect
index 520a4f25614..8339f0f4a20 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_or_lhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_or_lhs.dart.expect
@@ -34,8 +34,7 @@ beginCompilationUnit(test)
                 handleLiteralInt(2)
                 handleConstantPattern(null)
               endBinaryPattern(|)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_or_lhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_or_lhs.dart.intertwined.expect
index 33654e5cf8e..c781a145c3b 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_or_lhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_or_lhs.dart.intertwined.expect
@@ -86,8 +86,7 @@ parseUnit(test)
                         listener: handleConstantPattern(null)
                     listener: endBinaryPattern(|)
                   ensureColon(2)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_or_rhs.dart.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_or_rhs.dart.expect
index 1149b845a17..f9163f53bc1 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_or_rhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_or_rhs.dart.expect
@@ -34,8 +34,7 @@ beginCompilationUnit(test)
                 handleConstantPattern(null)
                 handleNullAssertPattern(!)
               endBinaryPattern(|)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_or_rhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_or_rhs.dart.intertwined.expect
index 0f8f58b2159..77250b0edee 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_or_rhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_logical_or_rhs.dart.intertwined.expect
@@ -86,8 +86,7 @@ parseUnit(test)
                       listener: handleNullAssertPattern(!)
                     listener: endBinaryPattern(|)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_map_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_map_pattern.dart.expect
index 4f1300373b9..4fb2132ba5b 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_map_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_map_pattern.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
               handleNullAssertPattern(!)
               handleMapPatternEntry(:, })
               handleMapPattern(1, {, })
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_map_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_map_pattern.dart.intertwined.expect
index 59bba2ac799..094806cf074 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_map_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_map_pattern.dart.intertwined.expect
@@ -90,8 +90,7 @@ parseUnit(test)
                         listener: handleMapPatternEntry(:, })
                         listener: handleMapPattern(1, {, })
                   ensureColon(})
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_parenthesized_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_parenthesized_pattern.dart.expect
index a3a13d17c47..d821f9c5b96 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_parenthesized_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_parenthesized_pattern.dart.expect
@@ -31,8 +31,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handleNullAssertPattern(!)
               handleParenthesizedPattern(()
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_parenthesized_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_parenthesized_pattern.dart.intertwined.expect
index a1e7571a1f3..6d6bf9cc75e 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_parenthesized_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_parenthesized_pattern.dart.intertwined.expect
@@ -81,8 +81,7 @@ parseUnit(test)
                         ensureCloseParen(!, ()
                         listener: handleParenthesizedPattern(()
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_implicitly_named.dart.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_implicitly_named.dart.expect
index a22e4bf97ff..e5eb56e559a 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_implicitly_named.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_implicitly_named.dart.expect
@@ -36,8 +36,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handlePatternField(null)
               handleRecordPattern((, 2)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_implicitly_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_implicitly_named.dart.intertwined.expect
index 2483f02d8b1..f3010895b1d 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_implicitly_named.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_implicitly_named.dart.intertwined.expect
@@ -89,8 +89,7 @@ parseUnit(test)
                         ensureCloseParen(2, ()
                         listener: handleRecordPattern((, 2)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_named.dart.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_named.dart.expect
index 36d0bd0e9e6..0725ad2655c 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_named.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_named.dart.expect
@@ -36,8 +36,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handlePatternField(null)
               handleRecordPattern((, 2)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_named.dart.intertwined.expect
index 3745c34b2af..5f9ce6693f5 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_named.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_named.dart.intertwined.expect
@@ -93,8 +93,7 @@ parseUnit(test)
                         ensureCloseParen(2, ()
                         listener: handleRecordPattern((, 2)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_unnamed.dart.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_unnamed.dart.expect
index ffb1198d6c2..ec8aa7b26d2 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_unnamed.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_unnamed.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handlePatternField(null)
               handleRecordPattern((, 2)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_unnamed.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_unnamed.dart.intertwined.expect
index 14c5f65b070..bfe538e6cda 100644
--- a/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_unnamed.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_assert_inside_record_pattern_unnamed.dart.intertwined.expect
@@ -91,8 +91,7 @@ parseUnit(test)
                         ensureCloseParen(2, ()
                         listener: handleRecordPattern((, 2)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_case.dart.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_case.dart.expect
index 8b5f5344ea3..15e31665b83 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_case.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_case.dart.expect
@@ -44,8 +44,7 @@ beginCompilationUnit(test)
               handleSend(y, ?)
               handleConstantPattern(null)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_case.dart.intertwined.expect
index 01ab5a14dc5..75c5cb9cf0e 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_case.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_case.dart.intertwined.expect
@@ -110,8 +110,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.expect
index 9e3ad936864..35501e8c26a 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.expect
@@ -61,8 +61,7 @@ beginCompilationUnit(class)
               handlePatternField(:)
               handleExtractorPatternFields(1, (, ))
               handleExtractorPattern(C, null, null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.intertwined.expect
index bdf15a89272..f4b51f378e1 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern.dart.intertwined.expect
@@ -129,8 +129,7 @@ parseUnit(class)
                         listener: handleExtractorPatternFields(1, (, ))
                       listener: handleExtractorPattern(C, null, null)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.expect
index e1f6fd8f35c..6f7e80b6174 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.expect
@@ -61,8 +61,7 @@ beginCompilationUnit(class)
               handlePatternField(:)
               handleExtractorPatternFields(1, (, ))
               handleExtractorPattern(C, null, null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.intertwined.expect
index 59bca164186..79494eb5ad7 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_extractor_pattern_implicitly_named.dart.intertwined.expect
@@ -125,8 +125,7 @@ parseUnit(class)
                         listener: handleExtractorPatternFields(1, (, ))
                       listener: handleExtractorPattern(C, null, null)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_list_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_list_pattern.dart.expect
index a7197e42994..92e10223449 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_list_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_list_pattern.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handleNullCheckPattern(?)
               handleListPattern(1, [, ])
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_list_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_list_pattern.dart.intertwined.expect
index 78e66636147..b9d1b92dc68 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_list_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_list_pattern.dart.intertwined.expect
@@ -81,8 +81,7 @@ parseUnit(test)
                           listener: handleNullCheckPattern(?)
                         listener: handleListPattern(1, [, ])
                   ensureColon(])
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_and_lhs.dart.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_and_lhs.dart.expect
index 8bca9d482fd..a26e904fa6f 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_and_lhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_and_lhs.dart.expect
@@ -34,8 +34,7 @@ beginCompilationUnit(test)
                 handleLiteralInt(2)
                 handleConstantPattern(null)
               endBinaryPattern(&)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_and_lhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_and_lhs.dart.intertwined.expect
index 40825431c0c..c57cd6f12a8 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_and_lhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_and_lhs.dart.intertwined.expect
@@ -86,8 +86,7 @@ parseUnit(test)
                         listener: handleConstantPattern(null)
                     listener: endBinaryPattern(&)
                   ensureColon(2)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_and_rhs.dart.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_and_rhs.dart.expect
index 67249e13294..d1ffacdae64 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_and_rhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_and_rhs.dart.expect
@@ -34,8 +34,7 @@ beginCompilationUnit(test)
                 handleConstantPattern(null)
                 handleNullCheckPattern(?)
               endBinaryPattern(&)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_and_rhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_and_rhs.dart.intertwined.expect
index 9197549300e..c6d989f120e 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_and_rhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_and_rhs.dart.intertwined.expect
@@ -86,8 +86,7 @@ parseUnit(test)
                       listener: handleNullCheckPattern(?)
                     listener: endBinaryPattern(&)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_or_lhs.dart.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_or_lhs.dart.expect
index dae02aff7ed..a7e2d88890e 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_or_lhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_or_lhs.dart.expect
@@ -34,8 +34,7 @@ beginCompilationUnit(test)
                 handleLiteralInt(2)
                 handleConstantPattern(null)
               endBinaryPattern(|)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_or_lhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_or_lhs.dart.intertwined.expect
index d4a56a0ac5f..8aaf078f3b7 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_or_lhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_or_lhs.dart.intertwined.expect
@@ -86,8 +86,7 @@ parseUnit(test)
                         listener: handleConstantPattern(null)
                     listener: endBinaryPattern(|)
                   ensureColon(2)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_or_rhs.dart.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_or_rhs.dart.expect
index cfdf39ab39c..72a5e03bcc3 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_or_rhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_or_rhs.dart.expect
@@ -34,8 +34,7 @@ beginCompilationUnit(test)
                 handleConstantPattern(null)
                 handleNullCheckPattern(?)
               endBinaryPattern(|)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_or_rhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_or_rhs.dart.intertwined.expect
index edd9bf93a73..f570d85b15f 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_or_rhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_logical_or_rhs.dart.intertwined.expect
@@ -86,8 +86,7 @@ parseUnit(test)
                       listener: handleNullCheckPattern(?)
                     listener: endBinaryPattern(|)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_map_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_map_pattern.dart.expect
index e48f72e8289..de71157bd99 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_map_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_map_pattern.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
               handleNullCheckPattern(?)
               handleMapPatternEntry(:, })
               handleMapPattern(1, {, })
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_map_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_map_pattern.dart.intertwined.expect
index a2374d496fd..24749af721f 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_map_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_map_pattern.dart.intertwined.expect
@@ -90,8 +90,7 @@ parseUnit(test)
                         listener: handleMapPatternEntry(:, })
                         listener: handleMapPattern(1, {, })
                   ensureColon(})
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_parenthesized_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_parenthesized_pattern.dart.expect
index 65b1815c462..194ae3a23cc 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_parenthesized_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_parenthesized_pattern.dart.expect
@@ -31,8 +31,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handleNullCheckPattern(?)
               handleParenthesizedPattern(()
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_parenthesized_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_parenthesized_pattern.dart.intertwined.expect
index 6fd29b27d99..ac1f04bb4ec 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_parenthesized_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_parenthesized_pattern.dart.intertwined.expect
@@ -81,8 +81,7 @@ parseUnit(test)
                         ensureCloseParen(?, ()
                         listener: handleParenthesizedPattern(()
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_implicitly_named.dart.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_implicitly_named.dart.expect
index 3f1807e5943..675b06e202e 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_implicitly_named.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_implicitly_named.dart.expect
@@ -36,8 +36,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handlePatternField(null)
               handleRecordPattern((, 2)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_implicitly_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_implicitly_named.dart.intertwined.expect
index eadd3d59ab1..1b8f16df453 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_implicitly_named.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_implicitly_named.dart.intertwined.expect
@@ -89,8 +89,7 @@ parseUnit(test)
                         ensureCloseParen(2, ()
                         listener: handleRecordPattern((, 2)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_named.dart.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_named.dart.expect
index 3cf5e4ab44d..885ccebf821 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_named.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_named.dart.expect
@@ -36,8 +36,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handlePatternField(null)
               handleRecordPattern((, 2)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_named.dart.intertwined.expect
index 7c28eb21ed8..d877ad6b81d 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_named.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_named.dart.intertwined.expect
@@ -93,8 +93,7 @@ parseUnit(test)
                         ensureCloseParen(2, ()
                         listener: handleRecordPattern((, 2)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_unnamed.dart.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_unnamed.dart.expect
index 8685fa57d98..25d2df83652 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_unnamed.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_unnamed.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handlePatternField(null)
               handleRecordPattern((, 2)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_unnamed.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_unnamed.dart.intertwined.expect
index 2935399911a..da807a7d710 100644
--- a/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_unnamed.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_check_inside_record_pattern_unnamed.dart.intertwined.expect
@@ -91,8 +91,7 @@ parseUnit(test)
                         ensureCloseParen(2, ()
                         listener: handleRecordPattern((, 2)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_literal_inside_case.dart.expect b/pkg/front_end/parser_testcases/patterns/null_literal_inside_case.dart.expect
index 61c33f40c5c..f9523a282cb 100644
--- a/pkg/front_end/parser_testcases/patterns/null_literal_inside_case.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_literal_inside_case.dart.expect
@@ -29,8 +29,7 @@ beginCompilationUnit(test)
             beginCaseExpression(case)
               handleLiteralNull(null)
               handleConstantPattern(null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_literal_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_literal_inside_case.dart.intertwined.expect
index 44f1534228c..0ca2f479ccd 100644
--- a/pkg/front_end/parser_testcases/patterns/null_literal_inside_case.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_literal_inside_case.dart.intertwined.expect
@@ -75,8 +75,7 @@ parseUnit(test)
                               listener: handleLiteralNull(null)
                       listener: handleConstantPattern(null)
                   ensureColon(null)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_literal_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/null_literal_inside_cast.dart.expect
index a7498b397a9..93dc71f274b 100644
--- a/pkg/front_end/parser_testcases/patterns/null_literal_inside_cast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_literal_inside_cast.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_literal_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_literal_inside_cast.dart.intertwined.expect
index ea0d996a870..99ea01db822 100644
--- a/pkg/front_end/parser_testcases/patterns/null_literal_inside_cast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_literal_inside_cast.dart.intertwined.expect
@@ -82,8 +82,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_literal_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/null_literal_inside_null_assert.dart.expect
index daa3e894ce1..1ace7ac8698 100644
--- a/pkg/front_end/parser_testcases/patterns/null_literal_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_literal_inside_null_assert.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(test)
               handleLiteralNull(null)
               handleConstantPattern(null)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_literal_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_literal_inside_null_assert.dart.intertwined.expect
index 3023c4483e4..ecbc8e24b91 100644
--- a/pkg/front_end/parser_testcases/patterns/null_literal_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_literal_inside_null_assert.dart.intertwined.expect
@@ -76,8 +76,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/null_literal_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/null_literal_inside_null_check.dart.expect
index 45460ca2227..13cfd51b96e 100644
--- a/pkg/front_end/parser_testcases/patterns/null_literal_inside_null_check.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_literal_inside_null_check.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(test)
               handleLiteralNull(null)
               handleConstantPattern(null)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/null_literal_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/null_literal_inside_null_check.dart.intertwined.expect
index 2587562d625..9b83ac60ce4 100644
--- a/pkg/front_end/parser_testcases/patterns/null_literal_inside_null_check.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/null_literal_inside_null_check.dart.intertwined.expect
@@ -76,8 +76,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/parenthesized_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/parenthesized_insideCase.dart.expect
index 3047d3d2dd4..9de592044fb 100644
--- a/pkg/front_end/parser_testcases/patterns/parenthesized_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/parenthesized_insideCase.dart.expect
@@ -28,8 +28,7 @@ beginCompilationUnit(f)
               handleLiteralInt(1)
               handleConstantPattern(null)
               handleParenthesizedPattern(()
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/parenthesized_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/parenthesized_insideCase.dart.intertwined.expect
index f5fb2ed1e45..0fdde0fbf04 100644
--- a/pkg/front_end/parser_testcases/patterns/parenthesized_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/parenthesized_insideCase.dart.intertwined.expect
@@ -78,8 +78,7 @@ parseUnit(f)
                         ensureCloseParen(1, ()
                         listener: handleParenthesizedPattern(()
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_cast.dart.expect
index 5bfca2284a5..90c6707aabb 100644
--- a/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_cast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_cast.dart.expect
@@ -36,8 +36,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_cast.dart.intertwined.expect
index c0ded7b1768..0314a37a712 100644
--- a/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_cast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_cast.dart.intertwined.expect
@@ -87,8 +87,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_null_assert.dart.expect
index 6fd30729ca0..b8ac3b53785 100644
--- a/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_null_assert.dart.expect
@@ -31,8 +31,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handleParenthesizedPattern(()
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_null_assert.dart.intertwined.expect
index af185d68e7b..b63a647b98c 100644
--- a/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_null_assert.dart.intertwined.expect
@@ -81,8 +81,7 @@ parseUnit(test)
                         listener: handleParenthesizedPattern(()
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_null_check.dart.expect
index 2637b597911..6923c6df57b 100644
--- a/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_null_check.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_null_check.dart.expect
@@ -31,8 +31,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handleParenthesizedPattern(()
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_null_check.dart.intertwined.expect
index 18d9ba08d8d..7de1b158cb1 100644
--- a/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_null_check.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/parenthesized_pattern_inside_null_check.dart.intertwined.expect
@@ -81,8 +81,7 @@ parseUnit(test)
                         listener: handleParenthesizedPattern(()
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args.dart.expect b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args.dart.expect
index b057dfcd9e0..8569e3852e7 100644
--- a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args.dart.expect
@@ -48,8 +48,7 @@ beginCompilationUnit(import)
               endTypeArguments(1, <, >)
               handleExtractorPatternFields(0, (, ))
               handleExtractorPattern(async, ., Future)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args.dart.intertwined.expect
index 47a7e43ab93..7bca83646b8 100644
--- a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args.dart.intertwined.expect
@@ -102,8 +102,7 @@ parseUnit(import)
                         listener: handleExtractorPatternFields(0, (, ))
                       listener: handleExtractorPattern(async, ., Future)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_cast.dart.expect
index 75be0f2931c..87483c9c840 100644
--- a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_cast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_cast.dart.expect
@@ -54,8 +54,7 @@ beginCompilationUnit(import)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_cast.dart.intertwined.expect
index 25336535d72..a10774b650a 100644
--- a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_cast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_cast.dart.intertwined.expect
@@ -109,8 +109,7 @@ parseUnit(import)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_assert.dart.expect
index 8f9894dc626..ba1e3f90f94 100644
--- a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_assert.dart.expect
@@ -49,8 +49,7 @@ beginCompilationUnit(import)
               handleExtractorPatternFields(0, (, ))
               handleExtractorPattern(async, ., Future)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect
index 5df13da59fa..46e3cd0d80d 100644
--- a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_assert.dart.intertwined.expect
@@ -103,8 +103,7 @@ parseUnit(import)
                       listener: handleExtractorPattern(async, ., Future)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_check.dart.expect
index c8089b7c8fe..2d47043f3c3 100644
--- a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_check.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_check.dart.expect
@@ -49,8 +49,7 @@ beginCompilationUnit(import)
               handleExtractorPatternFields(0, (, ))
               handleExtractorPattern(async, ., Future)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_check.dart.intertwined.expect
index d12af8d1c6e..0f70c217d0a 100644
--- a/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_check.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/prefixed_extractor_pattern_with_type_args_inside_null_check.dart.intertwined.expect
@@ -103,8 +103,7 @@ parseUnit(import)
                       listener: handleExtractorPattern(async, ., Future)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case.dart.expect b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case.dart.expect
index 814fca9e052..c48d01a8234 100644
--- a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case.dart.expect
@@ -34,8 +34,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handlePatternField(null)
               handleRecordPattern((, 2)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case.dart.intertwined.expect
index f0193faa98b..8e7696c2fb2 100644
--- a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case.dart.intertwined.expect
@@ -90,8 +90,7 @@ parseUnit(test)
                         ensureCloseParen(2, ()
                         listener: handleRecordPattern((, 2)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case_empty.dart.expect b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case_empty.dart.expect
index 6affa5b0b56..beafc6830b1 100644
--- a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case_empty.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case_empty.dart.expect
@@ -28,8 +28,7 @@ beginCompilationUnit(test)
           beginSwitchBlock({)
             beginCaseExpression(case)
               handleRecordPattern((, 0)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case_empty.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case_empty.dart.intertwined.expect
index 9d49ce8bab8..e5565e4c8e6 100644
--- a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case_empty.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case_empty.dart.intertwined.expect
@@ -70,8 +70,7 @@ parseUnit(test)
                     parsePrimaryPattern(case)
                       listener: handleRecordPattern((, 0)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case_singleton.dart.expect b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case_singleton.dart.expect
index 8573eb7f3a2..4eb1d691df5 100644
--- a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case_singleton.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case_singleton.dart.expect
@@ -31,8 +31,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handlePatternField(null)
               handleRecordPattern((, 1)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case_singleton.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case_singleton.dart.intertwined.expect
index 80203d7390e..b642c990037 100644
--- a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case_singleton.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_case_singleton.dart.intertwined.expect
@@ -81,8 +81,7 @@ parseUnit(test)
                         ensureCloseParen(,, ()
                         listener: handleRecordPattern((, 1)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_cast.dart.expect
index bad30b8b214..9415147270a 100644
--- a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_cast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_cast.dart.expect
@@ -40,8 +40,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_cast.dart.intertwined.expect
index d4b8c7fe94b..6c1796fbc21 100644
--- a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_cast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_cast.dart.intertwined.expect
@@ -97,8 +97,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_null_assert.dart.expect
index 6cce7ec2e99..5c4477d77df 100644
--- a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_null_assert.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
               handlePatternField(null)
               handleRecordPattern((, 2)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_null_assert.dart.intertwined.expect
index d9b0f044ce1..13a29178ed2 100644
--- a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_null_assert.dart.intertwined.expect
@@ -91,8 +91,7 @@ parseUnit(test)
                         listener: handleRecordPattern((, 2)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_null_check.dart.expect
index 8512fae8f97..fd16a074607 100644
--- a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_null_check.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_null_check.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
               handlePatternField(null)
               handleRecordPattern((, 2)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_null_check.dart.intertwined.expect
index 58ee1b42368..0776db57183 100644
--- a/pkg/front_end/parser_testcases/patterns/record_pattern_inside_null_check.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/record_pattern_inside_null_check.dart.intertwined.expect
@@ -91,8 +91,7 @@ parseUnit(test)
                         listener: handleRecordPattern((, 2)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_case_equal.dart.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_case_equal.dart.expect
index 72209e2b23b..234a1fb061e 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_case_equal.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_case_equal.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
                 handleLiteralInt(1)
               endBinaryExpression(<<)
               handleRelationalPattern(==)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_case_equal.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_case_equal.dart.intertwined.expect
index ae77c308c6d..760d6ba9c0f 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_case_equal.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_case_equal.dart.intertwined.expect
@@ -82,8 +82,7 @@ parseUnit(test)
                         listener: endBinaryExpression(<<)
                       listener: handleRelationalPattern(==)
                   ensureColon(1)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_case_greater_than.dart.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_case_greater_than.dart.expect
index 36c8fc6ed57..0d1fd60d08f 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_case_greater_than.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_case_greater_than.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
                 handleLiteralInt(1)
               endBinaryExpression(<<)
               handleRelationalPattern(>)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_case_greater_than.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_case_greater_than.dart.intertwined.expect
index 9bb7bc886e8..ce1cd58f113 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_case_greater_than.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_case_greater_than.dart.intertwined.expect
@@ -82,8 +82,7 @@ parseUnit(test)
                         listener: endBinaryExpression(<<)
                       listener: handleRelationalPattern(>)
                   ensureColon(1)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_case_greater_than_or_equal.dart.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_case_greater_than_or_equal.dart.expect
index 32665d02cf2..d9b8357164d 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_case_greater_than_or_equal.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_case_greater_than_or_equal.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
                 handleLiteralInt(1)
               endBinaryExpression(<<)
               handleRelationalPattern(>=)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_case_greater_than_or_equal.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_case_greater_than_or_equal.dart.intertwined.expect
index 1e4987ac88a..869f89dd84b 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_case_greater_than_or_equal.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_case_greater_than_or_equal.dart.intertwined.expect
@@ -82,8 +82,7 @@ parseUnit(test)
                         listener: endBinaryExpression(<<)
                       listener: handleRelationalPattern(>=)
                   ensureColon(1)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_case_less_than.dart.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_case_less_than.dart.expect
index b55ed51a69f..277f7e343fa 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_case_less_than.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_case_less_than.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
                 handleLiteralInt(1)
               endBinaryExpression(<<)
               handleRelationalPattern(<)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_case_less_than.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_case_less_than.dart.intertwined.expect
index e2630530f7b..064a12e3402 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_case_less_than.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_case_less_than.dart.intertwined.expect
@@ -82,8 +82,7 @@ parseUnit(test)
                         listener: endBinaryExpression(<<)
                       listener: handleRelationalPattern(<)
                   ensureColon(1)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_case_less_than_or_equal.dart.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_case_less_than_or_equal.dart.expect
index 77f78cbebea..9a45afb1457 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_case_less_than_or_equal.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_case_less_than_or_equal.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
                 handleLiteralInt(1)
               endBinaryExpression(<<)
               handleRelationalPattern(<=)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_case_less_than_or_equal.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_case_less_than_or_equal.dart.intertwined.expect
index e550c9b93f6..ead5a39b0bd 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_case_less_than_or_equal.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_case_less_than_or_equal.dart.intertwined.expect
@@ -82,8 +82,7 @@ parseUnit(test)
                         listener: endBinaryExpression(<<)
                       listener: handleRelationalPattern(<=)
                   ensureColon(1)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_case_not_equal.dart.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_case_not_equal.dart.expect
index e829a64b3c3..8b394eaf9df 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_case_not_equal.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_case_not_equal.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
                 handleLiteralInt(1)
               endBinaryExpression(<<)
               handleRelationalPattern(!=)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_case_not_equal.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_case_not_equal.dart.intertwined.expect
index 21987e3a3cf..cf5c6748f98 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_case_not_equal.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_case_not_equal.dart.intertwined.expect
@@ -82,8 +82,7 @@ parseUnit(test)
                         listener: endBinaryExpression(<<)
                       listener: handleRelationalPattern(!=)
                   ensureColon(1)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.expect
index bec8c190244..5b4343c3c76 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.expect
@@ -60,8 +60,7 @@ beginCompilationUnit(class)
               handlePatternField(:)
               handleExtractorPatternFields(1, (, ))
               handleExtractorPattern(C, null, null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.intertwined.expect
index 06e364a2dc3..946feca4b6c 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_extractor_pattern.dart.intertwined.expect
@@ -128,8 +128,7 @@ parseUnit(class)
                         listener: handleExtractorPatternFields(1, (, ))
                       listener: handleExtractorPattern(C, null, null)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_list_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_list_pattern.dart.expect
index 2305e7036f4..f5a47c0490a 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_list_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_list_pattern.dart.expect
@@ -31,8 +31,7 @@ beginCompilationUnit(test)
               handleLiteralInt(1)
               handleRelationalPattern(==)
               handleListPattern(1, [, ])
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_list_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_list_pattern.dart.intertwined.expect
index 692c4bbb5dd..dab52143a30 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_list_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_list_pattern.dart.intertwined.expect
@@ -80,8 +80,7 @@ parseUnit(test)
                             listener: handleRelationalPattern(==)
                         listener: handleListPattern(1, [, ])
                   ensureColon(])
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_logical_and_lhs.dart.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_logical_and_lhs.dart.expect
index de27baf992b..450690ca723 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_logical_and_lhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_logical_and_lhs.dart.expect
@@ -33,8 +33,7 @@ beginCompilationUnit(test)
                 handleLiteralInt(2)
                 handleConstantPattern(null)
               endBinaryPattern(&)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_logical_and_lhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_logical_and_lhs.dart.intertwined.expect
index ec58172dac5..ab4f90dba07 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_logical_and_lhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_logical_and_lhs.dart.intertwined.expect
@@ -85,8 +85,7 @@ parseUnit(test)
                         listener: handleConstantPattern(null)
                     listener: endBinaryPattern(&)
                   ensureColon(2)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_logical_and_rhs.dart.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_logical_and_rhs.dart.expect
index 3d3d84b3b63..3f1f03e3d91 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_logical_and_rhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_logical_and_rhs.dart.expect
@@ -33,8 +33,7 @@ beginCompilationUnit(test)
                 handleLiteralInt(2)
                 handleRelationalPattern(==)
               endBinaryPattern(&)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_logical_and_rhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_logical_and_rhs.dart.intertwined.expect
index dd9e989d38f..b9793579b8b 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_logical_and_rhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_logical_and_rhs.dart.intertwined.expect
@@ -85,8 +85,7 @@ parseUnit(test)
                         listener: handleRelationalPattern(==)
                     listener: endBinaryPattern(&)
                   ensureColon(2)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_logical_or_lhs.dart.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_logical_or_lhs.dart.expect
index bd933bbcd76..9ec5247ad02 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_logical_or_lhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_logical_or_lhs.dart.expect
@@ -33,8 +33,7 @@ beginCompilationUnit(test)
                 handleLiteralInt(2)
                 handleConstantPattern(null)
               endBinaryPattern(|)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_logical_or_lhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_logical_or_lhs.dart.intertwined.expect
index dca25afc813..27239967f14 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_logical_or_lhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_logical_or_lhs.dart.intertwined.expect
@@ -85,8 +85,7 @@ parseUnit(test)
                         listener: handleConstantPattern(null)
                     listener: endBinaryPattern(|)
                   ensureColon(2)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_logical_or_rhs.dart.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_logical_or_rhs.dart.expect
index 5ec57a513d8..9514d60c2d3 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_logical_or_rhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_logical_or_rhs.dart.expect
@@ -33,8 +33,7 @@ beginCompilationUnit(test)
                 handleLiteralInt(2)
                 handleRelationalPattern(==)
               endBinaryPattern(|)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_logical_or_rhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_logical_or_rhs.dart.intertwined.expect
index ef9872ac0b9..e41a46f17b9 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_logical_or_rhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_logical_or_rhs.dart.intertwined.expect
@@ -85,8 +85,7 @@ parseUnit(test)
                         listener: handleRelationalPattern(==)
                     listener: endBinaryPattern(|)
                   ensureColon(2)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_map_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_map_pattern.dart.expect
index d42bb947e4b..9bc5eaf0c9d 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_map_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_map_pattern.dart.expect
@@ -34,8 +34,7 @@ beginCompilationUnit(test)
               handleRelationalPattern(==)
               handleMapPatternEntry(:, })
               handleMapPattern(1, {, })
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_map_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_map_pattern.dart.intertwined.expect
index ff460668f90..31c109efa56 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_map_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_map_pattern.dart.intertwined.expect
@@ -89,8 +89,7 @@ parseUnit(test)
                         listener: handleMapPatternEntry(:, })
                         listener: handleMapPattern(1, {, })
                   ensureColon(})
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_parenthesized_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_parenthesized_pattern.dart.expect
index e83183c6162..e36eea91881 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_parenthesized_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_parenthesized_pattern.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(test)
               handleLiteralInt(1)
               handleRelationalPattern(==)
               handleParenthesizedPattern(()
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_parenthesized_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_parenthesized_pattern.dart.intertwined.expect
index b037bc4fe34..b250706bf47 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_parenthesized_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_parenthesized_pattern.dart.intertwined.expect
@@ -80,8 +80,7 @@ parseUnit(test)
                         ensureCloseParen(1, ()
                         listener: handleParenthesizedPattern(()
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_record_pattern_named.dart.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_record_pattern_named.dart.expect
index b1611aae86a..b3f9fb64c17 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_record_pattern_named.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_record_pattern_named.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handlePatternField(null)
               handleRecordPattern((, 2)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_record_pattern_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_record_pattern_named.dart.intertwined.expect
index f8c2ca14b57..7faea0255cc 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_record_pattern_named.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_record_pattern_named.dart.intertwined.expect
@@ -92,8 +92,7 @@ parseUnit(test)
                         ensureCloseParen(2, ()
                         listener: handleRecordPattern((, 2)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_record_pattern_unnamed.dart.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_record_pattern_unnamed.dart.expect
index d4e7f3586e1..0fc794d7ac3 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_record_pattern_unnamed.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_record_pattern_unnamed.dart.expect
@@ -34,8 +34,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handlePatternField(null)
               handleRecordPattern((, 2)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/relational_inside_record_pattern_unnamed.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/relational_inside_record_pattern_unnamed.dart.intertwined.expect
index 2e73a1959cb..611f7faf02c 100644
--- a/pkg/front_end/parser_testcases/patterns/relational_inside_record_pattern_unnamed.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/relational_inside_record_pattern_unnamed.dart.intertwined.expect
@@ -90,8 +90,7 @@ parseUnit(test)
                         ensureCloseParen(2, ()
                         listener: handleRecordPattern((, 2)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/string_literal_inside_case.dart.expect b/pkg/front_end/parser_testcases/patterns/string_literal_inside_case.dart.expect
index f2db0d4c84c..7bead383268 100644
--- a/pkg/front_end/parser_testcases/patterns/string_literal_inside_case.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/string_literal_inside_case.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(test)
               beginLiteralString("x")
               endLiteralString(0, :)
               handleConstantPattern(null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/string_literal_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/string_literal_inside_case.dart.intertwined.expect
index fd0ee0f81cb..8f86e8aa150 100644
--- a/pkg/front_end/parser_testcases/patterns/string_literal_inside_case.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/string_literal_inside_case.dart.intertwined.expect
@@ -77,8 +77,7 @@ parseUnit(test)
                                 listener: endLiteralString(0, :)
                       listener: handleConstantPattern(null)
                   ensureColon("x")
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/string_literal_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/string_literal_inside_cast.dart.expect
index a11c153c302..e9d8a3ba770 100644
--- a/pkg/front_end/parser_testcases/patterns/string_literal_inside_cast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/string_literal_inside_cast.dart.expect
@@ -36,8 +36,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/string_literal_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/string_literal_inside_cast.dart.intertwined.expect
index f64ded8fdd3..9edeefd53ad 100644
--- a/pkg/front_end/parser_testcases/patterns/string_literal_inside_cast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/string_literal_inside_cast.dart.intertwined.expect
@@ -84,8 +84,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/string_literal_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/string_literal_inside_null_assert.dart.expect
index a425ee59743..ab72aaf22c6 100644
--- a/pkg/front_end/parser_testcases/patterns/string_literal_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/string_literal_inside_null_assert.dart.expect
@@ -31,8 +31,7 @@ beginCompilationUnit(test)
               endLiteralString(0, !)
               handleConstantPattern(null)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/string_literal_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/string_literal_inside_null_assert.dart.intertwined.expect
index d6edcadce89..168df474f88 100644
--- a/pkg/front_end/parser_testcases/patterns/string_literal_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/string_literal_inside_null_assert.dart.intertwined.expect
@@ -78,8 +78,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/string_literal_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/string_literal_inside_null_check.dart.expect
index 86c2b47ce17..e17e9b78abe 100644
--- a/pkg/front_end/parser_testcases/patterns/string_literal_inside_null_check.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/string_literal_inside_null_check.dart.expect
@@ -31,8 +31,7 @@ beginCompilationUnit(test)
               endLiteralString(0, ?)
               handleConstantPattern(null)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/string_literal_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/string_literal_inside_null_check.dart.intertwined.expect
index 372e2c4b2fd..1ae834df226 100644
--- a/pkg/front_end/parser_testcases/patterns/string_literal_inside_null_check.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/string_literal_inside_null_check.dart.intertwined.expect
@@ -78,8 +78,7 @@ parseUnit(test)
                       listener: handleConstantPattern(null)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_case.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_case.dart.expect
index d7d3f7eb177..596e195fc3c 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_case.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_case.dart.expect
@@ -31,8 +31,7 @@ beginCompilationUnit(test)
               handleNoTypeArguments(y)
               handleType(int, null)
               handleVariablePattern(final, y)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_case.dart.intertwined.expect
index 85d4749caa4..841595d7131 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_case.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_case.dart.intertwined.expect
@@ -74,8 +74,7 @@ parseUnit(test)
                         listener: handleType(int, null)
                         listener: handleVariablePattern(final, y)
                   ensureColon(y)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_cast.dart.expect
index 7372a300a15..fca4e047495 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_cast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_cast.dart.expect
@@ -37,8 +37,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_cast.dart.intertwined.expect
index cae56788522..e5d41208673 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_cast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_cast.dart.intertwined.expect
@@ -81,8 +81,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_null_assert.dart.expect
index ec86547751c..69101835b98 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_null_assert.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
               handleType(int, null)
               handleVariablePattern(final, y)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_null_assert.dart.intertwined.expect
index dc3c03c7e3f..531c8c39ec4 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_null_assert.dart.intertwined.expect
@@ -75,8 +75,7 @@ parseUnit(test)
                         listener: handleVariablePattern(final, y)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_null_check.dart.expect
index 8b9f5ae7d6f..62bae9d9b57 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_null_check.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_null_check.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
               handleType(int, null)
               handleVariablePattern(final, y)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_null_check.dart.intertwined.expect
index 77f77d02497..97877d01cb3 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_null_check.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_final_variable_inside_null_check.dart.intertwined.expect
@@ -75,8 +75,7 @@ parseUnit(test)
                         listener: handleVariablePattern(final, y)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_inside_case.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_inside_case.dart.expect
index 27a40356949..3417c208414 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_inside_case.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_inside_case.dart.expect
@@ -31,8 +31,7 @@ beginCompilationUnit(test)
               handleNoTypeArguments(y)
               handleType(int, null)
               handleVariablePattern(null, y)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_inside_case.dart.intertwined.expect
index b0e5904bf60..f225c24d9ca 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_inside_case.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_inside_case.dart.intertwined.expect
@@ -74,8 +74,7 @@ parseUnit(test)
                         listener: handleType(int, null)
                         listener: handleVariablePattern(null, y)
                   ensureColon(y)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_inside_cast.dart.expect
index bae500d2d44..5e0206f138e 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_inside_cast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_inside_cast.dart.expect
@@ -37,8 +37,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_inside_cast.dart.intertwined.expect
index afd6ef509f2..c693dc6493c 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_inside_cast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_inside_cast.dart.intertwined.expect
@@ -81,8 +81,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_inside_null_assert.dart.expect
index 4b696a88e78..e23efb3ad6d 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_inside_null_assert.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
               handleType(int, null)
               handleVariablePattern(null, y)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_inside_null_assert.dart.intertwined.expect
index 6759703225b..9d2b5983703 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_inside_null_assert.dart.intertwined.expect
@@ -75,8 +75,7 @@ parseUnit(test)
                         listener: handleVariablePattern(null, y)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_inside_null_check.dart.expect
index 2f193a15fef..8ccc145d646 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_inside_null_check.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_inside_null_check.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
               handleType(int, null)
               handleVariablePattern(null, y)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_inside_null_check.dart.intertwined.expect
index db60a50fb3e..8dd69180413 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_inside_null_check.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_inside_null_check.dart.intertwined.expect
@@ -75,8 +75,7 @@ parseUnit(test)
                         listener: handleVariablePattern(null, y)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_case.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_case.dart.expect
index 64b048ed5a9..60ac9d5cb0e 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_case.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_case.dart.expect
@@ -31,8 +31,7 @@ beginCompilationUnit(test)
               handleNoTypeArguments(as)
               handleType(int, null)
               handleVariablePattern(null, as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_case.dart.intertwined.expect
index 3be826ade58..427306949c8 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_case.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_case.dart.intertwined.expect
@@ -74,8 +74,7 @@ parseUnit(test)
                         listener: handleType(int, null)
                         listener: handleVariablePattern(null, as)
                   ensureColon(as)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_cast.dart.expect
index 0aec493dd17..826a4e5e498 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_cast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_cast.dart.expect
@@ -37,8 +37,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_cast.dart.intertwined.expect
index bc179a2bc16..1a663ac2857 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_cast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_cast.dart.intertwined.expect
@@ -81,8 +81,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.expect
index 7107ba2b5d4..810fe5690a8 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.expect
@@ -62,8 +62,7 @@ beginCompilationUnit(class)
               handlePatternField(:)
               handleExtractorPatternFields(1, (, ))
               handleExtractorPattern(C, null, null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.intertwined.expect
index 0baa1a00d12..e5a9a10203f 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern.dart.intertwined.expect
@@ -127,8 +127,7 @@ parseUnit(class)
                         listener: handleExtractorPatternFields(1, (, ))
                       listener: handleExtractorPattern(C, null, null)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.expect
index 4f1fb28bf51..cbf683af3a7 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.expect
@@ -62,8 +62,7 @@ beginCompilationUnit(class)
               handlePatternField(:)
               handleExtractorPatternFields(1, (, ))
               handleExtractorPattern(C, null, null)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.intertwined.expect
index 4140c03a888..5449ed3fce0 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_extractor_pattern_implicitly_named.dart.intertwined.expect
@@ -126,8 +126,7 @@ parseUnit(class)
                         listener: handleExtractorPatternFields(1, (, ))
                       listener: handleExtractorPattern(C, null, null)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_list_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_list_pattern.dart.expect
index c852923a778..fc6c8432ef6 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_list_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_list_pattern.dart.expect
@@ -33,8 +33,7 @@ beginCompilationUnit(test)
               handleType(int, null)
               handleVariablePattern(null, as)
               handleListPattern(1, [, ])
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_list_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_list_pattern.dart.intertwined.expect
index 7845e55dae4..520510091e0 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_list_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_list_pattern.dart.intertwined.expect
@@ -79,8 +79,7 @@ parseUnit(test)
                               listener: handleVariablePattern(null, as)
                         listener: handleListPattern(1, [, ])
                   ensureColon(])
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_and_lhs.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_and_lhs.dart.expect
index 5dadce31c7e..5e6035a2c39 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_and_lhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_and_lhs.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
                 handleLiteralInt(2)
                 handleConstantPattern(null)
               endBinaryPattern(&)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_and_lhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_and_lhs.dart.intertwined.expect
index 45661404444..83daa6e7667 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_and_lhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_and_lhs.dart.intertwined.expect
@@ -84,8 +84,7 @@ parseUnit(test)
                         listener: handleConstantPattern(null)
                     listener: endBinaryPattern(&)
                   ensureColon(2)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_and_rhs.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_and_rhs.dart.expect
index 6d466723596..25cf2ecc24e 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_and_rhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_and_rhs.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
                 handleType(int, null)
                 handleVariablePattern(null, as)
               endBinaryPattern(&)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_and_rhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_and_rhs.dart.intertwined.expect
index a98a4dcd30e..00a71436143 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_and_rhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_and_rhs.dart.intertwined.expect
@@ -84,8 +84,7 @@ parseUnit(test)
                           listener: handleVariablePattern(null, as)
                     listener: endBinaryPattern(&)
                   ensureColon(as)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_or_lhs.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_or_lhs.dart.expect
index d6a91a7ee07..dfc02aaf2b0 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_or_lhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_or_lhs.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
                 handleLiteralInt(2)
                 handleConstantPattern(null)
               endBinaryPattern(|)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_or_lhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_or_lhs.dart.intertwined.expect
index f387b9b5813..54d3c673bbb 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_or_lhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_or_lhs.dart.intertwined.expect
@@ -84,8 +84,7 @@ parseUnit(test)
                         listener: handleConstantPattern(null)
                     listener: endBinaryPattern(|)
                   ensureColon(2)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_or_rhs.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_or_rhs.dart.expect
index 6b36bd818c8..1e5de362812 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_or_rhs.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_or_rhs.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
                 handleType(int, null)
                 handleVariablePattern(null, as)
               endBinaryPattern(|)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_or_rhs.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_or_rhs.dart.intertwined.expect
index 07a3a1eead7..3ef35e85e8e 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_or_rhs.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_logical_or_rhs.dart.intertwined.expect
@@ -84,8 +84,7 @@ parseUnit(test)
                           listener: handleVariablePattern(null, as)
                     listener: endBinaryPattern(|)
                   ensureColon(as)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_map_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_map_pattern.dart.expect
index ae0d283d5ac..cc0d6166a57 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_map_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_map_pattern.dart.expect
@@ -36,8 +36,7 @@ beginCompilationUnit(test)
               handleVariablePattern(null, as)
               handleMapPatternEntry(:, })
               handleMapPattern(1, {, })
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_map_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_map_pattern.dart.intertwined.expect
index b9dc91d18eb..dab797af1a8 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_map_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_map_pattern.dart.intertwined.expect
@@ -88,8 +88,7 @@ parseUnit(test)
                         listener: handleMapPatternEntry(:, })
                         listener: handleMapPattern(1, {, })
                   ensureColon(})
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_null_assert.dart.expect
index 00f010786ac..2b033bc243a 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_null_assert.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
               handleType(int, null)
               handleVariablePattern(null, as)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_null_assert.dart.intertwined.expect
index 25d7ed14890..11050e4da37 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_null_assert.dart.intertwined.expect
@@ -75,8 +75,7 @@ parseUnit(test)
                         listener: handleVariablePattern(null, as)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_null_check.dart.expect
index 8235effbe23..348b6027626 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_null_check.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_null_check.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
               handleType(int, null)
               handleVariablePattern(null, as)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_null_check.dart.intertwined.expect
index 85e81091636..916fa3618b1 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_null_check.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_null_check.dart.intertwined.expect
@@ -75,8 +75,7 @@ parseUnit(test)
                         listener: handleVariablePattern(null, as)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_parenthesized_pattern.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_parenthesized_pattern.dart.expect
index 33b4488131f..ca127fd5fb9 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_parenthesized_pattern.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_parenthesized_pattern.dart.expect
@@ -32,8 +32,7 @@ beginCompilationUnit(test)
               handleType(int, null)
               handleVariablePattern(null, as)
               handleParenthesizedPattern(()
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_parenthesized_pattern.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_parenthesized_pattern.dart.intertwined.expect
index 7edccb6aa1f..c1e5da36fda 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_parenthesized_pattern.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_parenthesized_pattern.dart.intertwined.expect
@@ -79,8 +79,7 @@ parseUnit(test)
                         ensureCloseParen(as, ()
                         listener: handleParenthesizedPattern(()
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_implicitly_named.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_implicitly_named.dart.expect
index da0fb52f8e7..5df8df231d9 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_implicitly_named.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_implicitly_named.dart.expect
@@ -37,8 +37,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handlePatternField(null)
               handleRecordPattern((, 2)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_implicitly_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_implicitly_named.dart.intertwined.expect
index db52feff585..19a18fe7cac 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_implicitly_named.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_implicitly_named.dart.intertwined.expect
@@ -90,8 +90,7 @@ parseUnit(test)
                         ensureCloseParen(2, ()
                         listener: handleRecordPattern((, 2)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_named.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_named.dart.expect
index 9de8d18bc48..e7596ccfb4c 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_named.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_named.dart.expect
@@ -37,8 +37,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handlePatternField(null)
               handleRecordPattern((, 2)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_named.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_named.dart.intertwined.expect
index 631e51ed445..40834e4728c 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_named.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_named.dart.intertwined.expect
@@ -91,8 +91,7 @@ parseUnit(test)
                         ensureCloseParen(2, ()
                         listener: handleRecordPattern((, 2)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_unnamed.dart.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_unnamed.dart.expect
index 2ee0ed971cf..ddb6cd73bf8 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_unnamed.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_unnamed.dart.expect
@@ -36,8 +36,7 @@ beginCompilationUnit(test)
               handleConstantPattern(null)
               handlePatternField(null)
               handleRecordPattern((, 2)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_unnamed.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_unnamed.dart.intertwined.expect
index 8d0c25743a1..69628f9d7cf 100644
--- a/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_unnamed.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/typed_variable_named_as_inside_record_pattern_unnamed.dart.intertwined.expect
@@ -89,8 +89,7 @@ parseUnit(test)
                         ensureCloseParen(2, ()
                         listener: handleRecordPattern((, 2)
                   ensureColon())
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/var_variable_inside_case.dart.expect b/pkg/front_end/parser_testcases/patterns/var_variable_inside_case.dart.expect
index 17589217dfb..a24021e56a2 100644
--- a/pkg/front_end/parser_testcases/patterns/var_variable_inside_case.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/var_variable_inside_case.dart.expect
@@ -29,8 +29,7 @@ beginCompilationUnit(test)
             beginCaseExpression(case)
               handleNoType(var)
               handleVariablePattern(var, y)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/var_variable_inside_case.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/var_variable_inside_case.dart.intertwined.expect
index 44ce7f4ca6e..b6ceb40a353 100644
--- a/pkg/front_end/parser_testcases/patterns/var_variable_inside_case.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/var_variable_inside_case.dart.intertwined.expect
@@ -72,8 +72,7 @@ parseUnit(test)
                         listener: handleNoType(var)
                         listener: handleVariablePattern(var, y)
                   ensureColon(y)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/var_variable_inside_cast.dart.expect b/pkg/front_end/parser_testcases/patterns/var_variable_inside_cast.dart.expect
index f5ffa9042f4..0b2137bf0fd 100644
--- a/pkg/front_end/parser_testcases/patterns/var_variable_inside_cast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/var_variable_inside_cast.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(test)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/var_variable_inside_cast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/var_variable_inside_cast.dart.intertwined.expect
index 706b7a52def..334007180cf 100644
--- a/pkg/front_end/parser_testcases/patterns/var_variable_inside_cast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/var_variable_inside_cast.dart.intertwined.expect
@@ -79,8 +79,7 @@ parseUnit(test)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/var_variable_inside_null_assert.dart.expect b/pkg/front_end/parser_testcases/patterns/var_variable_inside_null_assert.dart.expect
index 20809373dbf..23e1545dc69 100644
--- a/pkg/front_end/parser_testcases/patterns/var_variable_inside_null_assert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/var_variable_inside_null_assert.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(test)
               handleNoType(var)
               handleVariablePattern(var, y)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/var_variable_inside_null_assert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/var_variable_inside_null_assert.dart.intertwined.expect
index 295d6fc560f..f9f4eb52f0f 100644
--- a/pkg/front_end/parser_testcases/patterns/var_variable_inside_null_assert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/var_variable_inside_null_assert.dart.intertwined.expect
@@ -73,8 +73,7 @@ parseUnit(test)
                         listener: handleVariablePattern(var, y)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/var_variable_inside_null_check.dart.expect b/pkg/front_end/parser_testcases/patterns/var_variable_inside_null_check.dart.expect
index 8baa4d15f61..8a314d4b597 100644
--- a/pkg/front_end/parser_testcases/patterns/var_variable_inside_null_check.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/var_variable_inside_null_check.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(test)
               handleNoType(var)
               handleVariablePattern(var, y)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/var_variable_inside_null_check.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/var_variable_inside_null_check.dart.intertwined.expect
index c000f8d8339..2b1bef63732 100644
--- a/pkg/front_end/parser_testcases/patterns/var_variable_inside_null_check.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/var_variable_inside_null_check.dart.intertwined.expect
@@ -73,8 +73,7 @@ parseUnit(test)
                         listener: handleVariablePattern(var, y)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/variable_typedNamedUnderscore_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/variable_typedNamedUnderscore_insideCase.dart.expect
index ab42772d6db..cff09b1c086 100644
--- a/pkg/front_end/parser_testcases/patterns/variable_typedNamedUnderscore_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/variable_typedNamedUnderscore_insideCase.dart.expect
@@ -29,8 +29,7 @@ beginCompilationUnit(void)
               handleNoTypeArguments(y)
               handleType(_, null)
               handleVariablePattern(null, y)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/variable_typedNamedUnderscore_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/variable_typedNamedUnderscore_insideCase.dart.intertwined.expect
index 2dff2aeca98..8040281c634 100644
--- a/pkg/front_end/parser_testcases/patterns/variable_typedNamedUnderscore_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/variable_typedNamedUnderscore_insideCase.dart.intertwined.expect
@@ -71,8 +71,7 @@ parseUnit(void)
                         listener: handleType(_, null)
                         listener: handleVariablePattern(null, y)
                   ensureColon(y)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideCase.dart.expect
index f24c22ed04c..79ab344326a 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideCase.dart.expect
@@ -27,8 +27,7 @@ beginCompilationUnit(void)
             beginCaseExpression(case)
               handleNoType(case)
               handleVariablePattern(null, _)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideCase.dart.intertwined.expect
index 3781bbace6e..503e8bf0cb3 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideCase.dart.intertwined.expect
@@ -69,8 +69,7 @@ parseUnit(void)
                         listener: handleNoType(case)
                         listener: handleVariablePattern(null, _)
                   ensureColon(_)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideCast.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideCast.dart.expect
index e182c77fd22..57a6a7c3b4c 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideCast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideCast.dart.expect
@@ -33,8 +33,7 @@ beginCompilationUnit(void)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideCast.dart.intertwined.expect
index 85bcee17495..45e6e84e151 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideCast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideCast.dart.intertwined.expect
@@ -76,8 +76,7 @@ parseUnit(void)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideNullAssert.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideNullAssert.dart.expect
index 7ddaffdc491..8fc402bd980 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideNullAssert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideNullAssert.dart.expect
@@ -28,8 +28,7 @@ beginCompilationUnit(void)
               handleNoType(case)
               handleVariablePattern(null, _)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideNullAssert.dart.intertwined.expect
index 5356c975ce6..09635f991c9 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideNullAssert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideNullAssert.dart.intertwined.expect
@@ -70,8 +70,7 @@ parseUnit(void)
                         listener: handleVariablePattern(null, _)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideNullCheck.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideNullCheck.dart.expect
index a643f13fdfb..6173c1dafd6 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideNullCheck.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideNullCheck.dart.expect
@@ -28,8 +28,7 @@ beginCompilationUnit(void)
               handleNoType(case)
               handleVariablePattern(null, _)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideNullCheck.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideNullCheck.dart.intertwined.expect
index e82628e42ff..36be354aba5 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideNullCheck.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_bare_insideNullCheck.dart.intertwined.expect
@@ -70,8 +70,7 @@ parseUnit(void)
                         listener: handleVariablePattern(null, _)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideCase.dart.expect
index e8b360c1550..30ca722bd55 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideCase.dart.expect
@@ -29,8 +29,7 @@ beginCompilationUnit(void)
               handleNoTypeArguments(_)
               handleType(int, null)
               handleVariablePattern(final, _)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideCase.dart.intertwined.expect
index 1cc05a72a4d..11195aa7f88 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideCase.dart.intertwined.expect
@@ -71,8 +71,7 @@ parseUnit(void)
                         listener: handleType(int, null)
                         listener: handleVariablePattern(final, _)
                   ensureColon(_)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideCast.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideCast.dart.expect
index 0b35f4b430e..386d32c9133 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideCast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideCast.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(void)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideCast.dart.intertwined.expect
index 35f650897be..394238add29 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideCast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideCast.dart.intertwined.expect
@@ -78,8 +78,7 @@ parseUnit(void)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideNullAssert.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideNullAssert.dart.expect
index 8da816e592b..457968ab8b1 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideNullAssert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideNullAssert.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(void)
               handleType(int, null)
               handleVariablePattern(final, _)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideNullAssert.dart.intertwined.expect
index cf2a55d16d7..6f4c2ee0856 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideNullAssert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideNullAssert.dart.intertwined.expect
@@ -72,8 +72,7 @@ parseUnit(void)
                         listener: handleVariablePattern(final, _)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideNullCheck.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideNullCheck.dart.expect
index 735fd5f0320..ffb5838b781 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideNullCheck.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideNullCheck.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(void)
               handleType(int, null)
               handleVariablePattern(final, _)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideNullCheck.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideNullCheck.dart.intertwined.expect
index e59c1654c23..2581ab3cb37 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideNullCheck.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_final_typed_insideNullCheck.dart.intertwined.expect
@@ -72,8 +72,7 @@ parseUnit(void)
                         listener: handleVariablePattern(final, _)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideCase.dart.expect
index 6fa6d46c3e4..9501ba993e3 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideCase.dart.expect
@@ -27,8 +27,7 @@ beginCompilationUnit(void)
             beginCaseExpression(case)
               handleNoType(final)
               handleVariablePattern(final, _)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideCase.dart.intertwined.expect
index 0cd9d7e9475..6684d36a304 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideCase.dart.intertwined.expect
@@ -69,8 +69,7 @@ parseUnit(void)
                         listener: handleNoType(final)
                         listener: handleVariablePattern(final, _)
                   ensureColon(_)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideCast.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideCast.dart.expect
index 934dec8ca65..a10616e04ee 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideCast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideCast.dart.expect
@@ -33,8 +33,7 @@ beginCompilationUnit(void)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideCast.dart.intertwined.expect
index 2c975194360..4f74bea6143 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideCast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideCast.dart.intertwined.expect
@@ -76,8 +76,7 @@ parseUnit(void)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideNullAssert.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideNullAssert.dart.expect
index e3edd34a5fd..afe67b83ae7 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideNullAssert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideNullAssert.dart.expect
@@ -28,8 +28,7 @@ beginCompilationUnit(void)
               handleNoType(final)
               handleVariablePattern(final, _)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideNullAssert.dart.intertwined.expect
index c7fbf484b23..c8cf3d20c14 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideNullAssert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideNullAssert.dart.intertwined.expect
@@ -70,8 +70,7 @@ parseUnit(void)
                         listener: handleVariablePattern(final, _)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideNullCheck.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideNullCheck.dart.expect
index 1eb5a719085..10d05e190b7 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideNullCheck.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideNullCheck.dart.expect
@@ -28,8 +28,7 @@ beginCompilationUnit(void)
               handleNoType(final)
               handleVariablePattern(final, _)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideNullCheck.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideNullCheck.dart.intertwined.expect
index 81ba6a1abf1..fbe75e4d915 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideNullCheck.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_final_untyped_insideNullCheck.dart.intertwined.expect
@@ -70,8 +70,7 @@ parseUnit(void)
                         listener: handleVariablePattern(final, _)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideCase.dart.expect
index ce610e79124..13dfb1709ea 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideCase.dart.expect
@@ -29,8 +29,7 @@ beginCompilationUnit(void)
               handleNoTypeArguments(_)
               handleType(int, null)
               handleVariablePattern(null, _)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideCase.dart.intertwined.expect
index 9021cb130e9..034dd74db95 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideCase.dart.intertwined.expect
@@ -71,8 +71,7 @@ parseUnit(void)
                         listener: handleType(int, null)
                         listener: handleVariablePattern(null, _)
                   ensureColon(_)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideCast.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideCast.dart.expect
index 5988ae6d8db..c9b9f6b3657 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideCast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideCast.dart.expect
@@ -35,8 +35,7 @@ beginCompilationUnit(void)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideCast.dart.intertwined.expect
index c85852eb242..b901db3efa4 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideCast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideCast.dart.intertwined.expect
@@ -78,8 +78,7 @@ parseUnit(void)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideNullAssert.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideNullAssert.dart.expect
index 72ee932e767..ebe7f204d1b 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideNullAssert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideNullAssert.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(void)
               handleType(int, null)
               handleVariablePattern(null, _)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideNullAssert.dart.intertwined.expect
index ea898d4674d..8109b57a3aa 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideNullAssert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideNullAssert.dart.intertwined.expect
@@ -72,8 +72,7 @@ parseUnit(void)
                         listener: handleVariablePattern(null, _)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideNullCheck.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideNullCheck.dart.expect
index e6d1077b365..cc0b1c406e4 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideNullCheck.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideNullCheck.dart.expect
@@ -30,8 +30,7 @@ beginCompilationUnit(void)
               handleType(int, null)
               handleVariablePattern(null, _)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideNullCheck.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideNullCheck.dart.intertwined.expect
index 61988dce420..fc4869e8b6f 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideNullCheck.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_typed_insideNullCheck.dart.intertwined.expect
@@ -72,8 +72,7 @@ parseUnit(void)
                         listener: handleVariablePattern(null, _)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_var_insideCase.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_var_insideCase.dart.expect
index fbc7bd75d44..e60492a808d 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_var_insideCase.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_var_insideCase.dart.expect
@@ -27,8 +27,7 @@ beginCompilationUnit(void)
             beginCaseExpression(case)
               handleNoType(var)
               handleVariablePattern(var, _)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_var_insideCase.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_var_insideCase.dart.intertwined.expect
index 3d652ba1ec3..107b7509ea2 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_var_insideCase.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_var_insideCase.dart.intertwined.expect
@@ -69,8 +69,7 @@ parseUnit(void)
                         listener: handleNoType(var)
                         listener: handleVariablePattern(var, _)
                   ensureColon(_)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_var_insideCast.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_var_insideCast.dart.expect
index 38a641920fe..e59f822c917 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_var_insideCast.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_var_insideCast.dart.expect
@@ -33,8 +33,7 @@ beginCompilationUnit(void)
                 handleType(Object, null)
               endAsOperatorType(as)
               handleCastPattern(as)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_var_insideCast.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_var_insideCast.dart.intertwined.expect
index 5a74cdc35ff..a8c88a3b7b3 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_var_insideCast.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_var_insideCast.dart.intertwined.expect
@@ -76,8 +76,7 @@ parseUnit(void)
                     listener: endAsOperatorType(as)
                     listener: handleCastPattern(as)
                   ensureColon(Object)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_var_insideNullAssert.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_var_insideNullAssert.dart.expect
index fe7c5bb6698..5da84196a54 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_var_insideNullAssert.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_var_insideNullAssert.dart.expect
@@ -28,8 +28,7 @@ beginCompilationUnit(void)
               handleNoType(var)
               handleVariablePattern(var, _)
               handleNullAssertPattern(!)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_var_insideNullAssert.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_var_insideNullAssert.dart.intertwined.expect
index 19aca8f9178..988667e9a1a 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_var_insideNullAssert.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_var_insideNullAssert.dart.intertwined.expect
@@ -70,8 +70,7 @@ parseUnit(void)
                         listener: handleVariablePattern(var, _)
                     listener: handleNullAssertPattern(!)
                   ensureColon(!)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_var_insideNullCheck.dart.expect b/pkg/front_end/parser_testcases/patterns/wildcard_var_insideNullCheck.dart.expect
index 4cbc3e80534..fa6db209c63 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_var_insideNullCheck.dart.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_var_insideNullCheck.dart.expect
@@ -28,8 +28,7 @@ beginCompilationUnit(void)
               handleNoType(var)
               handleVariablePattern(var, _)
               handleNullCheckPattern(?)
-            endCaseExpression(null, :)
-            handleCaseMatch(case, null, :)
+            endCaseExpression(case, null, :)
             beginSwitchCase(0, 1, case)
               handleBreakStatement(false, break, ;)
             endSwitchCase(0, 1, null, null, 1, case, })
diff --git a/pkg/front_end/parser_testcases/patterns/wildcard_var_insideNullCheck.dart.intertwined.expect b/pkg/front_end/parser_testcases/patterns/wildcard_var_insideNullCheck.dart.intertwined.expect
index 5f342509550..673783d0a6c 100644
--- a/pkg/front_end/parser_testcases/patterns/wildcard_var_insideNullCheck.dart.intertwined.expect
+++ b/pkg/front_end/parser_testcases/patterns/wildcard_var_insideNullCheck.dart.intertwined.expect
@@ -70,8 +70,7 @@ parseUnit(void)
                         listener: handleVariablePattern(var, _)
                     listener: handleNullCheckPattern(?)
                   ensureColon(?)
-                  listener: endCaseExpression(null, :)
-                  listener: handleCaseMatch(case, null, :)
+                  listener: endCaseExpression(case, null, :)
                   peekPastLabels(break)
                   parseStatementsInSwitchCase(:, break, case, 0, 1, null, null)
                     listener: beginSwitchCase(0, 1, case)
diff --git a/pkg/front_end/test/parser_test_listener.dart b/pkg/front_end/test/parser_test_listener.dart
index a1ef053ac03..99f39b9c8b2 100644
--- a/pkg/front_end/test/parser_test_listener.dart
+++ b/pkg/front_end/test/parser_test_listener.dart
@@ -176,11 +176,12 @@ class ParserTestListener implements Listener {
   }
 
   @override
-  void endCaseExpression(Token? when, Token colon) {
+  void endCaseExpression(Token caseKeyword, Token? when, Token colon) {
     indent--;
+    seen(caseKeyword);
     seen(when);
     seen(colon);
-    doPrint('endCaseExpression(' '$when, ' '$colon)');
+    doPrint('endCaseExpression(' '$caseKeyword, ' '$when, ' '$colon)');
   }
 
   @override
@@ -1941,14 +1942,6 @@ class ParserTestListener implements Listener {
     indent++;
   }
 
-  @override
-  void handleCaseMatch(Token caseKeyword, Token? when, Token colon) {
-    seen(caseKeyword);
-    seen(when);
-    seen(colon);
-    doPrint('handleCaseMatch(' '$caseKeyword, ' '$when, ' '$colon)');
-  }
-
   @override
   void beginCatchClause(Token token) {
     seen(token);