Fix Ambiguous Highlights

[thecoolwinter]

Description

Fixes some bad syntax highlighting caused by overlapping captures returned from tree-sitter. Previously the last value returned took precedence, but with the new highlighting system that's not the case. This filters highlights on duplicate ranges, and prioritizes the best capture for any range so this is no longer dependent on the highlighting system's semantics.

Related Issues

• closes 🐞 tree-sitter Returns Overlapping Highlights #276

Checklist

• I read and understood the contributing guide as well as the code of conduct
• The issues this PR addresses are related to each other
• My changes generate no new warnings
• My code builds and runs on my machine
• My changes are all related to the related issue above
• I documented my code

Screenshots

Disambiguated highlights:

Ambiguous highlights:

[austincondiff]

Nice work, and very well documented! I found a few potential issues. Let me know your thoughts.

[thecoolwinter]

Nice work, and very well documented! I found a few potential issues. Let me know your thoughts.

@austincondiff most of these changes are from #273 so I think we need to wait to review this until that is merged so the actual changes are visible here. Sorry I made it convoluted. The things you commented on are from that PR

[tom-ludwig]

Would it be better to set the #273 branch as the target and merge into it instead?

[thecoolwinter]

I think actually I'll just remake this PR entirely once #273 is merged. I'd rather not muck up that PR anymore since it's so large. Leaving this open and as a draft for now just to bookmark it.

[thecoolwinter]

Okay the changes shown here now reflect the actual diff. I'm not too worried about the messy commit history since we squash PRs anyways. Ready for review now!

[austincondiff]

Looks good!