@codingame/monaco-vscode-quickaccess-service-override 11.1.1 → 12.0.0

package/index.d.ts

@@ -1 +1,8 @@
-export { default } from 'vscode/service-override/quickaccess';
+import { type IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
+import type { ICodeEditor } from "vscode/vscode/vs/editor/browser/editorBrowser";
+interface QuickAccessProps {
+    isKeybindingConfigurationVisible?: () => boolean;
+    shouldUseGlobalPicker?: (activeCodeEditor: ICodeEditor | null, activeCodeEditorStandalone: boolean) => boolean;
+}
+export default function getServiceOverride({ isKeybindingConfigurationVisible: _isKeybindingConfigurationVisible, shouldUseGlobalPicker: _shouldUseGlobalPicker }?: QuickAccessProps): IEditorOverrideServices;
+export {};

package/index.js

@@ -1 +1,117 @@
-export { default } from './quickaccess.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
+import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
+import { StandaloneQuickInputService } from 'vscode/vscode/vs/editor/standalone/browser/quickInput/standaloneQuickInputService';
+import { StandaloneServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import 'vscode/vscode/vs/platform/quickinput/browser/quickInputController';
+import { QuickInputService } from './vscode/src/vs/workbench/services/quickinput/browser/quickInputService.js';
+import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
+import { StandaloneCodeEditor } from 'vscode/vscode/vs/editor/standalone/browser/standaloneCodeEditor';
+import { CommandsQuickAccessProvider } from './vscode/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.js';
+import './vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.js';
+import '@codingame/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-common/vscode/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess';
+import './vscode/src/vs/workbench/browser/actions/quickAccessActions.js';
+import './vscode/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.js';
+import './vscode/src/vs/workbench/contrib/url/browser/url.contribution.js';
+import '@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common/vscode/vs/workbench/browser/workbench.contribution';
+
+let isKeybindingConfigurationVisible = () => {
+    return false;
+};
+let shouldUseGlobalPicker = () => {
+    return false;
+};
+const original = CommandsQuickAccessProvider.prototype['getCommandPicks'];
+CommandsQuickAccessProvider.prototype['getCommandPicks'] = async function (token) {
+    let result = await original.call(this, token);
+    if (!isKeybindingConfigurationVisible()) {
+        result = result.map((picks) => ({
+            ...picks,
+            buttons: undefined
+        }));
+    }
+    return result;
+};
+let DelegateQuickInputService = class DelegateQuickInputService {
+    constructor(instantiationService) {
+        this.instantiationService = instantiationService;
+        this.workbenchQuickInputService = instantiationService.createInstance(QuickInputService);
+    }
+    get activeService() {
+        const activeCodeEditor = StandaloneServices.get(ICodeEditorService).getFocusedCodeEditor();
+        if (activeCodeEditor == null ||
+            shouldUseGlobalPicker(activeCodeEditor, activeCodeEditor instanceof StandaloneCodeEditor)) {
+            return this.workbenchQuickInputService;
+        }
+        this.standaloneQuickInputService ?? (this.standaloneQuickInputService = this.instantiationService.createInstance(StandaloneQuickInputService));
+        return this.standaloneQuickInputService;
+    }
+    get currentQuickInput() {
+        return this.activeService.currentQuickInput;
+    }
+    get quickAccess() {
+        return this.activeService.quickAccess;
+    }
+    get backButton() {
+        return this.activeService.backButton;
+    }
+    get onShow() {
+        return this.activeService.onShow;
+    }
+    get onHide() {
+        return this.activeService.onHide;
+    }
+    createQuickWidget() {
+        return this.activeService.createQuickWidget();
+    }
+    pick(picks, options = {}, token = CancellationToken.None) {
+        return this.activeService
+            .pick(picks, options, token);
+    }
+    input(options, token) {
+        return this.activeService.input(options, token);
+    }
+    createQuickPick(options = { useSeparators: false }) {
+        return this.activeService.createQuickPick(options);
+    }
+    createInputBox() {
+        return this.activeService.createInputBox();
+    }
+    focus() {
+        return this.activeService.focus();
+    }
+    toggle() {
+        return this.activeService.toggle();
+    }
+    navigate(next, quickNavigate) {
+        return this.activeService.navigate(next, quickNavigate);
+    }
+    accept() {
+        return this.activeService.accept();
+    }
+    back() {
+        return this.activeService.back();
+    }
+    cancel() {
+        return this.activeService.cancel();
+    }
+};
+DelegateQuickInputService = __decorate([
+    __param(0, IInstantiationService)
+], DelegateQuickInputService);
+function getServiceOverride({ isKeybindingConfigurationVisible: _isKeybindingConfigurationVisible, shouldUseGlobalPicker: _shouldUseGlobalPicker } = {}) {
+    if (_isKeybindingConfigurationVisible != null) {
+        isKeybindingConfigurationVisible = _isKeybindingConfigurationVisible;
+    }
+    if (_shouldUseGlobalPicker != null) {
+        shouldUseGlobalPicker = _shouldUseGlobalPicker;
+    }
+    return {
+        [IQuickInputService.toString()]: new SyncDescriptor(DelegateQuickInputService, [], true)
+    };
+}
+
+export { getServiceOverride as default };

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@codingame/monaco-vscode-quickaccess-service-override",
-  "version": "11.1.1",
+  "version": "12.0.0",
+  "private": false,
+  "description": "VSCode public API plugged on the monaco editor - quickaccess service-override",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -12,8 +14,19 @@
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
-  "private": false,
-  "description": "VSCode public API plugged on the monaco editor - quickaccess service-override",
+  "dependencies": {
+    "@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common": "12.0.0",
+    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "12.0.0",
+    "@codingame/monaco-vscode-4ead9d5f-54da-5c5a-b093-32be4a84d711-common": "12.0.0",
+    "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common": "12.0.0",
+    "@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common": "12.0.0",
+    "@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common": "12.0.0",
+    "@codingame/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-common": "12.0.0",
+    "@codingame/monaco-vscode-fc985c90-0334-5b62-88bc-73e2efa0b80b-common": "12.0.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@12.0.0"
+  },
+  "peerDependencies": {},
+  "peerDependenciesMeta": {},
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
@@ -22,10 +35,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js"
+      "default": "./vscode/src/*.js",
+      "types": "./vscode/src/*.d.ts"
+    },
+    "./*": {
+      "default": "./*.js",
+      "types": "./*.d.ts"
     }
-  },
-  "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@11.1.1"
   }
 }

