Merge from vscode 2b0b9136329c181a9e381463a1f7dc3a2d105a34 (#4880)

This commit is contained in:
Karl Burtram
2019-04-05 10:09:18 -07:00
committed by GitHub
parent 9bd7e30d18
commit cb5bcf2248
433 changed files with 8915 additions and 8361 deletions

View File

@@ -19,7 +19,7 @@ import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiati
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
import { registerEditorAction, EditorAction, IEditorCommandMenuOptions } from 'vs/editor/browser/editorExtensions';
import { registerEditorAction, EditorAction } from 'vs/editor/browser/editorExtensions';
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
import { LRUCache } from 'vs/base/common/map';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -145,7 +145,7 @@ export class ShowAllCommandsAction extends Action {
super(id, label);
}
run(context?: any): Promise<void> {
run(): Promise<void> {
const config = <IWorkbenchQuickOpenConfiguration>this.configurationService.getValue();
const restoreInput = config.workbench && config.workbench.commandPalette && config.workbench.commandPalette.preserveInput === true;
@@ -174,7 +174,7 @@ export class ClearCommandHistoryAction extends Action {
super(id, label);
}
run(context?: any): Promise<void> {
run(): Promise<void> {
const commandHistoryLength = resolveCommandHistory(this.configurationService);
if (commandHistoryLength > 0) {
commandHistory = new LRUCache<string, number>(commandHistoryLength);
@@ -196,7 +196,7 @@ class CommandPaletteEditorAction extends EditorAction {
menuOpts: {
group: 'z_commands',
order: 1
} as IEditorCommandMenuOptions
}
});
}