fix(highlight): fix eol highlight not displaying #1988
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
xiyaowong
force-pushed
the
fix/eol-highlights
branch
from
3cb4f26
to
19d97b6
Compare
xiyaowong
commented
May 19, 2024
| @@ -33,7 +37,18 @@ export function calculateEditorColFromVimScreenCol(line: string, screenCol: numb | |||
| } | |||
|
|
|||
| if (currentCharIdx >= line.length) { | |||
There was a problem hiding this comment.
@ollien Here we cannot use width; what we need is character index
There was a problem hiding this comment.
Nice catch. I had a test failure on one of the double-wide unit tests but must have fixed it otherwise
xiyaowong
force-pushed
the
fix/eol-highlights
branch
from
977426c
to
1fccc2d
Compare
xiyaowong
force-pushed
the
fix/eol-highlights
branch
from
1fccc2d
to
3308c52
Compare
ollien
approved these changes
May 19, 2024
| @@ -630,6 +630,26 @@ describe("processHighlightCellsEvent", () => { | |||
| }, | |||
| ], | |||
| }, | |||
There was a problem hiding this comment.
Thanks for carrying this over. If you would be so kind, would you mind adding a case for where the Math.max will trigger return 0, when calculating eolCol?
justinmk
reviewed
May 21, 2024
| @@ -17,10 +17,14 @@ export function expandTabs(line: string, tabWidth: number): string { | |||
| return expanded; | |||
| } | |||
|
|
|||
| /** | |||
| * Note: This function is for use by the highlight module only. | |||
| */ | |||
| export function calculateEditorColFromVimScreenCol(line: string, screenCol: number, tabSize: number): number { | |||
There was a problem hiding this comment.
off topic: this could be named getColFromNvimCol without any loss of clarity, while reducing verbosity.
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.
Close #1987