Forward-port ruby-core changes with Prism#46

hsbt merged 2 commits intomasterruby/error_highlight:masterfrom

pick-ruby-coreruby/error_highlight:pick-ruby-coreCopy head branch name to clipboard