Merge from master

This commit is contained in:
Raj Musuku
2019-02-21 17:56:04 -08:00
parent 5a146e34fa
commit 666ae11639
11482 changed files with 119352 additions and 255574 deletions

View File

@@ -5,7 +5,7 @@
import { Code } from '../../vscode/code';
const SEARCH_INPUT = '.settings-search-input input';
const SEARCH_INPUT = '.keybindings-header .settings-search-input input';
export class KeybindingsEditor {

View File

@@ -10,7 +10,7 @@ import { Editors } from '../editor/editors';
import { Code } from '../../vscode/code';
import { QuickOpen } from '../quickopen/quickopen';
export enum ActivityBarPosition {
export const enum ActivityBarPosition {
LEFT = 0,
RIGHT = 1
}
@@ -42,6 +42,6 @@ export class SettingsEditor {
}
private async openSettings(): Promise<void> {
await this.quickopen.runCommand('Preferences: Open User Settings');
await this.quickopen.runCommand('Preferences: Open Settings (JSON)');
}
}