This repository was archived by the owner on Sep 30, 2024. It is now read-only.
fix: Fixes incorrect highlighting for comments at the start of a file#64235
Merged
Conversation
da6ecd6 to
6a330b9
Compare
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The PR is already small but is broken up into tiny commits - the main change is shown
in the second commit. The problem was that we were incorrectly not doing a "stack push"
operation when encountering a comment, but we were doing a pop which triggered
a change in the source range for the next source range (this is done to avoid overlap
between the current occurrence and the subsequent occurrence that will be emitted).
This is fixed by not ignoring comment markers. As a consequence, we will emit
a few more occurrences than earlier, but I don't think it should be a big problem
in practice. We can also fuse these if needed.
Fixes https://github.com/sourcegraph/sourcegraph/issues/60852
Test plan
Added snapshot tests
Changelog
Fixes incorrect syntax highlighting when a comment is present at the start of a file.