Skip to content

Commit

Permalink
Merge branch 'master' into c_a_further
Browse files Browse the repository at this point in the history
  • Loading branch information
J-Fields committed Feb 26, 2020
2 parents b366243 + f9faffa commit ca55711
Show file tree
Hide file tree
Showing 46 changed files with 777 additions and 267 deletions.
134 changes: 85 additions & 49 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
{
"key": "Delete",
"command": "extension.vim_delete",
"when": "editorTextFocus && vim.active && vim.mode != 'Insert' && !inDebugRepl"
"when": "editorTextFocus && vim.active && !inDebugRepl"
},
{
"key": "tab",
Expand Down Expand Up @@ -957,9 +957,9 @@
"@types/diff": "4.0.2",
"@types/diff-match-patch": "1.0.32",
"@types/lodash": "4.14.149",
"@types/mocha": "5.2.7",
"@types/mocha": "7.0.1",
"@types/node": "12.12.21",
"@types/sinon": "7.5.1",
"@types/sinon": "7.5.2",
"gulp": "4.0.2",
"gulp-bump": "3.1.3",
"gulp-git": "2.10.0",
Expand All @@ -968,13 +968,13 @@
"gulp-tslint": "8.1.4",
"gulp-typescript": "5.0.1",
"minimist": "1.2.0",
"mocha": "7.0.0",
"mocha": "7.1.0",
"plugin-error": "1.0.1",
"prettier": "1.19.1",
"sinon": "8.1.0",
"sinon": "9.0.0",
"ts-loader": "6.2.1",
"tslint": "5.20.1",
"typescript": "3.7.5",
"typescript": "3.8.2",
"vscode": "1.1.36"
}
}
4 changes: 4 additions & 0 deletions src/actions/baseMotion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ export abstract class BaseMovement extends BaseAction {
result = await this.createMovementResult(position, vimState, recordedState, lastIteration);

if (result instanceof Position) {
/**
* This position will be passed to the `motion` on the next iteration,
* it may cause some issues when count > 1.
*/
position = result;
} else if (isIMovement(result)) {
if (prevResult && result.failed) {
Expand Down
Loading

0 comments on commit ca55711

Please sign in to comment.