Fix autocomplete
Add highlighting for ANTLR