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

More click past eol o no #1146

Merged
merged 3 commits into from
Dec 15, 2016
Merged

More click past eol o no #1146

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c332ca
fixes #1144
xconverge Dec 10, 2016
86dd8b9
fixes #1087
xconverge Dec 10, 2016
79c071f
remove debug prints
xconverge Dec 10, 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
25 changes: 23 additions & 2 deletions src/mode/modeHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,11 @@ export class VimState {
public lastVisualSelectionStart: Position;
public lastVisualSelectionEnd: Position;

/**
* Was the previous mouse click past EOL
*/
public lastClickWasPastEol: boolean = false;

/**
* The mode Vim will be in once this action finishes.
*/
Expand Down Expand Up @@ -561,8 +566,7 @@ export class ModeHandler implements vscode.Disposable {
return;
}

if (this.currentModeName === ModeName.VisualBlock ||
this.currentModeName === ModeName.VisualBlockInsertMode ||
if (this.currentModeName === ModeName.VisualBlockInsertMode ||
this.currentModeName === ModeName.EasyMotionMode) {
// AArrgghhhh - johnfn

Expand Down Expand Up @@ -622,11 +626,20 @@ export class ModeHandler implements vscode.Disposable {
// Only check on a click, not a full selection (to prevent clicking past EOL)
if (newPosition.character >= newPosition.getLineEnd().character && selection.isEmpty) {
if (this._vimState.currentMode !== ModeName.Insert) {

this._vimState.lastClickWasPastEol = true;

// This prevents you from mouse clicking past the EOL
newPosition = new Position(newPosition.line, Math.max(newPosition.getLineEnd().character - 1, 0));

// Switch back to normal mode since it was a click not a selection
this._vimState.currentMode = ModeName.Normal;
this.setCurrentModeByName(this._vimState);

toDraw = true;
}
} else if (selection.isEmpty) {
this._vimState.lastClickWasPastEol = false;
}

this._vimState.cursorPosition = newPosition;
Expand All @@ -653,6 +666,14 @@ export class ModeHandler implements vscode.Disposable {
this._vimState.cursorStartPosition = this._vimState.cursorStartPosition.getLeft();
}

// If we prevented from clicking past eol but it is part of this selection, include the last char
if (this._vimState.lastClickWasPastEol) {
const newStart = new Position(selection.anchor.line, selection.anchor.character + 1);
vscode.window.activeTextEditor.selection = new vscode.Selection(newStart, selection.end);
this._vimState.cursorStartPosition = selectionStart;
this._vimState.lastClickWasPastEol = false;
}

if (!this._vimState.getModeObject(this).isVisualMode &&
this._vimState.getModeObject(this).name !== ModeName.Insert) {
this._vimState.currentMode = ModeName.Visual;
Expand Down