The thing that makes #19510 complex is the differences in test output. One possible approach to this is to update the test output to be what it will be if --pretty is enabled. This is complicated by the fact that our current syntax for inline errors in the test data does not actually support what --pretty outputs. Adding that feature could possibly be useful.
(Additionally, #19940 should probably be fixed, and #19546 merged, before this issue is addressed, if one wants the process to be maximally smooth.)
Huh, it hadn't even occurred to me — there's no syntax for multi-line inline comments, is there? Nor for ignoring subsequent lines of a pretty comment in a test...
Originally posted by @wyattscarpenter in #19510 (comment)