package/vscode/src/vs/editor/contrib/quickAccess/browser/commandsQuickAccess.d.ts

@@ -0,0 +1,12 @@
+import { IEditor } from "vscode/vscode/vs/editor/common/editorCommon";
+import { ICommandService } from "vscode/vscode/vs/platform/commands/common/commands.service";
+import { IDialogService } from "vscode/vscode/vs/platform/dialogs/common/dialogs.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IKeybindingService } from "vscode/vscode/vs/platform/keybinding/common/keybinding.service";
+import { AbstractCommandsQuickAccessProvider, ICommandQuickPick, ICommandsQuickAccessOptions } from "../../../../platform/quickinput/browser/commandsQuickAccess.js";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+export declare abstract class AbstractEditorCommandsQuickAccessProvider extends AbstractCommandsQuickAccessProvider {
+    constructor(options: ICommandsQuickAccessOptions, instantiationService: IInstantiationService, keybindingService: IKeybindingService, commandService: ICommandService, telemetryService: ITelemetryService, dialogService: IDialogService);
+    protected abstract activeTextEditorControl: IEditor | undefined;
+    protected getCodeEditorCommandPicks(): ICommandQuickPick[];
+}

package/vscode/src/vs/editor/contrib/quickAccess/browser/commandsQuickAccess.js

@@ -1,3 +1,4 @@
+
 import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
 import { isLocalizedString } from 'vscode/vscode/vs/platform/action/common/action';
 import { AbstractCommandsQuickAccessProvider } from '../../../../platform/quickinput/browser/commandsQuickAccess.js';

package/vscode/src/vs/platform/quickinput/browser/commandsQuickAccess.d.ts

