fixed macro highlighting in case a macro is used as a record field name; added a test for the introduced fix;
Merge remote-tracking branch 'origin/master'