Prevent a panic when uncommenting a line with only a comment token #5933
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
pascalkuthe
requested changes
Feb 12, 2023
pascalkuthe
added
C-bug
trink
force-pushed
the
panic_on_uncomment
branch
from
f146feb to
6a2af5d
Compare
pascalkuthe
added
S-waiting-on-review
helix-core/src/comment.rs
Outdated
| if matches!(line_slice.get_char(pos + token_len), Some(c) if c != ' ') { | ||
| margin = 0; | ||
| if !matches!(line_slice.get_char(pos + token_len), Some(c) if c == ' ') { | ||
| margin = 0 |
There was a problem hiding this comment.
Suggested change
| margin = 0 | |
| margin = 0; |
looks like this semicolon got chopped off on accident
Open a new document `test.rs` and type the following: `di//<esc><C-c>` The margin calculation pushes the range out of bounds for the comment marker when there are no characters (newline) after it. thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: Char range out of bounds: char range 0..3, Rope/RopeSlice char length 2', ropey-1.6.0/src/rope.rs:546:37 The debug build catches the error in the transaction: thread 'main' panicked at 'attempt to subtract with overflow', helix-core/src/transaction.rs:503:26
trink
force-pushed
the
panic_on_uncomment
branch
from
6a2af5d to
d201ced
Compare
the-mikedavis
approved these changes
Feb 12, 2023
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.
Open a new document
test.rsand type the following:di//<esc><C-c>The margin calculation pushes the range out of bounds for the comment marker when there are no characters (newline) after it.
thread 'main' panicked at 'called
Result::unwrap()on anErrvalue: Char range out of bounds: char range 0..3,Rope/RopeSlice char length 2', ropey-1.6.0/src/rope.rs:546:37
The debug build catches the error in the transaction: thread 'main' panicked at 'attempt to subtract with overflow',
helix-core/src/transaction.rs:503:26