[Highlighting] Began with implementing #407 diff-based highlighting.