@@ -0,0 +1,67 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { Disposable, DisposableStore, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { ILocalizedString } from "vscode/vscode/vs/platform/action/common/action";
+import { ICommandService } from "vscode/vscode/vs/platform/commands/common/commands.service";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IDialogService } from "vscode/vscode/vs/platform/dialogs/common/dialogs.service";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IKeybindingService } from "vscode/vscode/vs/platform/keybinding/common/keybinding.service";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { FastAndSlowPicks, IPickerQuickAccessItem, IPickerQuickAccessProviderOptions, PickerQuickAccessProvider, Picks } from "@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
+import { IQuickAccessProviderRunOptions } from "vscode/vscode/vs/platform/quickinput/common/quickAccess";
+import { IQuickPickSeparator } from "vscode/vscode/vs/platform/quickinput/common/quickInput";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { ITelemetryService } from "vscode/vscode/vs/platform/telemetry/common/telemetry.service";
+export interface ICommandQuickPick extends IPickerQuickAccessItem {
+    readonly commandId: string;
+    readonly commandWhen?: string;
+    readonly commandAlias?: string;
+    readonly commandDescription?: ILocalizedString;
+    tfIdfScore?: number;
+    readonly args?: any[];
+}
+export interface ICommandsQuickAccessOptions extends IPickerQuickAccessProviderOptions<ICommandQuickPick> {
+    readonly showAlias: boolean;
+    suggestedCommandIds?: Set<string>;
+}
+export declare abstract class AbstractCommandsQuickAccessProvider extends PickerQuickAccessProvider<ICommandQuickPick> implements IDisposable {
+    private readonly instantiationService;
+    protected readonly keybindingService: IKeybindingService;
+    private readonly commandService;
+    private readonly telemetryService;
+    private readonly dialogService;
+    static PREFIX: string;
+    private static readonly TFIDF_THRESHOLD;
+    private static readonly TFIDF_MAX_RESULTS;
+    private static WORD_FILTER;
+    private readonly commandsHistory;
+    protected readonly options: ICommandsQuickAccessOptions;
+    constructor(options: ICommandsQuickAccessOptions, instantiationService: IInstantiationService, keybindingService: IKeybindingService, commandService: ICommandService, telemetryService: ITelemetryService, dialogService: IDialogService);
+    protected _getPicks(filter: string, _disposables: DisposableStore, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): Promise<Picks<ICommandQuickPick> | FastAndSlowPicks<ICommandQuickPick>>;
+    private toCommandPick;
+    private getTfIdfChunk;
+    protected abstract getCommandPicks(token: CancellationToken): Promise<Array<ICommandQuickPick>>;
+    protected abstract hasAdditionalCommandPicks(filter: string, token: CancellationToken): boolean;
+    protected abstract getAdditionalCommandPicks(allPicks: ICommandQuickPick[], picksSoFar: ICommandQuickPick[], filter: string, token: CancellationToken): Promise<Array<ICommandQuickPick | IQuickPickSeparator>>;
+}
+export declare class CommandsHistory extends Disposable {
+    private readonly storageService;
+    private readonly configurationService;
+    private readonly logService;
+    static readonly DEFAULT_COMMANDS_HISTORY_LENGTH = 50;
+    private static readonly PREF_KEY_CACHE;
+    private static readonly PREF_KEY_COUNTER;
+    private static cache;
+    private static counter;
+    private static hasChanges;
+    private configuredCommandsHistoryLength;
+    constructor(storageService: IStorageService, configurationService: IConfigurationService, logService: ILogService);
+    private registerListeners;
+    private updateConfiguration;
+    private load;
+    push(commandId: string): void;
+    peek(commandId: string): number | undefined;
+    private saveState;
+    static getConfiguredCommandHistoryLength(configurationService: IConfigurationService): number;
+    static clearHistory(configurationService: IConfigurationService, storageService: IStorageService): void;
+}

package/vscode/src/vs/platform/quickinput/browser/commandsQuickAccess.js

@@ -1,11 +1,12 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { toErrorMessage } from 'vscode/vscode/vs/base/common/errorMessage';
 import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { or, matchesPrefix, matchesWords, matchesContiguousSubString } from 'vscode/vscode/vs/base/common/filters';
 import { createSingleCallFunction } from 'vscode/vscode/vs/base/common/functional';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { LRUCache } from 'vscode/vscode/vs/base/common/map';
-import { TfIdfCalculator, normalizeTfIdfScores } from 'vscode/vscode/vs/base/common/tfIdf';
+import { TfIdfCalculator, normalizeTfIdfScores } from '@codingame/monaco-vscode-fc985c90-0334-5b62-88bc-73e2efa0b80b-common/vscode/vs/base/common/tfIdf';
 import { localize } from 'vscode/vscode/vs/nls';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -13,8 +14,8 @@ import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
