This has been reported to tree-sitter-repository as: https://github.com/tree-sitter/tree-sitter/issues/874 Seems like it's possibly fixed. Without having fields we have to maintain complex code that compensates. - [x] update tree-sitter-toolset to latest versions - [x] find out if fields are supported and simplify our code (if they are there)