- added upstream modifications for go highlighting