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

Run prettier

Browse Source
This commit is contained in:
Jason Fields 2021-04-08 18:42:22 -04:00
parent 9e50e0dc52
commit 3355569e96
4 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/actions/commands/actions.ts
View File

@ -3066,10 +3066,8 @@ class ActionOverrideCmdDInsert extends BaseCommand {
// that our selection is actually over what our original word is // that our selection is actually over what our original word is
const matchWordPos = vimState.editor.selections[0].active; const matchWordPos = vimState.editor.selections[0].active;
const matchWordLength = const matchWordLength =
matchWordPos matchWordPos.getLeft().nextWordEnd(vimState.document, { inclusive: true }).getRight()
.getLeft() .character - matchWordPos.prevWordStart(vimState.document).character;
.nextWordEnd(vimState.document, { inclusive: true })
.getRight().character - matchWordPos.prevWordStart(vimState.document).character;
const wordBegin = curPos.getLeft(matchWordLength); const wordBegin = curPos.getLeft(matchWordLength);
return new vscode.Selection(wordBegin, curPos); return new vscode.Selection(wordBegin, curPos);
} }

8
src/actions/plugins/camelCaseMotion.ts
View File

@ -41,9 +41,7 @@ class MoveCamelCaseWordBegin extends CamelCaseBaseMovement {
// TODO use execForOperator? Or maybe dont? // TODO use execForOperator? Or maybe dont?
// See note for w // See note for w
return position return position.nextWordEnd(vimState.document, { wordType: WordType.CamelCase }).getRight();
.nextWordEnd(vimState.document, { wordType: WordType.CamelCase })
.getRight();
} else { } else {
return position.nextWordStart(vimState.document, { wordType: WordType.CamelCase }); return position.nextWordStart(vimState.document, { wordType: WordType.CamelCase });
} }
@ -88,9 +86,7 @@ class SelectInnerCamelCaseWord extends CamelCaseTextObjectMovement {
const currentChar = vimState.document.lineAt(position).text[position.character]; const currentChar = vimState.document.lineAt(position).text[position.character];
if (/\s/.test(currentChar)) { if (/\s/.test(currentChar)) {
start = position start = position.prevWordEnd(vimState.document, { wordType: WordType.CamelCase }).getRight();
.prevWordEnd(vimState.document, { wordType: WordType.CamelCase })
.getRight();
stop = position stop = position
.nextWordStart(vimState.document, { wordType: WordType.CamelCase }) .nextWordStart(vimState.document, { wordType: WordType.CamelCase })
.getLeftThroughLineBreaks(); .getLeftThroughLineBreaks();

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

@ -415,12 +415,7 @@ Position.prototype.nextWordEnd = function (
document: vscode.TextDocument, document: vscode.TextDocument,
args?: { wordType?: WordType; inclusive?: boolean } args?: { wordType?: WordType; inclusive?: boolean }
): Position { ): Position {
return nextWordEnd( return nextWordEnd(document, this, args?.wordType ?? WordType.Normal, args?.inclusive ?? false);
document,
this,
args?.wordType ?? WordType.Normal,
args?.inclusive ?? false
);
}; };
Position.prototype.getSentenceBegin = function ( Position.prototype.getSentenceBegin = function (

9
src/textobject/textobject.ts
View File

@ -118,9 +118,7 @@ export class SelectABigWord extends TextObjectMovement {
(nextWord.line > position.line || nextWord.isAtDocumentEnd()) && (nextWord.line > position.line || nextWord.isAtDocumentEnd()) &&
vimState.recordedState.count === 0 vimState.recordedState.count === 0
) { ) {
if ( if (position.prevWordEnd(vimState.document, { wordType: WordType.Big }).isLineBeginning()) {
position.prevWordEnd(vimState.document, { wordType: WordType.Big }).isLineBeginning()
) {
start = position.prevWordEnd(vimState.document, { wordType: WordType.Big }); start = position.prevWordEnd(vimState.document, { wordType: WordType.Big });
} else { } else {
start = position.prevWordEnd(vimState.document, { wordType: WordType.Big }).getRight(); start = position.prevWordEnd(vimState.document, { wordType: WordType.Big }).getRight();
@ -324,7 +322,10 @@ export class SelectInnerBigWord extends TextObjectMovement {
start = position.prevWordEnd(vimState.document, { wordType: WordType.Big }).getRight(); start = position.prevWordEnd(vimState.document, { wordType: WordType.Big }).getRight();
stop = position.nextWordStart(vimState.document, { wordType: WordType.Big }).getLeft(); stop = position.nextWordStart(vimState.document, { wordType: WordType.Big }).getLeft();
} else { } else {
start = position.prevWordStart(vimState.document, { wordType: WordType.Big, inclusive: true }); start = position.prevWordStart(vimState.document, {
wordType: WordType.Big,
inclusive: true,
});
stop = position.nextWordEnd(vimState.document, { stop = position.nextWordEnd(vimState.document, {
wordType: WordType.Big, wordType: WordType.Big,
inclusive: true, inclusive: true,