Fix error when count exceeds max number of rows in "[count]Y/J" #4628

lusingander · 2020-03-07T06:13:32Z

What this PR does / why we need it:

An error occurred when executing yank(Shift+y) or join(Shift+j) with a count exceeding the number of lines in the file.

(e.g. execute 1000Y on the 100 line file.)

So I fixed it to calculate the number of rows to be processed using Position#getDownByCount.

Which issue(s) this PR fixes

Fixes #4625

Special notes for your reviewer:

error occured if count is larger than number of lines

ghost

LGTM, but I think we need more tests.

test/mode/modeNormal.test.ts

test/mode/normalModeTests/commands.test.ts

src/actions/commands/actions.ts

TravisBuddy · 2020-03-30T11:55:55Z

Travis tests have failed

Hey @lusingander,
Please read the following log in order to understand the failure reason.
It'll be awesome if you fix what's wrong and commit the changes.

Node.js: 12

View build log

if [[ $(git diff-index HEAD -- *.js *.ts *.md) ]]; then git diff; echo "Prettier Failed. Run `gulp forceprettier` and commit changes to resolve."; exit 1; fi

The command "if [[ $(git diff-index HEAD -- *.js *.ts *.md) ]]; then git diff; echo "Prettier Failed. Run `gulp forceprettier` and commit changes to resolve."; exit 1; fi" exited with 0.
$ npm run build

> vim@1.13.1 build /home/travis/build/VSCodeVim/Vim
> gulp build

[11:55:18] Using gulpfile ~/build/VSCodeVim/Vim/gulpfile.js
[11:55:18] Starting 'build'...
[11:55:18] Starting 'prettier'...
[11:55:18] Finished 'prettier' after 30 ms
[11:55:18] Starting 'tsc'...
[11:55:18] Starting 'tslint'...
src/actions/commands/actions.ts(2143,26): error TS2339: Property 'getDownByCount' does not exist on type 'Position'.
src/actions/commands/actions.ts(3078,34): error TS2339: Property 'getDownByCount' does not exist on type 'Position'.
TypeScript: 2 semantic errors
TypeScript: emit failed
[11:55:32] The following tasks did not complete: build, <parallel>, tsc, tslint
[11:55:32] Did you forget to signal async completion?
npm ERR! code ELIFECYCLE
npm ERR! errno 1
npm ERR! vim@1.13.1 build: `gulp build`
npm ERR! Exit status 1
npm ERR! 
npm ERR! Failed at the vim@1.13.1 build script.
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.

npm ERR! A complete log of this run can be found in:
npm ERR!     /home/travis/.npm/_logs/2020-03-30T11_55_32_024Z-debug.log
The command "npm run build" exited with 1.
$ npm test

> vim@1.13.1 test /home/travis/build/VSCodeVim/Vim
> node ./node_modules/vscode/bin/test

### VS Code Extension Test Run ###

Current working directory: /home/travis/build/VSCodeVim/Vim
Downloading VS Code 1.43.2 into .vscode-test/vscode-1.43.2.
Downloading VS Code from: https://update.code.visualstudio.com/1.43.2/linux-x64/stable
Downloaded VS Code 1.43.2
Running extension tests: /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/code /home/travis/build/VSCodeVim/Vim/test --extensionDevelopmentPath=/home/travis/build/VSCodeVim/Vim --extensionTestsPath=/home/travis/build/VSCodeVim/Vim/test --locale=en
[main 2020-03-30T11:55:36.491Z] update#setState idle

bash: cannot set terminal process group (-1): Inappropriate ioctl for device

bash: no job control in this shell

(node:5838) Electron: Loading non context-aware native modules in the renderer process is deprecated and will stop working at some point in the future, please see https://github.com/electron/electron/issues/18397 for more information

(node:5838) Electron: Loading non context-aware native modules in the renderer process is deprecated and will stop working at some point in the future, please see https://github.com/electron/electron/issues/18397 for more information

(node:5838) Electron: Loading non context-aware native modules in the renderer process is deprecated and will stop working at some point in the future, please see https://github.com/electron/electron/issues/18397 for more information
(node:5838) Electron: Loading non context-aware native modules in the renderer process is deprecated and will stop working at some point in the future, please see https://github.com/electron/electron/issues/18397 for more information

(node:5838) Electron: Loading non context-aware native modules in the renderer process is deprecated and will stop working at some point in the future, please see https://github.com/electron/electron/issues/18397 for more information

