-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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 autoindent on cc/S #2497 #2729
Merged
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
Many VSCodeVim commands already respect VS Code's build-in indentation, so I thought it should stay that way `cc` and `S` now act like when vim's filetype indent is turned on
Travis tests have failedHey @dqsully, Node.js: 8npm test --silent
|
Add a test for VSCodeVim#2497 Change test for VSCodeVim#1285 when autoindent is enabled
👍 |
xconverge
reviewed
Jun 14, 2018
src/actions/operator.ts
Outdated
@@ -566,21 +566,36 @@ export class ChangeOperator extends BaseOperator { | |||
} | |||
|
|||
public async runRepeat(vimState: VimState, position: Position, count: number): Promise<VimState> { | |||
const lineIsAllWhitespace = TextEditor.getLineAt(position).text.trim() === ''; | |||
let thisLineIndent = vimState.editor.document.getText( |
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.
can you make this const
Awesome, LGTM! Thanks |
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.
What this PR does / why we need it:
Changes the
cc
andS
commands to delete the whole line's contents and reindent it whenautoindent
is enabled. Originally these commands would only delete the text after the indent, which could leave the cursor inside the untouched indent text rather than moving it to the end of the indent.I think that since commands like
o
already 'reindent' the new line thatcc
andS
should too, and this implementation also moves the cursor to the end of the line automatically.Which issue(s) this PR fixes
fixes #2497