Handle avoid Error & MatchParen highlight correctly
Merge branch 'handle/avoidhighlight' into master