[Diagnostics] fix trivia merging and transfer#2848

Draft

AppAppWorks wants to merge 2 commits intoswiftlang:mainfrom AppAppWorks:fix-trivia-merging-and-transfer

+128-56

Commits on Sep 12, 2024

Deprecate Trivia.merging(_:) and Trivia.merging(triviaOf:)
AppAppWorks
committed

Commits on Sep 16, 2024

Adopt the new merging API of Trivia and fix trivia transfer
AppAppWorks
committed