Support LSP token types and modifiers

The original implementation was half working, due to an incorrect interpretation of the standard.

This commit fixes that, but also adds modifiers

Fixes #366