SONARPLUGINS-2351 Grammar: improve handling of virtual semicolon