Port #22836 to release-2.8#22840

weswigham merged 1 commit intomicrosoft:release-2.8microsoft/TypeScript:release-2.8from

weswigham:charry-pick-comment-token-emit-fixweswigham/TypeScript:charry-pick-comment-token-emit-fixCopy head branch name to clipboard