(node:5838) Electron: Loading non context-aware native modules in the renderer process is deprecated and will stop working at some point in the future, please see https://github.com/electron/electron/issues/18397 for more information

Error: Error: Cannot find module '/home/travis/build/VSCodeVim/Vim/test'
Require stack:
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/vs/loader.js
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/bootstrap-amd.js
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/bootstrap-fork.js
	at d._doHandleExtensionTests (/home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/vs/workbench/services/extensions/node/extensionHostProcess.js:725:405)

Error: Cannot find module '/home/travis/build/VSCodeVim/Vim/test'
Require stack:
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/vs/loader.js
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/bootstrap-amd.js
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/bootstrap-fork.js: Error: Error: Cannot find module '/home/travis/build/VSCodeVim/Vim/test'
Require stack:
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/vs/loader.js
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/bootstrap-amd.js
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/bootstrap-fork.js
	at d._doHandleExtensionTests (/home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/vs/workbench/services/extensions/node/extensionHostProcess.js:725:405)

(node:6397) Electron: Loading non context-aware native modules in the renderer process is deprecated and will stop working at some point in the future, please see https://github.com/electron/electron/issues/18397 for more information

(node:6397) Electron: Loading non context-aware native modules in the renderer process is deprecated and will stop working at some point in the future, please see https://github.com/electron/electron/issues/18397 for more information

Tests exited with code: 1
npm ERR! Test failed.  See above for more details.
The command "npm test" exited with 1.
store build cache
changes detected (content changed, file is created, or file is deleted):\n/home/travis/.npm/_logs/2020-03-30T11_55_32_024Z-debug.log\n
changes detected, packing new archive
cache uploaded


Done. Your build exited with 1.

npm run build

> vim@1.13.1 build /home/travis/build/VSCodeVim/Vim
> gulp build

[11:55:18] Using gulpfile ~/build/VSCodeVim/Vim/gulpfile.js
[11:55:18] Starting 'build'...
[11:55:18] Starting 'prettier'...
[11:55:18] Finished 'prettier' after 30 ms
[11:55:18] Starting 'tsc'...
[11:55:18] Starting 'tslint'...
src/actions/commands/actions.ts(2143,26): error TS2339: Property 'getDownByCount' does not exist on type 'Position'.
src/actions/commands/actions.ts(3078,34): error TS2339: Property 'getDownByCount' does not exist on type 'Position'.
TypeScript: 2 semantic errors
TypeScript: emit failed
[11:55:32] The following tasks did not complete: build, <parallel>, tsc, tslint
[11:55:32] Did you forget to signal async completion?
npm ERR! code ELIFECYCLE
npm ERR! errno 1
npm ERR! vim@1.13.1 build: `gulp build`
npm ERR! Exit status 1
npm ERR! 
npm ERR! Failed at the vim@1.13.1 build script.
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.

npm ERR! A complete log of this run can be found in:
npm ERR!     /home/travis/.npm/_logs/2020-03-30T11_55_32_024Z-debug.log

npm test

> vim@1.13.1 test /home/travis/build/VSCodeVim/Vim
> node ./node_modules/vscode/bin/test

### VS Code Extension Test Run ###

Current working directory: /home/travis/build/VSCodeVim/Vim
Downloading VS Code 1.43.2 into .vscode-test/vscode-1.43.2.
Downloading VS Code from: https://update.code.visualstudio.com/1.43.2/linux-x64/stable
Downloaded VS Code 1.43.2
Running extension tests: /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/code /home/travis/build/VSCodeVim/Vim/test --extensionDevelopmentPath=/home/travis/build/VSCodeVim/Vim --extensionTestsPath=/home/travis/build/VSCodeVim/Vim/test --locale=en
[main 2020-03-30T11:55:36.491Z] update#setState idle

bash: cannot set terminal process group (-1): Inappropriate ioctl for device

bash: no job control in this shell

(node:5838) Electron: Loading non context-aware native modules in the renderer process is deprecated and will stop working at some point in the future, please see https://github.com/electron/electron/issues/18397 for more information

(node:5838) Electron: Loading non context-aware native modules in the renderer process is deprecated and will stop working at some point in the future, please see https://github.com/electron/electron/issues/18397 for more information

