Support highlighting interpolated variables

Signed-off-by: Eric James Michael Ritz <ejmr@plutono.com>
Merge remote-tracking branch 'upstream/master' into work/ccmode