Multiple Highlighter Support #273
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…olwinter/CodeEditSourceEditor into feat/multiple-highlighters
|
Small update, fixed a bug where when the visible set was updated it'd invalidate the whole visible range rather than just the new indices. Also fixes a bug where the entire document could have attributes set (and therefore layout invalidated for the entire document). Added a test to make sure this doesn't happen in the future. |
tom-ludwig
previously approved these changes
Nov 11, 2024
Sources/CodeEditSourceEditor/Highlighting/HighlighProviding/HighlightProviderState.swift
Outdated
Show resolved
Hide resolved
Sources/CodeEditSourceEditor/Highlighting/HighlighProviding/HighlightProviderState.swift
Outdated
Show resolved
Hide resolved
...ceEditor/Highlighting/StyledRangeContainer/StyledRangeStore/StyledRangeStore+Internals.swift
Outdated
Show resolved
Hide resolved
...ceEditor/Highlighting/StyledRangeContainer/StyledRangeStore/StyledRangeStore+StyledRun.swift
Show resolved
Hide resolved
Tests/CodeEditSourceEditorTests/Highlighting/HighlightProviderStateTest.swift
Outdated
Show resolved
Hide resolved
Tests/CodeEditSourceEditorTests/Highlighting/StyledRangeContainerTests.swift
Outdated
Show resolved
Hide resolved
Tests/CodeEditSourceEditorTests/Highlighting/StyledRangeContainerTests.swift
Outdated
Show resolved
Hide resolved
Co-authored-by: Tom Ludwig <[email protected]>
matthijseikelenboom
previously approved these changes
Nov 13, 2024
|
Thanks y'all for the review work, but I'm going to have to draft this for a minute. I found a few cases of incorrect/different highlights that I think has to do with tree-sitter returning overlapping captures. |
|
Alright I've got a pull request open for the issue I mentioned, it's only a problem for this highlight system so I've made it based on this branch. Both are ready for review now |
0xWDG
approved these changes
Nov 18, 2024
tom-ludwig
approved these changes
Nov 18, 2024
6 tasks
thecoolwinter
added a commit
that referenced
this pull request
Nov 21, 2024
### Description In the highlight state, invalidates the correct range when performing an edit. Sometimes tree-sitter doesn't invalidate the ranges that were edited, so we need to add that edited range in. This ensures that a non-empty range is always invalidated. ### Related Issues - Related pr: #273 ### Checklist - [x] I read and understood the [contributing guide](https://github.com/CodeEditApp/CodeEdit/blob/main/CONTRIBUTING.md) as well as the [code of conduct](https://github.com/CodeEditApp/CodeEdit/blob/main/CODE_OF_CONDUCT.md) - [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 https://github.com/user-attachments/assets/9e4d9b35-1e2d-44b8-9c2e-ffbfde69c8e4 Previously: https://github.com/user-attachments/assets/4b572c31-0320-4f90-ac52-6f911713bc75
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Adds support for multiple highlight providers.
Note
For reviewers: You may notice that this uses an underscored module
_RopeModule. This module is safe, as in it has tests and is used in production (it backs AttributedString and BigString Foundation types). It's underscored because the API may change in the future, and the swift-collections devs consider it to be the incorrect collection type to use for most applications. However, this application meets every requirement for using a Rope.Related Issues
Checklist
Screenshots
N/A