Skip to content
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.

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

fix: bad jason. fix bad release. #2324

Merged
merged 1 commit into from
Jan 23, 2018
Merged
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions src/configuration/configuration.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import * as vscode from 'vscode';
import { ConfigurationTarget, WorkspaceConfiguration } from 'vscode';

import { Globals } from '../globals';
import { taskQueue } from '../taskQueue';
Expand Down Expand Up @@ -152,11 +151,11 @@ class ConfigurationClass {
vscode.commands.executeCommand('setContext', `vim.use${boundKey.key}`, useKey);
}

vscode.commands.executeCommand('setContext', 'vim.overrideCopy', Configuration.overrideCopy);
vscode.commands.executeCommand('setContext', 'vim.overrideCopy', this.overrideCopy);
vscode.commands.executeCommand(
'setContext',
'vim.overrideCtrlC',
Configuration.overrideCopy || Configuration.useCtrlKeys
this.overrideCopy || this.useCtrlKeys
);
}

Expand Down Expand Up @@ -384,7 +383,11 @@ class ConfigurationClass {
}
set disableExt(isDisabled: boolean) {
this.disableExtension = isDisabled;
this.getConfiguration('vim').update('disableExtension', isDisabled, ConfigurationTarget.Global);
this.getConfiguration('vim').update(
'disableExtension',
isDisabled,
vscode.ConfigurationTarget.Global
);
}

/**
Expand Down