Fix delete line with CRLF (#743) #770
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
|
Why is the copy to a register test removed |
Per the PR description:
As stated, the removed test was an exact duplicate of the one above it. The only reason I saw it is because the test was failing prior to my change. |
|
Woops sorry totally missed that from my phone I wonder why there was a duplicate.. |
|
No problem! Might be a merge conflict artifact. |
johnfn
requested changes
Sep 15, 2016
| @@ -1062,7 +1062,8 @@ export class DeleteOperator extends BaseOperator { | |||
| let text = vscode.window.activeTextEditor.document.getText(new vscode.Range(start, end)); | |||
|
|
|||
| if (registerMode === RegisterMode.LineWise) { | |||
| text = text.slice(0, -1); // slice final newline in linewise mode - linewise put will add it back. | |||
| // slice final newline in linewise mode - linewise put will add it back. | |||
| text = text[text.length - 2] === '\r' ? text.slice(0, -2) : text.slice(0, -1); | |||
There was a problem hiding this comment.
Can you ensure the line actually ends in \r\n?
johnfn
approved these changes
Sep 15, 2016
|
Excellent! Thank you, @jgoz! |
This pull request was closed.
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 #743.
Delete was not taking a possible
\rinto consideration when performing a linewise delete, which resulted in an extra linebreak being appended to the line if it later was pasted.Also removed a duplicate test related to this functionality (
"Can copy to a register"). That test was failing on Windows with"files.eol": "crlf", but now passes after this change.