prefer do-end for multiline block
Merge pull request #8774 from goshakkk/multiline-block-do-end

Prefer do-end for multiline block [ci skip]