Opening and Ending name matching

[tschf]

Reported in #36

Need to try a few different scenarios and a few different syntaxes to see the behaviour. Also, a recent change added function matching to generic function naming, so the D1 not being highlighted in the example may affect the result here.