Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fixes #739 #767

Merged
merged 3 commits into from
Sep 27, 2016
Merged

fixes #739 #767

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef5457b
fixes #739
xconverge Sep 14, 2016
e53b8b8
updated to fix c} as well
xconverge Sep 16, 2016
dab0335
Merge branch 'master' into cw-empty-line-jumps
xconverge Sep 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/actions/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1344,10 +1344,11 @@ export class ChangeOperator extends BaseOperator {

// If we delete to EOL, the block cursor would end on the final character,
// which means the insert cursor would be one to the left of the end of
// the line.
if (Position.getLineLength(TextEditor.getLineAt(start).lineNumber) !== 0) {
// the line. We do want to run delete if it is a multiline change though ex. c}
if (Position.getLineLength(TextEditor.getLineAt(start).lineNumber) !== 0 || (end.line !== start.line)) {
state = await new DeleteOperator().run(vimState, start, end);
}

state.currentMode = ModeName.Insert;

if (isEndOfLine) {
Expand Down Expand Up @@ -2667,6 +2668,10 @@ export class MoveWordBegin extends BaseMovement {
public async execAction(position: Position, vimState: VimState): Promise<Position> {
if (vimState.recordedState.operator instanceof ChangeOperator) {

if (TextEditor.getLineAt(position).text.length < 1) {
return position;
}

/*
From the Vim manual:

Expand Down