Skip to content

feat: use vscode native nav back to avoid surpurise and inconsistency #9286

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −2
Open

feat: use vscode native nav back to avoid surpurise and inconsistency #9286

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 20 additions & 2 deletions src/actions/commands/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1286,9 +1286,9 @@ export class CommandInsertNewLineBefore extends BaseCommand {
}

@RegisterAction
class CommandNavigateBack extends BaseCommand {
class CommandJumpBack extends BaseCommand {
modes = [Mode.Normal];
keys = [['<C-o>'], ['<C-t>']];
keys = [['<C-t>']];

override runsOnceForEveryCursor() {
return false;
Expand All @@ -1299,6 +1299,24 @@ class CommandNavigateBack extends BaseCommand {
}
}

@RegisterAction
class CommandNavigateBack extends BaseCommand {
modes = [Mode.Normal];
keys = [['<C-o>']];

override isJump = true;

public override async exec(position: Position, vimState: VimState): Promise<void> {
await vscode.commands.executeCommand('workbench.action.navigateBack');

if (vimState.editor === vscode.window.activeTextEditor) {
// We didn't switch to a different editor
vimState.cursorStartPosition = vimState.editor.selection.start;
vimState.cursorStopPosition = vimState.editor.selection.end;
}
}
}

@RegisterAction
class CommandNavigateForward extends BaseCommand {
modes = [Mode.Normal];
Expand Down