-import { PickerQuickAccessProvider } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
-import { WillSaveStateReason } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { PickerQuickAccessProvider } from '@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
+import { WillSaveStateReason, StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 
@@ -41,11 +42,11 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
             return [];
         }
         const runTfidf = createSingleCallFunction(() => {
-            const tfidf = ( (new TfIdfCalculator()));
-            tfidf.updateDocuments(( (allCommandPicks.map(commandPick => ({
+            const tfidf = ( new TfIdfCalculator());
+            tfidf.updateDocuments(( allCommandPicks.map(commandPick => ({
                 key: commandPick.commandId,
                 textChunks: [this.getTfIdfChunk(commandPick)]
-            })))));
+            }))));
             const result = tfidf.calculateScores(filter, token);
             return normalizeTfIdfScores(result)
                 .filter(score => score.score > AbstractCommandsQuickAccessProvider_1.TFIDF_THRESHOLD)
@@ -77,7 +78,7 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 }
             }
         }
-        const mapLabelToCommand = ( (new Map()));
+        const mapLabelToCommand = ( new Map());
         for (const commandPick of filteredCommandPicks) {
             const existingCommandForLabel = mapLabelToCommand.get(commandPick.label);
             if (existingCommandForLabel) {
@@ -113,8 +114,8 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 return 1;
             }
             if (this.options.suggestedCommandIds) {
-                const commandASuggestion = ( (this.options.suggestedCommandIds.has(commandPickA.commandId)));
-                const commandBSuggestion = ( (this.options.suggestedCommandIds.has(commandPickB.commandId)));
+                const commandASuggestion = ( this.options.suggestedCommandIds.has(commandPickA.commandId));
+                const commandBSuggestion = ( this.options.suggestedCommandIds.has(commandPickB.commandId));
                 if (commandASuggestion && commandBSuggestion) {
                     return 0;
                 }
@@ -134,20 +135,20 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
         for (let i = 0; i < filteredCommandPicks.length; i++) {
             const commandPick = filteredCommandPicks[i];
             if (i === 0 && this.commandsHistory.peek(commandPick.commandId)) {
-                commandPicks.push({ type: 'separator', label: ( localize(4694, "recently used")) });
+                commandPicks.push({ type: 'separator', label: ( localize(1827, "recently used")) });
                 addOtherSeparator = true;
             }
             if (addSuggestedSeparator && commandPick.tfIdfScore !== undefined) {
-                commandPicks.push({ type: 'separator', label: ( localize(4695, "similar commands")) });
+                commandPicks.push({ type: 'separator', label: ( localize(1828, "similar commands")) });
                 addSuggestedSeparator = false;
             }
             if (addCommonlyUsedSeparator && commandPick.tfIdfScore === undefined && !this.commandsHistory.peek(commandPick.commandId) && this.options.suggestedCommandIds?.has(commandPick.commandId)) {
-                commandPicks.push({ type: 'separator', label: ( localize(4696, "commonly used")) });
+                commandPicks.push({ type: 'separator', label: ( localize(1829, "commonly used")) });
                 addOtherSeparator = true;
                 addCommonlyUsedSeparator = false;
             }
             if (addOtherSeparator && commandPick.tfIdfScore === undefined && !this.commandsHistory.peek(commandPick.commandId) && !this.options.suggestedCommandIds?.has(commandPick.commandId)) {
-                commandPicks.push({ type: 'separator', label: ( localize(4697, "other commands")) });
+                commandPicks.push({ type: 'separator', label: ( localize(1830, "other commands")) });
                 addOtherSeparator = false;
             }
             commandPicks.push(this.toCommandPick(commandPick, runOptions));
@@ -162,9 +163,9 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 if (token.isCancellationRequested) {
                     return [];
                 }
-                const commandPicks = ( (additionalCommandPicks.map(commandPick => this.toCommandPick(commandPick, runOptions))));
+                const commandPicks = ( additionalCommandPicks.map(commandPick => this.toCommandPick(commandPick, runOptions)));
                 if (addSuggestedSeparator && commandPicks[0]?.type !== 'separator') {
-                    commandPicks.unshift({ type: 'separator', label: ( localize(4695, "similar commands")) });
+                    commandPicks.unshift({ type: 'separator', label: ( localize(1828, "similar commands")) });
                 }
                 return commandPicks;
             })()
@@ -176,7 +177,7 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
         }
         const keybinding = this.keybindingService.lookupKeybinding(commandPick.commandId);
         const ariaLabel = keybinding ?
-            ( localize(4698, "{0}, {1}", commandPick.label, keybinding.getAriaLabel())) :
+            ( localize(1831, "{0}, {1}", commandPick.label, keybinding.getAriaLabel())) :
             commandPick.label;
         return {
             ...commandPick,
@@ -196,7 +197,7 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 }
                 catch (error) {
                     if (!isCancellationError(error)) {
-                        this.dialogService.error(( localize(4699, "Command '{0}' resulted in an error", commandPick.label)), toErrorMessage(error));
+                        this.dialogService.error(( localize(1832, "Command '{0}' resulted in an error", commandPick.label)), toErrorMessage(error));
                     }
                 }
             }