(node:5838) Electron: Loading non context-aware native modules in the renderer process is deprecated and will stop working at some point in the future, please see https://github.com/electron/electron/issues/18397 for more information
(node:5838) Electron: Loading non context-aware native modules in the renderer process is deprecated and will stop working at some point in the future, please see https://github.com/electron/electron/issues/18397 for more information

(node:5838) Electron: Loading non context-aware native modules in the renderer process is deprecated and will stop working at some point in the future, please see https://github.com/electron/electron/issues/18397 for more information

(node:5838) Electron: Loading non context-aware native modules in the renderer process is deprecated and will stop working at some point in the future, please see https://github.com/electron/electron/issues/18397 for more information

Error: Error: Cannot find module '/home/travis/build/VSCodeVim/Vim/test'
Require stack:
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/vs/loader.js
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/bootstrap-amd.js
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/bootstrap-fork.js
	at d._doHandleExtensionTests (/home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/vs/workbench/services/extensions/node/extensionHostProcess.js:725:405)

Error: Cannot find module '/home/travis/build/VSCodeVim/Vim/test'
Require stack:
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/vs/loader.js
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/bootstrap-amd.js
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/bootstrap-fork.js: Error: Error: Cannot find module '/home/travis/build/VSCodeVim/Vim/test'
Require stack:
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/vs/loader.js
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/bootstrap-amd.js
- /home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/bootstrap-fork.js
	at d._doHandleExtensionTests (/home/travis/build/VSCodeVim/Vim/.vscode-test/vscode-1.43.2/VSCode-linux-x64/resources/app/out/vs/workbench/services/extensions/node/extensionHostProcess.js:725:405)

(node:6397) Electron: Loading non context-aware native modules in the renderer process is deprecated and will stop working at some point in the future, please see https://github.com/electron/electron/issues/18397 for more information

(node:6397) Electron: Loading non context-aware native modules in the renderer process is deprecated and will stop working at some point in the future, please see https://github.com/electron/electron/issues/18397 for more information

Tests exited with code: 1
npm ERR! Test failed.  See above for more details.

TravisBuddy Request Identifier: 66204210-727d-11ea-9d77-7bbee09565ec

src/actions/commands/actions.ts

lusingander added 2 commits March 7, 2020 12:37

Fix error in "Y" with large count

33ec2ff

error occured if count is larger than number of lines

Fix error in "J" with large count

03a5fee

error occured if count is larger than number of lines

ghost reviewed Mar 7, 2020

View reviewed changes

test/mode/modeNormal.test.ts Show resolved Hide resolved

test/mode/normalModeTests/commands.test.ts Show resolved Hide resolved

ghost approved these changes Mar 7, 2020

View reviewed changes

lusingander changed the title ~~Fix error in "[count]Y/J" with large count~~ Fix error when count exceeds max number of rows in "[count]Y/J" Mar 7, 2020

Merge branch 'master' into fix/yank-join-with-count

ce83de2

J-Fields reviewed Mar 16, 2020

View reviewed changes

src/actions/commands/actions.ts Outdated Show resolved Hide resolved

Merge branch 'master' into fix/yank-join-with-count

fa91498

J-Fields added this to the v1.14.0 milestone Mar 27, 2020

J-Fields and others added 2 commits March 27, 2020 12:59

Merge branch 'master' into fix/yank-join-with-count

5e90276

Merge branch 'master' into fix/yank-join-with-count

3cfa99c

Merge changes from commit 38db172

e2d3c6c

J-Fields reviewed Mar 30, 2020

View reviewed changes

src/actions/commands/actions.ts Show resolved Hide resolved

J-Fields merged commit 33f3c88 into VSCodeVim:master Mar 30, 2020

lusingander deleted the fix/yank-join-with-count branch March 30, 2020 23:58

J-Fields removed this from the v1.15.0 milestone May 2, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix error when count exceeds max number of rows in "[count]Y/J" #4628

Fix error when count exceeds max number of rows in "[count]Y/J" #4628

lusingander commented Mar 7, 2020

ghost left a comment

TravisBuddy commented Mar 30, 2020

Fix error when count exceeds max number of rows in "[count]Y/J" #4628

Fix error when count exceeds max number of rows in "[count]Y/J" #4628

Conversation

lusingander commented Mar 7, 2020

ghost left a comment

Choose a reason for hiding this comment

TravisBuddy commented Mar 30, 2020

Travis tests have failed

Node.js: 12

TravisBuddy Request Identifier: 66204210-727d-11ea-9d77-7bbee09565ec