[Diagnostics] fix trivia merging and transfer#2848

AppAppWorks wants to merge 2 commits intoswiftlang:mainswiftlang/swift-syntax:mainfrom

AppAppWorks:fix-trivia-merging-and-transferAppAppWorks/swift-syntax:fix-trivia-merging-and-transferCopy head branch name to clipboard