Remove some function-declarations-inside-control-flow

Issue #1206
Take inclusiveLeft/Right into account when preventing editing of readOnly spans
Different fix for 'null' showing up in token classes

Issue #1214
Format match-highlighter to follow conventions