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

Refactor dot #294

Merged
merged 12 commits into from
Jun 15, 2016
Merged

Refactor dot #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3291988
Make actions correspond with .able actions in Vim.
johnfn Jun 11, 2016
105ebe6
Move some more code around.
johnfn Jun 12, 2016
53782da
Clean up
johnfn Jun 12, 2016
31c03aa
Add a toString method.
johnfn Jun 12, 2016
fd587c0
Get some dot commands to work, again.
johnfn Jun 13, 2016
90068d7
I think I finally figured out how to do this.
johnfn Jun 13, 2016
62ca0eb
Refactor a lot of stuff; make insert motions repeatable.
johnfn Jun 15, 2016
53b23f4
Make d/ and c/ work.
johnfn Jun 15, 2016
c1f93ee
Clean up.
johnfn Jun 15, 2016
d7b9999
Merge branch 'master' into refactor-dot
johnfn Jun 15, 2016
497819c
Fix a tsc error only seen on Travis.
johnfn Jun 15, 2016
1fc36bf
Fix tslint
johnfn Jun 15, 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
109 changes: 64 additions & 45 deletions src/actions/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,22 @@ export class BaseAction {
*/
public keys: string[];

public mustBeFirstKey = false;

/**
* The keys pressed at the time that this action was triggered.
*/
public keysPressed: string[] = [];

/**
* Is this action valid in the current Vim state?
*/
public doesActionApply(vimState: VimState, keysPressed: string[]): boolean {
if (this.modes.indexOf(vimState.currentMode) === -1) { return false; }
if (!compareKeypressSequence(this.keys, keysPressed)) { return false; }
// TODO - this is not exactly correct and will eventually make me rage
// It's for cases like daw where a would otherwise by treated as append and insert.
if (this instanceof BaseCommand &&
!vimState.actionState.isInInitialState &&
!(this instanceof CommandInsertInSearchMode)) { return false; }
if (this instanceof BaseOperator && vimState.actionState.operator) { return false; }
if (vimState.recordedState.actionsRun.length > 0 &&
this.mustBeFirstKey) { return false; }
if (this instanceof BaseOperator && vimState.recordedState.operator) { return false; }

return true;
}
Expand All @@ -92,13 +96,16 @@ export class BaseAction {
public couldActionApply(vimState: VimState, keysPressed: string[]): boolean {
if (this.modes.indexOf(vimState.currentMode) === -1) { return false; }
if (!compareKeypressSequence(this.keys.slice(0, keysPressed.length), keysPressed)) { return false; }
if (this instanceof BaseCommand &&
!vimState.actionState.isInInitialState &&
!(this instanceof CommandInsertInSearchMode)) { return false; }
if (this instanceof BaseOperator && vimState.actionState.operator) { return false; }
if (vimState.recordedState.actionsRun.length > 0 &&
this.mustBeFirstKey) { return false; }
if (this instanceof BaseOperator && vimState.recordedState.operator) { return false; }

return true;
}

public toString(): string {
return this.keys.join("");
}
}

/**
Expand Down Expand Up @@ -159,7 +166,7 @@ export class Actions {
/**
* Every Vim action will be added here with the @RegisterAction decorator.
*/
public static allActions: BaseMovement[] = [];
public static allActions: { type: typeof BaseAction, action: BaseAction }[] = [];

/**
* Gets the action that should be triggered given a key
Expand All @@ -175,9 +182,13 @@ export class Actions {
public static getRelevantAction(keysPressed: string[], vimState: VimState): BaseAction | KeypressState {
let couldPotentiallyHaveMatch = false;

for (const action of Actions.allActions) {
for (const { type, action } of Actions.allActions) {
if (action.doesActionApply(vimState, keysPressed)) {
return action;
const result = new type();

result.keysPressed = vimState.recordedState.actionKeys.slice(0);

return result;
}

if (action.couldActionApply(vimState, keysPressed)) {
Expand All @@ -190,7 +201,7 @@ export class Actions {
}

export function RegisterAction(action) {
Actions.allActions.push(new action());
Actions.allActions.push({ type: action, action: new action() });
}


Expand All @@ -208,11 +219,28 @@ export function RegisterAction(action) {



@RegisterAction
class CommandEsc extends BaseCommand {
modes = [ModeName.Insert, ModeName.Visual, ModeName.VisualLine];
keys = ["<esc>"];

public async exec(position: Position, vimState: VimState): Promise<VimState> {
if (vimState.currentMode !== ModeName.Visual &&
vimState.currentMode !== ModeName.VisualLine) {
vimState.cursorPosition = position.getLeft();
}

vimState.currentMode = ModeName.Normal;

return vimState;
}
}

@RegisterAction
class CommandInsertAtCursor extends BaseCommand {
modes = [ModeName.Normal];
keys = ["i"];
mustBeFirstKey = true;

public async exec(position: Position, vimState: VimState): Promise<VimState> {
vimState.currentMode = ModeName.Insert;
Expand Down Expand Up @@ -261,7 +289,7 @@ class CommandInsertInSearchMode extends BaseCommand {
}

public async exec(position: Position, vimState: VimState): Promise<VimState> {
const key = vimState.actionState.actionKeys[0];
const key = this.keysPressed[0];

// handle special keys first
if (key === "<backspace>") {
Expand All @@ -284,7 +312,7 @@ class CommandInsertInSearchMode extends BaseCommand {

return vimState;
} else {
vimState.searchString += vimState.actionState.actionKeys[0];
vimState.searchString += this.keysPressed[0];
}

// console.log(vimState.searchString); (TODO: Show somewhere!)
Expand Down Expand Up @@ -380,7 +408,7 @@ class CommandInsertInInsertMode extends BaseCommand {
keys = ["<character>"];

public async exec(position: Position, vimState: VimState): Promise<VimState> {
const char = vimState.actionState.actionKeys[0];
const char = this.keysPressed[this.keysPressed.length - 1];

if (char === "<enter>") {
await TextEditor.insert("\n");
Expand All @@ -395,10 +423,14 @@ class CommandInsertInInsertMode extends BaseCommand {

return vimState;
}

public toString(): string {
return this.keysPressed[this.keysPressed.length - 1];
}
}

@RegisterAction
class CommandSearchForwards extends BaseCommand {
export class CommandSearchForwards extends BaseCommand {
modes = [ModeName.Normal];
keys = ["/"];

Expand All @@ -408,15 +440,15 @@ class CommandSearchForwards extends BaseCommand {
vimState.searchCursorStartPosition = position;
vimState.nextSearchMatchPosition = undefined;
vimState.currentMode = ModeName.SearchInProgressMode;
vimState.actionState.actionKeys = [];
// vimState.actionState.actionKeys = []; // ???

return vimState;
}
}


@RegisterAction
class CommandSearchBackward extends BaseCommand {
export class CommandSearchBackwards extends BaseCommand {
modes = [ModeName.Normal];
keys = ["?"];

Expand All @@ -426,7 +458,7 @@ class CommandSearchBackward extends BaseCommand {
vimState.searchCursorStartPosition = position;
vimState.nextSearchMatchPosition = undefined;
vimState.currentMode = ModeName.SearchInProgressMode;
vimState.actionState.actionKeys = [];
// vimState.actionState.actionKeys = []; // ???

return vimState;
}
Expand Down Expand Up @@ -764,23 +796,6 @@ class CommandMoveFullPageUp extends BaseCommand {
}
}

@RegisterAction
class CommandEsc extends BaseCommand {
modes = [ModeName.Insert, ModeName.Visual, ModeName.VisualLine];
keys = ["<esc>"];

public async exec(position: Position, vimState: VimState): Promise<VimState> {
if (vimState.currentMode !== ModeName.Visual &&
vimState.currentMode !== ModeName.VisualLine) {
vimState.cursorPosition = position.getLeft();
}

vimState.currentMode = ModeName.Normal;

return vimState;
}
}

@RegisterAction
class CommandDeleteToLineEnd extends BaseCommand {
modes = [ModeName.Normal];
Expand Down Expand Up @@ -870,6 +885,7 @@ class CommandOpenSquareBracket extends BaseCommand {
@RegisterAction
class CommandInsertAtLineBegin extends BaseCommand {
modes = [ModeName.Normal];
mustBeFirstKey = true;
keys = ["I"];

public async exec(position: Position, vimState: VimState): Promise<VimState> {
Expand All @@ -883,6 +899,7 @@ class CommandInsertAtLineBegin extends BaseCommand {
@RegisterAction
class CommandInsertAfterCursor extends BaseCommand {
modes = [ModeName.Normal];
mustBeFirstKey = true;
keys = ["a"];

public async exec(position: Position, vimState: VimState): Promise<VimState> {
Expand All @@ -897,6 +914,7 @@ class CommandInsertAfterCursor extends BaseCommand {
class CommandInsertAtLineEnd extends BaseCommand {
modes = [ModeName.Normal];
keys = ["A"];
mustBeFirstKey = true;

public async exec(position: Position, vimState: VimState): Promise<VimState> {
const pos = new Position(position.line,
Expand Down Expand Up @@ -988,7 +1006,7 @@ class MoveFindForward extends BaseMovement {
keys = ["f", "<character>"];

public async execAction(position: Position, vimState: VimState): Promise<Position> {
const toFind = vimState.actionState.actionKeys[1];
const toFind = this.keysPressed[1];

return position.findForwards(toFind);
}
Expand All @@ -1005,7 +1023,7 @@ class MoveFindBackward extends BaseMovement {
keys = ["F", "<character>"];

public async execAction(position: Position, vimState: VimState): Promise<Position> {
const toFind = vimState.actionState.actionKeys[1];
const toFind = this.keysPressed[1];

return position.findBackwards(toFind);
}
Expand All @@ -1018,7 +1036,7 @@ class MoveTilForward extends BaseMovement {
keys = ["t", "<character>"];

public async execAction(position: Position, vimState: VimState): Promise<Position> {
const toFind = vimState.actionState.actionKeys[1];
const toFind = this.keysPressed[1];

return position.tilForwards(toFind);
}
Expand All @@ -1034,7 +1052,7 @@ class MoveTilBackward extends BaseMovement {
keys = ["T", "<character>"];

public async execAction(position: Position, vimState: VimState): Promise<Position> {
const toFind = vimState.actionState.actionKeys[1];
const toFind = this.keysPressed[1];

return position.tilBackwards(toFind);
}
Expand Down Expand Up @@ -1097,7 +1115,7 @@ export class MoveWordBegin extends BaseMovement {
keys = ["w"];

public async execAction(position: Position, vimState: VimState): Promise<Position> {
if (vimState.actionState.operator instanceof ChangeOperator) {
if (vimState.recordedState.operator instanceof ChangeOperator) {

/*
From the Vim manual:
Expand Down Expand Up @@ -1142,7 +1160,8 @@ class MoveFullWordBegin extends BaseMovement {
keys = ["W"];

public async execAction(position: Position, vimState: VimState): Promise<Position> {
if (vimState.actionState.operator instanceof ChangeOperator) {
if (vimState.recordedState.operator instanceof ChangeOperator) {
// TODO use execForOperator? Or maybe dont?

// See note for w
return position.getCurrentBigWordEnd().getRight();
Expand Down Expand Up @@ -1304,7 +1323,7 @@ class ActionReplaceCharacter extends BaseCommand {
keys = ["r", "<character>"];

public async exec(position: Position, vimState: VimState): Promise<VimState> {
const toReplace = vimState.actionState.actionKeys[1];
const toReplace = this.keysPressed[1];
const state = await new DeleteOperator().run(vimState, position, position);

await TextEditor.insertAt(toReplace, position);
Expand Down
Loading