VSCodeVim/Vim
1
1
Fork 0
mirror of https://github.com/VSCodeVim/Vim.git synced 2024-09-21 09:07:56 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3445 from esetnik/bugfix/sentences-backward-2689

Browse Source 
[Bugfix] - sentences backward
This commit is contained in:
Jason Poon 2019-02-02 14:58:08 -08:00 committed by GitHub
commit fdabb0771e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 93 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/motion/position.ts
View File

@ -639,7 +639,7 @@ export class Position extends vscode.Position {
if (args.forward) {
return this.getNextSentenceBeginWithRegex(this._sentenceEndRegex, false);
} else {
return this.getPreviousSentenceBeginWithRegex(this._sentenceEndRegex, false);
return this.getPreviousSentenceBeginWithRegex(this._sentenceEndRegex);
}
}
@ -972,22 +972,20 @@ export class Position extends vscode.Position {
return new Position(TextEditor.getLineCount() - 1, 0).getLineEnd();
}
private getPreviousSentenceBeginWithRegex(regex: RegExp, inclusive: boolean): Position {
private getPreviousSentenceBeginWithRegex(regex: RegExp): Position {
let paragraphBegin = this.getCurrentParagraphBeginning();
for (let currentLine = this.line; currentLine >= paragraphBegin.line; currentLine--) {
let endPositions = this.getAllEndPositions(
TextEditor.getLineAt(new vscode.Position(currentLine, 0)).text,
regex
);
let newCharacter = _.find(
endPositions.reverse(),
index =>
(index < this.character &&
!inclusive &&
new Position(currentLine, index).getRightThroughLineBreaks().compareTo(this)) ||
(index <= this.character && inclusive) ||
currentLine !== this.line
);
let newCharacter = _.find(endPositions.reverse(), index => {
const newPositionBeforeThis = new Position(currentLine, index)
.getRightThroughLineBreaks()
.compareTo(this);
return (newPositionBeforeThis && (index < this.character || currentLine < this.line));
});
if (newCharacter !== undefined) {
return new Position(currentLine, <number>newCharacter).getRightThroughLineBreaks();

84
test/sentenceMotion.test.ts Normal file
View File

@ -0,0 +1,84 @@
import { getTestingFunctions } from './testSimplifier';
import { cleanUpWorkspace, setupWorkspace } from './testUtils';
suite('sentence motion', () => {
let { newTest } = getTestingFunctions();
setup(async () => {
await setupWorkspace(undefined, '.js');
});
teardown(cleanUpWorkspace);
suite('[count] sentences backward', () => {
newTest({
title: 'move one sentence backward',
start: ['lorem ipsum. lorem ipsum|'],
keysPressed: '(',
end: ['lorem ipsum. |lorem ipsum'],
});
newTest({
title: 'move one sentence backward',
start: ['lorem ipsum. lorem ipsum|'],
keysPressed: '1(',
end: ['lorem ipsum. |lorem ipsum'],
});
newTest({
title: 'move [count] sentences backward',
start: ['lorem ipsum. lorem ipsum. lorem ipsum|'],
keysPressed: '2(',
end: ['lorem ipsum. |lorem ipsum. lorem ipsum'],
});
newTest({
title: 'move one sentence backward single line - middle',
start: ['lorem ipsum. |lorem ipsum'],
keysPressed: '(',
end: ['|lorem ipsum. lorem ipsum'],
});
newTest({
title: 'move one sentence backward no space',
start: ['lorem ipsum.lorem ipsum|'],
keysPressed: '(',
end: ['|lorem ipsum.lorem ipsum'],
});
newTest({
title: 'move one sentence backward no space - middle',
start: ['lorem ipsum.|lorem ipsum'],
keysPressed: '(',
end: ['|lorem ipsum.lorem ipsum'],
});
newTest({
title: 'move one sentence backward - multiline',
start: ['lorem ipsum', 'lorem ipsum|'],
keysPressed: '(',
end: ['|lorem ipsum', 'lorem ipsum'],
});
newTest({
title: 'move one sentence backward - multiline - period',
start: ['lorem ipsum.', 'lorem ipsum|'],
keysPressed: '(',
end: ['lorem ipsum.', '|lorem ipsum'],
});
newTest({
title: 'move one sentence backward - multiline - previous line',
start: ['lorem ipsum', '|lorem ipsum'],
keysPressed: '(',
end: ['|lorem ipsum', 'lorem ipsum'],
});
newTest({
title: 'move one sentence backward - multiline - previous line - period',
start: ['lorem ipsum.', '|lorem ipsum'],
keysPressed: '(',
end: ['|lorem ipsum.', 'lorem ipsum'],
});
});
});