Fix highlighting issues

- Fixed highlighting defined type in variable declarations
- Corrected parser state following docBlock closure