Fix highlight_string function for proper highlighting - #3160

Summary: This should resolve #3160.
Closes https://github.com/facebook/hhvm/pull/3959

Reviewed By: @fredemmott

Differential Revision: D1624101