Add range check to `highlightsFromCursor`

thecoolwinter commented 1 year ago

Description

Fixes a bug found found by @cengelbart39 on discord where a parser would consume ranges already consumed by injected languages. This caused the injected ranges to be realized as plain text, when they should have been kept as their injected language's highlights.

This should have been avoided by the call to query.setRange(range) on line 43 in TreeSitterClient+Highlight.swift but it was found that for some reason in the case found by @cengelbart39 it just didn't work.

To fix, an additional check was added in highlightsFromCursor to only take any ranges that have indices in the intersection of it's range and the included range.

Related Issues

See discord link.

Checklist

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

Screenshots

Before:

https://user-images.githubusercontent.com/35942988/236696171-d30dfd7b-8545-4396-8aa8-490ceac65551.mov

After:

https://user-images.githubusercontent.com/35942988/236697575-3f605c0d-3dda-45c2-8f69-0f41148f1c2d.mov

thecoolwinter commented 1 year ago

The build error will be fixed when #186 is merged.

thecoolwinter commented 1 year ago

@austincondiff thanks! Just waiting for #186 to pin the STTextView version to fix the build error and this should be mergable.

CodeEditApp / CodeEditSourceEditor