Skip to content

fix #28: jumpy swallows type events when disabled #31

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
michaelgriscom wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix #28: jumpy swallows type events when disabled #31

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
86 changes: 45 additions & 41 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,58 @@ export function activate(context: vscode.ExtensionContext) {

let positions: JumpyPosition[] = null;
let firstLineNumber = 0;
let isJumpyMode: boolean = false;
setJumpyMode(false);
let firstKeyOfCode: string = null;
let jumpyTypeDisposable = null;

function setJumpyMode(value: boolean) {
isJumpyMode = value;
vscode.commands.executeCommand('setContext', 'jumpy.isJumpyMode', value);
}

function deregisterTypeCommand() {
jumpyTypeDisposable && jumpyTypeDisposable.dispose();
jumpyTypeDisposable = null;
}

function registerTypeCommand() {
return vscode.commands.registerCommand('type', args => {
const editor = vscode.window.activeTextEditor;
const text: string = args.text;

if (text.search(/[a-z]/i) === -1) {
exitJumpyMode();
return;
}

if (!firstKeyOfCode) {
firstKeyOfCode = text;
return;
}

const code = firstKeyOfCode + text;
const position = positions[getCodeIndex(code.toLowerCase())];

editor.setDecorations(decorationTypeOffset2, []);
editor.setDecorations(decorationTypeOffset1, []);

vscode.window.activeTextEditor.selection = new vscode.Selection(
position.line,
position.character,
position.line,
position.character,
);

const reviewType: vscode.TextEditorRevealType = vscode.TextEditorRevealType.Default;
vscode.window.activeTextEditor.revealRange(vscode.window.activeTextEditor.selection, reviewType);

deregisterTypeCommand();
});
}

function runJumpy(jumpyFn: JumpyFn, regexp: RegExp) {
jumpyTypeDisposable = registerTypeCommand();
context.subscriptions.push(jumpyTypeDisposable);

const editor = vscode.window.activeTextEditor;

const getLinesResult = getLines(editor);
Expand Down Expand Up @@ -109,6 +151,7 @@ export function activate(context: vscode.ExtensionContext) {
setJumpyMode(false);
editor.setDecorations(decorationTypeOffset2, []);
editor.setDecorations(decorationTypeOffset1, []);
deregisterTypeCommand();
}

const jumpyWordDisposable = vscode.commands.registerCommand('extension.jumpy-word', () => {
Expand All @@ -127,45 +170,6 @@ export function activate(context: vscode.ExtensionContext) {
});
context.subscriptions.push(jumpyLineDisposable);

const jumpyTypeDisposable = vscode.commands.registerCommand('type', args => {
if (!isJumpyMode) {
vscode.commands.executeCommand('default:type', args);
return;
}

const editor = vscode.window.activeTextEditor;
const text: string = args.text;

if (text.search(/[a-z]/i) === -1) {
exitJumpyMode();
return;
}

if (!firstKeyOfCode) {
firstKeyOfCode = text;
return;
}

const code = firstKeyOfCode + text;
const position = positions[getCodeIndex(code.toLowerCase())];

editor.setDecorations(decorationTypeOffset2, []);
editor.setDecorations(decorationTypeOffset1, []);

vscode.window.activeTextEditor.selection = new vscode.Selection(
position.line,
position.character,
position.line,
position.character,
);

const reviewType: vscode.TextEditorRevealType = vscode.TextEditorRevealType.Default;
vscode.window.activeTextEditor.revealRange(vscode.window.activeTextEditor.selection, reviewType);

setJumpyMode(false);
});
context.subscriptions.push(jumpyTypeDisposable);

const exitJumpyModeDisposable = vscode.commands.registerCommand('extension.jumpy-exit', () => {
exitJumpyMode();
});
Expand Down