-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix bug in RangeHelp where range_by_whole_lines goes past end of buffer #5908
Conversation
45c0766
to
3dd476d
Compare
To add some more context, without this fix, an exception is raised when
|
it 'removes hash braces' do | ||
src = "render 'foo', {\n foo: bar\n}" | ||
corrected = autocorrect_source(src) | ||
expect(corrected).to eq("render 'foo', \n foo: bar\n") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume that this wasn't working before the change. It seems like this is what should be in the CHANGELOG. We normally only add CHANGELOG references for changes that could impact users. The average user doesn't know what RangeHelp
or range_by_whole_lines
is.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good to me, do you have a preferred wording for the changelog?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I went with
Fix `Style/BracesAroundHashParameters` auto-correct sometimes going past the end of the file.
Does that work better?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That sounds fine to me. Thanks for adding some context. Do you know what in particular about this line of code caused it go past the end of the file? Maybe something about the spacing or new lines?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the example broken source is on line 267
src = "render 'foo', {\n foo: bar\n}"
the problem is that this cop wants to remove the braces around hash argument, and to do that it will try to select the entire line where }
is located including a possible trailing newline, to do so range_by_whole_lines
will add 1 character to the end of the line here:
https://github.com/bbatsov/rubocop/blob/a66faa88ce004f8717aff136230d196e8be3ee2c/lib/rubocop/cop/mixin/range_help.rb#L68
and this makes the range go past the end of the buffer because }
in this example is the last character in the buffer.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It sounds like the issue comes from a closing curly bracket, }
living on a separate line than the contents of the hash. If that is the case, it would be useful to add to the CHANGELOG.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added some clarification to changelog 👍
…that goes past the end of the given buffer
Thanks! |
This fixes a bug where
RangeHelp#range_by_whole_lines
may return a range that goes past the end of the buffer wheninclude_final_newline
argument is true. This is because of the lineend_offset += 1 if include_final_newline
.I added 2 tests that fail without this fix, the original bug I encountered was from
BracesAroundHashParameters
when the hash being removed occurs at the very end of the ruby code.