[RDY] Fix for lockup #7244 and #7249 #7261
Closed
Conversation
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
|
Travis timed out on the linter, QB failed on ubuntu for a reason I can't discern (there does not seem to be a failed test). |
justinmk
reviewed
Sep 12, 2017
| nmatch = curbuf->b_ml.ml_line_count - sub_firstlnum + 1; | ||
| skip_match = true; | ||
| } | ||
|
|
||
| // 3. Substitute the string. During 'inccommand' preview only do this if | ||
| // there is a replace pattern. |
There was a problem hiding this comment.
does that comment need to be moved?
There was a problem hiding this comment.
It's stil in the right place I'd say, but it mainly belongs to the else if clause... Should be changed, you're right.
justinmk
reviewed
Sep 12, 2017
| sub_firstline = vim_strsave((char_u *)""); | ||
| copycol = 0; | ||
| } | ||
| } else if (!preview || has_second_delim) { |
There was a problem hiding this comment.
instead of else-if, the usual way in this function is goto skip. That allows the structure to be more "chunked" and commentable. I'll change this in the merge.
justinmk
pushed a commit
to justinmk/neovim
that referenced
this pull request
Sep 12, 2017
|
see 2736f0c Not sure if it's better, but I guess using a macro at least gives a hint for later, if someone has a better idea in the future. |
|
merged |
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.
Fixes #7244
Ref #7249