Repository navigation
fix(native): start a diff's highlighting over at each collapsed stretch - #926
Merged
Merged
Conversation
Bumps godemirror to v0.8.1, whose DiffView highlights the rows between gaps on their own: a block comment closed in the hidden lines no longer runs on through the hunks below.
…ross-gaps # Conflicts: # CHANGELOG.md
This file contains hidden or 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
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.
Summary
In Review and Pulls, a block comment opened above a collapsed stretch of a diff, whose
*/fell in the hidden lines, colored every hunk below as a comment until some later*/. Expanding the stretch was the only way out.godemirror highlighted all the rows on screen as one text. v0.8.1 (lichdotdev/godemirror#5) highlights the rows between gaps on their own. This PR bumps the pin in both
go.modfiles and adds the CHANGELOG entry.What is left: the lines of a comment cut by a collapsed stretch, above it, can show as code until it is expanded, and in unified view deleted and added rows are still parsed together. Highlighting the whole old and new files is tracked in lichdotdev/godemirror#4.
Test plan
TestAGapEndsWhatItsHunkLeftOpen(unified and split) fails on v0.8.0 and passes on v0.8.1gofmt -l .andgo vet ./...at the root and innative/go test ./...innative/andgo test ./internal/themes/(the one backend package importing godemirror)