Alan Zimmerman authored Aug 22, 2021 and Marge Bot committed Sep 06, 2021

A comment followed by a semicolon at the top level resulted in the
preceding comments being attached to the following declaration.

Capture the comments as belonging to the declaration preceding the
semicolon instead.

Closes #20258