Yeah, tree-sitter and LSP are both steps in the right direction I think.