@@ -213,13 +214,13 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
         return chunk;
     }
 };
-AbstractCommandsQuickAccessProvider = AbstractCommandsQuickAccessProvider_1 = ( (__decorate([
-    ( (__param(1, IInstantiationService))),
-    ( (__param(2, IKeybindingService))),
-    ( (__param(3, ICommandService))),
-    ( (__param(4, ITelemetryService))),
-    ( (__param(5, IDialogService)))
-], AbstractCommandsQuickAccessProvider)));
+AbstractCommandsQuickAccessProvider = AbstractCommandsQuickAccessProvider_1 = ( __decorate([
+    ( __param(1, IInstantiationService)),
+    ( __param(2, IKeybindingService)),
+    ( __param(3, ICommandService)),
+    ( __param(4, ITelemetryService)),
+    ( __param(5, IDialogService))
+], AbstractCommandsQuickAccessProvider));
 let CommandsHistory = class CommandsHistory extends Disposable {
     static { CommandsHistory_1 = this; }
     static { this.DEFAULT_COMMANDS_HISTORY_LENGTH = 50; }
@@ -256,7 +257,7 @@ let CommandsHistory = class CommandsHistory extends Disposable {
         }
     }
     load() {
-        const raw = this.storageService.get(CommandsHistory_1.PREF_KEY_CACHE, 0 );
+        const raw = this.storageService.get(CommandsHistory_1.PREF_KEY_CACHE, StorageScope.PROFILE);
         let serializedCache;
         if (raw) {
             try {
@@ -266,7 +267,7 @@ let CommandsHistory = class CommandsHistory extends Disposable {
                 this.logService.error(`[CommandsHistory] invalid data: ${error}`);
             }
         }
-        const cache = CommandsHistory_1.cache = ( (new LRUCache(this.configuredCommandsHistoryLength, 1)));
+        const cache = CommandsHistory_1.cache = ( new LRUCache(this.configuredCommandsHistoryLength, 1));
         if (serializedCache) {
             let entries;
             if (serializedCache.usesLRU) {
@@ -277,7 +278,7 @@ let CommandsHistory = class CommandsHistory extends Disposable {
             }
             entries.forEach(entry => cache.set(entry.key, entry.value));
         }
-        CommandsHistory_1.counter = this.storageService.getNumber(CommandsHistory_1.PREF_KEY_COUNTER, 0 , CommandsHistory_1.counter);
+        CommandsHistory_1.counter = this.storageService.getNumber(CommandsHistory_1.PREF_KEY_COUNTER, StorageScope.PROFILE, CommandsHistory_1.counter);
     }
     push(commandId) {
         if (!CommandsHistory_1.cache) {
@@ -298,8 +299,8 @@ let CommandsHistory = class CommandsHistory extends Disposable {
         }
         const serializedCache = { usesLRU: true, entries: [] };
         CommandsHistory_1.cache.forEach((value, key) => serializedCache.entries.push({ key, value }));
-        this.storageService.store(CommandsHistory_1.PREF_KEY_CACHE, JSON.stringify(serializedCache), 0 , 0 );
-        this.storageService.store(CommandsHistory_1.PREF_KEY_COUNTER, CommandsHistory_1.counter, 0 , 0 );
+        this.storageService.store(CommandsHistory_1.PREF_KEY_CACHE, JSON.stringify(serializedCache), StorageScope.PROFILE, StorageTarget.USER);
+        this.storageService.store(CommandsHistory_1.PREF_KEY_COUNTER, CommandsHistory_1.counter, StorageScope.PROFILE, StorageTarget.USER);
         CommandsHistory_1.hasChanges = false;
     }
     static getConfiguredCommandHistoryLength(configurationService) {
@@ -312,15 +313,15 @@ let CommandsHistory = class CommandsHistory extends Disposable {
     }
     static clearHistory(configurationService, storageService) {
         const commandHistoryLength = CommandsHistory_1.getConfiguredCommandHistoryLength(configurationService);
-        CommandsHistory_1.cache = ( (new LRUCache(commandHistoryLength)));
+        CommandsHistory_1.cache = ( new LRUCache(commandHistoryLength));
         CommandsHistory_1.counter = 1;
         CommandsHistory_1.hasChanges = true;
     }
 };
-CommandsHistory = CommandsHistory_1 = ( (__decorate([
-    ( (__param(0, IStorageService))),
-    ( (__param(1, IConfigurationService))),
-    ( (__param(2, ILogService)))
-], CommandsHistory)));
+CommandsHistory = CommandsHistory_1 = ( __decorate([
+    ( __param(0, IStorageService)),
+    ( __param(1, IConfigurationService)),
+    ( __param(2, ILogService))
+], CommandsHistory));
 
 export { AbstractCommandsQuickAccessProvider, CommandsHistory };

package/vscode/src/vs/platform/quickinput/browser/helpQuickAccess.d.ts

@@ -0,0 +1,21 @@
+import { IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IKeybindingService } from "vscode/vscode/vs/platform/keybinding/common/keybinding.service";
+import { IQuickAccessProvider } from "vscode/vscode/vs/platform/quickinput/common/quickAccess";
+import { IQuickPick, IQuickPickItem } from "vscode/vscode/vs/platform/quickinput/common/quickInput";
+import { IQuickInputService } from "vscode/vscode/vs/platform/quickinput/common/quickInput.service";
+interface IHelpQuickAccessPickItem extends IQuickPickItem {
+    readonly prefix: string;
+}
+export declare class HelpQuickAccessProvider implements IQuickAccessProvider {
+    private readonly quickInputService;
+    private readonly keybindingService;
+    static PREFIX: string;
+    private readonly registry;
+    constructor(quickInputService: IQuickInputService, keybindingService: IKeybindingService);
+    provide(picker: IQuickPick<IHelpQuickAccessPickItem, {
+        useSeparators: true;
+    }>): IDisposable;
+    getQuickAccessProviders(): IHelpQuickAccessPickItem[];
+    private createPicks;
+}
+export {};

package/vscode/src/vs/platform/quickinput/browser/helpQuickAccess.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { localize } from 'vscode/vscode/vs/nls';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -13,10 +14,10 @@ let HelpQuickAccessProvider = class HelpQuickAccessProvider {
     constructor(quickInputService, keybindingService) {
         this.quickInputService = quickInputService;
         this.keybindingService = keybindingService;
-        this.registry = ( (Registry.as(Extensions.Quickaccess)));
+        this.registry = ( Registry.as(Extensions.Quickaccess));
     }
     provide(picker) {
-        const disposables = ( (new DisposableStore()));
+        const disposables = ( new DisposableStore());
         disposables.add(picker.onDidAccept(() => {
             const [item] = picker.selectedItems;
             if (item) {
@@ -40,24 +41,22 @@ let HelpQuickAccessProvider = class HelpQuickAccessProvider {
         return providers;
     }
     createPicks(provider) {
-        return (
-             (provider.helpEntries.map(helpEntry => {
-                const prefix = helpEntry.prefix || provider.prefix;
-                const label = prefix || '\u2026' ;
-                return {
-                    prefix,
-                    label,
-                    keybinding: helpEntry.commandId ? this.keybindingService.lookupKeybinding(helpEntry.commandId) : undefined,
-                    ariaLabel: ( localize(4875, "{0}, {1}", label, helpEntry.description)),
-                    description: helpEntry.description
-                };
-            }))
-        );
+        return (provider.helpEntries.map(helpEntry => {
+            const prefix = helpEntry.prefix || provider.prefix;
+            const label = prefix || '\u2026' ;
+            return {
+                prefix,
+                label,
+                keybinding: helpEntry.commandId ? this.keybindingService.lookupKeybinding(helpEntry.commandId) : undefined,
+                ariaLabel: ( localize(1833, "{0}, {1}", label, helpEntry.description)),
+                description: helpEntry.description
+            };
+        }));
     }
 };
-HelpQuickAccessProvider = HelpQuickAccessProvider_1 = ( (__decorate([
-    ( (__param(0, IQuickInputService))),
-    ( (__param(1, IKeybindingService)))
-], HelpQuickAccessProvider)));
+HelpQuickAccessProvider = HelpQuickAccessProvider_1 = ( __decorate([
+    ( __param(0, IQuickInputService)),
+    ( __param(1, IKeybindingService))
+], HelpQuickAccessProvider));
 
 export { HelpQuickAccessProvider };

package/vscode/src/vs/workbench/browser/actions/quickAccessActions.d.ts

@@ -0,0 +1 @@
+export {};