@codingame/monaco-vscode-quickaccess-service-override 23.3.0 → 24.1.0

package/index.js

@@ -12,11 +12,11 @@ import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/edito
 import { StandaloneCodeEditor } from '@codingame/monaco-vscode-api/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-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess';
+import '@codingame/monaco-vscode-api/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';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/workbench.contribution';
 
 let isKeybindingConfigurationVisible = () => {
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-quickaccess-service-override",
-  "version": "23.3.0",
+  "version": "24.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - quickaccess service-override",
   "keywords": [],
@@ -15,14 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "23.3.0",
-    "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common": "23.3.0",
-    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "23.3.0",
-    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "23.3.0",
-    "@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common": "23.3.0",
-    "@codingame/monaco-vscode-api": "23.3.0",
-    "@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common": "23.3.0",
-    "@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common": "23.3.0"
+    "@codingame/monaco-vscode-api": "24.1.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -7,7 +7,7 @@ import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-import { FastAndSlowPicks, IPickerQuickAccessItem, IPickerQuickAccessProviderOptions, PickerQuickAccessProvider, Picks } from "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
+import { FastAndSlowPicks, IPickerQuickAccessItem, IPickerQuickAccessProviderOptions, PickerQuickAccessProvider, Picks } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
 import { IQuickAccessProviderRunOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickAccess";
 import { IQuickPickSeparator } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
@@ -20,8 +20,6 @@ export interface ICommandQuickPick extends IPickerQuickAccessItem {
     readonly commandCategory?: string;
     readonly args?: unknown[];
     tfIdfScore?: number;
-    labelNoAccents?: string;
-    aliasNoAccents?: string;
 }
 export interface ICommandsQuickAccessOptions extends IPickerQuickAccessProviderOptions<ICommandQuickPick> {
     readonly showAlias: boolean;
@@ -42,11 +40,6 @@ export declare abstract class AbstractCommandsQuickAccessProvider extends Picker
     protected _getPicks(filter: string, _disposables: DisposableStore, token: CancellationToken, runOptions?: IQuickAccessProviderRunOptions): Promise<Picks<ICommandQuickPick> | FastAndSlowPicks<ICommandQuickPick>>;
     private toCommandPick;
     private getTfIdfChunk;
-    /**
-     * Normalizes a string for filtering by removing accents, but only if
-     * the result has the same length, otherwise returns the original string.
-     */
-    private normalizeForFiltering;
     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>>;
@@ -68,6 +61,7 @@ export declare class CommandsHistory extends Disposable {
     private load;
     push(commandId: string): void;
     peek(commandId: string): number | undefined;
+    remove(commandId: string): void;
     private saveState;
     static getConfiguredCommandHistoryLength(configurationService: IConfigurationService): number;
     static clearHistory(configurationService: IConfigurationService, storageService: IStorageService): void;

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

@@ -1,12 +1,14 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
 import { isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
-import { or, matchesPrefix, matchesWords, matchesContiguousSubString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/filters';
+import { or, matchesBaseContiguousSubString, matchesWords } from '@codingame/monaco-vscode-api/vscode/vs/base/common/filters';
 import { createSingleCallFunction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/functional';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { LRUCache } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
-import { TfIdfCalculator, normalizeTfIdfScores } from '@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common/vscode/vs/base/common/tfIdf';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { TfIdfCalculator, normalizeTfIdfScores } from '@codingame/monaco-vscode-api/vscode/vs/base/common/tfIdf';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -14,11 +16,10 @@ import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { PickerQuickAccessProvider } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
+import { PickerQuickAccessProvider, TriggerAction } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
 import { WillSaveStateReason, StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
-import { removeAccents } from '../../../base/common/normalization.js';
 import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
 
 var AbstractCommandsQuickAccessProvider_1, CommandsHistory_1;
@@ -27,7 +28,7 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
     static { this.PREFIX = '>'; }
     static { this.TFIDF_THRESHOLD = 0.5; }
     static { this.TFIDF_MAX_RESULTS = 5; }
-    static { this.WORD_FILTER = or(matchesPrefix, matchesWords, matchesContiguousSubString); }
+    static { this.WORD_FILTER = or(matchesBaseContiguousSubString, matchesWords); }
     constructor(options, instantiationService, keybindingService, commandService, telemetryService, dialogService) {
         super(AbstractCommandsQuickAccessProvider_1.PREFIX, options);
         this.keybindingService = keybindingService;
@@ -53,15 +54,12 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 .filter(score => score.score > AbstractCommandsQuickAccessProvider_1.TFIDF_THRESHOLD)
                 .slice(0, AbstractCommandsQuickAccessProvider_1.TFIDF_MAX_RESULTS);
         });
-        const noAccentsFilter = this.normalizeForFiltering(filter);
         const filteredCommandPicks = [];
         for (const commandPick of allCommandPicks) {
-            commandPick.labelNoAccents ??= this.normalizeForFiltering(commandPick.label);
-            const labelHighlights = AbstractCommandsQuickAccessProvider_1.WORD_FILTER(noAccentsFilter, commandPick.labelNoAccents) ?? undefined;
+            const labelHighlights = AbstractCommandsQuickAccessProvider_1.WORD_FILTER(filter, commandPick.label) ?? undefined;
             let aliasHighlights;
             if (commandPick.commandAlias) {
-                commandPick.aliasNoAccents ??= this.normalizeForFiltering(commandPick.commandAlias);
-                aliasHighlights = AbstractCommandsQuickAccessProvider_1.WORD_FILTER(noAccentsFilter, commandPick.aliasNoAccents) ?? undefined;
+                aliasHighlights = AbstractCommandsQuickAccessProvider_1.WORD_FILTER(filter, commandPick.commandAlias) ?? undefined;
             }
             if (labelHighlights || aliasHighlights) {
                 commandPick.highlights = {
@@ -149,24 +147,25 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
         let addCommonlyUsedSeparator = !!this.options.suggestedCommandIds;
         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(1988, "recently used")) });
+            const isInHistory = !!this.commandsHistory.peek(commandPick.commandId);
+            if (i === 0 && isInHistory) {
+                commandPicks.push({ type: 'separator', label: ( localize(2000, "recently used")) });
                 addOtherSeparator = true;
             }
             if (addSuggestedSeparator && commandPick.tfIdfScore !== undefined) {
-                commandPicks.push({ type: 'separator', label: ( localize(1989, "similar commands")) });
+                commandPicks.push({ type: 'separator', label: ( localize(2001, "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(1990, "commonly used")) });
+            if (addCommonlyUsedSeparator && commandPick.tfIdfScore === undefined && !isInHistory && this.options.suggestedCommandIds?.has(commandPick.commandId)) {
+                commandPicks.push({ type: 'separator', label: ( localize(2002, "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(1991, "other commands")) });
+            if (addOtherSeparator && commandPick.tfIdfScore === undefined && !isInHistory && !this.options.suggestedCommandIds?.has(commandPick.commandId)) {
+                commandPicks.push({ type: 'separator', label: ( localize(2003, "other commands")) });
                 addOtherSeparator = false;
             }
-            commandPicks.push(this.toCommandPick(commandPick, runOptions));
+            commandPicks.push(this.toCommandPick(commandPick, runOptions, isInHistory));
         }
         if (!this.hasAdditionalCommandPicks(filter, token)) {
             return commandPicks;
@@ -180,25 +179,34 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 }
                 const commandPicks = ( additionalCommandPicks.map(commandPick => this.toCommandPick(commandPick, runOptions)));
                 if (addSuggestedSeparator && commandPicks[0]?.type !== 'separator') {
-                    commandPicks.unshift({ type: 'separator', label: ( localize(1989, "similar commands")) });
+                    commandPicks.unshift({ type: 'separator', label: ( localize(2001, "similar commands")) });
                 }
                 return commandPicks;
             })()
         };
     }
-    toCommandPick(commandPick, runOptions) {
+    toCommandPick(commandPick, runOptions, isRecentlyUsed = false) {
         if (commandPick.type === 'separator') {
             return commandPick;
         }
         const keybinding = this.keybindingService.lookupKeybinding(commandPick.commandId);
         const ariaLabel = keybinding ?
-            ( localize(1992, "{0}, {1}", commandPick.label, keybinding.getAriaLabel())) :
+            ( localize(2004, "{0}, {1}", commandPick.label, keybinding.getAriaLabel())) :
             commandPick.label;
+        const existingButtons = commandPick.buttons || [];
+        const buttons = isRecentlyUsed ? [
+            ...existingButtons,
+            {
+                iconClass: ThemeIcon.asClassName(Codicon.close),
+                tooltip: ( localize(2005, "Remove from Recently Used"))
+            }
+        ] : commandPick.buttons;
         return {
             ...commandPick,
             ariaLabel,
             detail: this.options.showAlias && commandPick.commandAlias !== commandPick.label ? commandPick.commandAlias : undefined,
             keybinding,
+            buttons,
             accept: async () => {
                 this.commandsHistory.push(commandPick.commandId);
                 this.telemetryService.publicLog2('workbenchActionExecuted', {
@@ -212,10 +220,21 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 }
                 catch (error) {
                     if (!isCancellationError(error)) {
-                        this.dialogService.error(( localize(1993, "Command '{0}' resulted in an error", commandPick.label)), toErrorMessage(error));
+                        this.dialogService.error(( localize(2006, "Command '{0}' resulted in an error", commandPick.label)), toErrorMessage(error));
                     }
                 }
-            }
+            },
+            trigger: isRecentlyUsed ? (buttonIndex, keyMods) => {
+                const removeButtonIndex = existingButtons.length;
+                if (buttonIndex === removeButtonIndex) {
+                    this.commandsHistory.remove(commandPick.commandId);
+                    return TriggerAction.REMOVE_ITEM;
+                }
+                if (commandPick.trigger) {
+                    return commandPick.trigger(buttonIndex, keyMods);
+                }
+                return TriggerAction.NO_ACTION;
+            } : commandPick.trigger
         };
     }
     getTfIdfChunk({ label, commandAlias, commandDescription }) {
@@ -228,19 +247,6 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
         }
         return chunk;
     }
-    normalizeForFiltering(value) {
-        const withoutAccents = removeAccents(value);
-        if (withoutAccents.length !== value.length) {
-            this.telemetryService.publicLog2('QuickAccess:FilterLengthMismatch', {
-                originalLength: value.length,
-                normalizedLength: withoutAccents.length
-            });
-            return value;
-        }
-        else {
-            return withoutAccents;
-        }
-    }
 };
 AbstractCommandsQuickAccessProvider = AbstractCommandsQuickAccessProvider_1 = ( __decorate([
     ( __param(1, IInstantiationService)),
@@ -318,6 +324,13 @@ let CommandsHistory = class CommandsHistory extends Disposable {
     peek(commandId) {
         return CommandsHistory_1.cache?.peek(commandId);
     }
+    remove(commandId) {
+        if (!CommandsHistory_1.cache) {
+            return;
+        }
+        CommandsHistory_1.cache.delete(commandId);
+        CommandsHistory_1.hasChanges = true;
+    }
     saveState() {
         if (!CommandsHistory_1.cache) {
             return;

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

@@ -48,7 +48,7 @@ let HelpQuickAccessProvider = class HelpQuickAccessProvider {
                 prefix,
                 label,
                 keybinding: helpEntry.commandId ? this.keybindingService.lookupKeybinding(helpEntry.commandId) : undefined,
-                ariaLabel: ( localize(1994, "{0}, {1}", label, helpEntry.description)),
+                ariaLabel: ( localize(2007, "{0}, {1}", label, helpEntry.description)),
                 description: helpEntry.description
             };
         }));

package/vscode/src/vs/workbench/browser/actions/quickAccessActions.js

@@ -3,11 +3,11 @@ import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls'
 import { registerAction2, Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { KeybindingsRegistry, KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { ItemActivation } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput';
+import { QuickInputHideReason, ItemActivation } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
-import { inQuickPickContext, defaultQuickAccessContext, getQuickNavigateHandler } from '@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common/vscode/vs/workbench/browser/quickaccess';
+import { inQuickPickContext, defaultQuickAccessContext, getQuickNavigateHandler } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/quickaccess';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 
 const globalQuickAccessKeybinding = {
@@ -22,7 +22,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     primary: KeyCode.Escape, secondary: [KeyMod.Shift | KeyCode.Escape],
     handler: accessor => {
         const quickInputService = accessor.get(IQuickInputService);
-        return quickInputService.cancel();
+        return quickInputService.cancel(QuickInputHideReason.Gesture);
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -105,7 +105,7 @@ registerAction2(class QuickAccessAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.quickOpen',
-            title: ( localize2(2876, "Go to File...")),
+            title: ( localize2(2890, "Go to File...")),
             metadata: {
                 description: `Quick access`,
                 args: [{
@@ -133,7 +133,7 @@ registerAction2(class QuickAccessAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.quickOpenWithModes',
-            title: ( localize(2877, "Quick Open")),
+            title: ( localize(2891, "Quick Open")),
             icon: Codicon.search,
             menu: {
                 id: MenuId.CommandCenterCenter,
@@ -174,17 +174,17 @@ class BaseQuickAccessNavigateAction extends Action2 {
 }
 class QuickAccessNavigateNextAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenNavigateNext', ( localize2(2878, 'Navigate Next in Quick Open')), true, true);
+        super('workbench.action.quickOpenNavigateNext', ( localize2(2892, 'Navigate Next in Quick Open')), true, true);
     }
 }
 class QuickAccessNavigatePreviousAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenNavigatePrevious', ( localize2(2879, 'Navigate Previous in Quick Open')), false, true);
+        super('workbench.action.quickOpenNavigatePrevious', ( localize2(2893, 'Navigate Previous in Quick Open')), false, true);
     }
 }
 class QuickAccessSelectNextAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenSelectNext', ( localize2(2880, 'Select Next in Quick Open')), true, false, {
+        super('workbench.action.quickOpenSelectNext', ( localize2(2894, 'Select Next in Quick Open')), true, false, {
             weight: KeybindingWeight.WorkbenchContrib + 50,
             when: inQuickPickContext,
             primary: 0,
@@ -194,7 +194,7 @@ class QuickAccessSelectNextAction extends BaseQuickAccessNavigateAction {
 }
 class QuickAccessSelectPreviousAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenSelectPrevious', ( localize2(2881, 'Select Previous in Quick Open')), false, false, {
+        super('workbench.action.quickOpenSelectPrevious', ( localize2(2895, 'Select Previous in Quick Open')), false, false, {
             weight: KeybindingWeight.WorkbenchContrib + 50,
             when: inQuickPickContext,
             primary: 0,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.d.ts

@@ -2,9 +2,9 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { IKeyMods } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
-import { AbstractGotoLineQuickAccessProvider } from "@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess";
+import { AbstractGotoLineQuickAccessProvider } from "@codingame/monaco-vscode-api/vscode/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IQuickAccessTextEditorContext } from "@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess";
+import { IQuickAccessTextEditorContext } from "@codingame/monaco-vscode-api/vscode/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 export declare class GotoLineQuickAccessProvider extends AbstractGotoLineQuickAccessProvider {

package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.js

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { AbstractGotoLineQuickAccessProvider } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess';
+import { AbstractGotoLineQuickAccessProvider } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickAccess';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -57,7 +57,7 @@ class GotoLineAction extends Action2 {
     constructor() {
         super({
             id: GotoLineAction.ID,
-            title: ( localize2(6042, 'Go to Line/Column...')),
+            title: ( localize2(6163, 'Go to Line/Column...')),
             f1: true,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -68,18 +68,41 @@ class GotoLineAction extends Action2 {
         });
     }
     async run(accessor) {
-        accessor.get(IQuickInputService).quickAccess.show(GotoLineQuickAccessProvider.PREFIX);
+        accessor.get(IQuickInputService).quickAccess.show(GotoLineQuickAccessProvider.GO_TO_LINE_PREFIX);
     }
 }
 registerAction2(GotoLineAction);
 ( Registry.as(Extensions.Quickaccess)).registerQuickAccessProvider({
     ctor: GotoLineQuickAccessProvider,
-    prefix: AbstractGotoLineQuickAccessProvider.PREFIX,
+    prefix: AbstractGotoLineQuickAccessProvider.GO_TO_LINE_PREFIX,
     placeholder: ( localize(
-        6043,
+        6164,
         "Type the line number and optional column to go to (e.g. :42:5 for line 42, column 5). Type :: to go to a character offset (e.g. ::1024 for character 1024 from the start of the file). Use negative values to navigate backwards."
     )),
-    helpEntries: [{ description: ( localize(6044, "Go to Line/Column")), commandId: GotoLineAction.ID }]
+    helpEntries: [{ description: ( localize(6165, "Go to Line/Column")), commandId: GotoLineAction.ID }]
+});
+class GotoOffsetAction extends Action2 {
+    static { this.ID = 'workbench.action.gotoOffset'; }
+    constructor() {
+        super({
+            id: GotoOffsetAction.ID,
+            title: ( localize2(6166, 'Go to Offset...')),
+            f1: true
+        });
+    }
+    async run(accessor) {
+        accessor.get(IQuickInputService).quickAccess.show(GotoLineQuickAccessProvider.GO_TO_OFFSET_PREFIX);
+    }
+}
+registerAction2(GotoOffsetAction);
+( Registry.as(Extensions.Quickaccess)).registerQuickAccessProvider({
+    ctor: GotoLineQuickAccessProvider,
+    prefix: GotoLineQuickAccessProvider.GO_TO_OFFSET_PREFIX,
+    placeholder: ( localize(
+        6164,
+        "Type the line number and optional column to go to (e.g. :42:5 for line 42, column 5). Type :: to go to a character offset (e.g. ::1024 for character 1024 from the start of the file). Use negative values to navigate backwards."
+    )),
+    helpEntries: [{ description: ( localize(6167, "Go to Offset")), commandId: GotoOffsetAction.ID }]
 });
 
 export { GotoLineQuickAccessProvider };

package/vscode/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.js

@@ -20,18 +20,18 @@ import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { CommandsHistory } from '../../../../platform/quickinput/browser/commandsQuickAccess.js';
-import { TriggerAction } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
+import { TriggerAction } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
 import { DefaultQuickAccessFilterValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickAccess';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
-import { ASK_QUICK_QUESTION_ACTION_ID, CHAT_OPEN_ACTION_ID } from '@codingame/monaco-vscode-eda30bac-0984-5b42-9362-c68996b85232-common/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
+import { ASK_QUICK_QUESTION_ACTION_ID, CHAT_OPEN_ACTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
 import { RelatedInformationType } from '../../../services/aiRelatedInformation/common/aiRelatedInformation.js';
 import { IAiRelatedInformationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { createKeybindingCommandQuery } from '@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common/vscode/vs/workbench/services/preferences/browser/keybindingsEditorModel';
+import { createKeybindingCommandQuery } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/browser/keybindingsEditorModel';
 import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
@@ -52,7 +52,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         super({
             showAlias: !Language.isDefaultVariant(),
             noResultsPick: () => ({
-                label: ( localize(10025, "No matching commands")),
+                label: ( localize(10160, "No matching commands")),
                 commandId: ''
             }),
         }, instantiationService, keybindingService, commandService, telemetryService, dialogService);
@@ -100,7 +100,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
             ...picks,
             buttons: [{
                     iconClass: ThemeIcon.asClassName(Codicon.gear),
-                    tooltip: ( localize(10026, "Configure Keybinding")),
+                    tooltip: ( localize(10161, "Configure Keybinding")),
                 }],
             trigger: () => {
                 this.preferencesService.openGlobalKeybindingSettings(false, { query: createKeybindingCommandQuery(picks.commandId, picks.commandWhen) });
@@ -137,12 +137,12 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
                     });
                 }
                 additionalPicks.push({
-                    label: ( localize(10027, "Ask in Chat: {0}", filter)),
+                    label: ( localize(10162, "Ask in Chat: {0}", filter)),
                     commandId: this.configuration.experimental.askChatLocation === 'quickChat' ? ASK_QUICK_QUESTION_ACTION_ID : CHAT_OPEN_ACTION_ID,
                     args: [filter],
                     buttons: [{
                             iconClass: ThemeIcon.asClassName(Codicon.gear),
-                            tooltip: ( localize(10028, "Configure visibility")),
+                            tooltip: ( localize(10163, "Configure visibility")),
                         }],
                     trigger: () => {
                         void this.preferencesService.openSettings({ jsonEditor: false, query: 'workbench.commandPalette.showAskInChat' });
@@ -180,7 +180,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
             let label = (typeof action.item.title === 'string' ? action.item.title : action.item.title.value) || action.item.id;
             const category = typeof action.item.category === 'string' ? action.item.category : action.item.category?.value;
             if (category) {
-                label = ( localize(10029, "{0}: {1}", category, label));
+                label = ( localize(10164, "{0}: {1}", category, label));
             }
             const aliasLabel = typeof action.item.title !== 'string' ? action.item.title.original : undefined;
             const aliasCategory = (category && action.item.category && typeof action.item.category !== 'string') ? action.item.category.original : undefined;
@@ -224,7 +224,7 @@ class ShowAllCommandsAction extends Action2 {
     constructor() {
         super({
             id: ShowAllCommandsAction.ID,
-            title: ( localize2(10030, 'Show All Commands')),
+            title: ( localize2(10165, 'Show All Commands')),
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
                 when: undefined,
@@ -242,7 +242,7 @@ class ClearCommandHistoryAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.clearCommandHistory',
-            title: ( localize2(10031, 'Clear Command History')),
+            title: ( localize2(10166, 'Clear Command History')),
             f1: true
         });
     }
@@ -254,9 +254,9 @@ class ClearCommandHistoryAction extends Action2 {
         if (commandHistoryLength > 0) {
             const { confirmed } = await dialogService.confirm({
                 type: 'warning',
-                message: ( localize(10032, "Do you want to clear the history of recently used commands?")),
-                detail: ( localize(10033, "This action is irreversible!")),
-                primaryButton: ( localize(10034, "&&Clear"))
+                message: ( localize(10167, "Do you want to clear the history of recently used commands?")),
+                detail: ( localize(10168, "This action is irreversible!")),
+                primaryButton: ( localize(10169, "&&Clear"))
             });
             if (!confirmed) {
                 return;

package/vscode/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.js

@@ -8,7 +8,7 @@ import { ShowAllCommandsAction, CommandsQuickAccessProvider, ClearCommandHistory
 import { MenuRegistry, MenuId, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { KeyMod } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
-import { inQuickPickContext, getQuickNavigateHandler } from '@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common/vscode/vs/workbench/browser/quickaccess';
+import { inQuickPickContext, getQuickNavigateHandler } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/quickaccess';
 import { KeybindingsRegistry, KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
 
@@ -17,35 +17,35 @@ quickAccessRegistry.registerQuickAccessProvider({
     ctor: HelpQuickAccessProvider,
     prefix: HelpQuickAccessProvider.PREFIX,
     placeholder: ( localize(
-        10035,
+        10170,
         "Type '{0}' to get help on the actions you can take from here.",
         HelpQuickAccessProvider.PREFIX
     )),
     helpEntries: [{
-            description: ( localize(10036, "Show all Quick Access Providers")),
+            description: ( localize(10171, "Show all Quick Access Providers")),
             commandCenterOrder: 70,
-            commandCenterLabel: ( localize(10037, 'More'))
+            commandCenterLabel: ( localize(10172, 'More'))
         }]
 });
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: ViewQuickAccessProvider,
     prefix: ViewQuickAccessProvider.PREFIX,
     contextKey: 'inViewsPicker',
-    placeholder: ( localize(10038, "Type the name of a view, output channel or terminal to open.")),
-    helpEntries: [{ description: ( localize(10039, "Open View")), commandId: OpenViewPickerAction.ID }]
+    placeholder: ( localize(10173, "Type the name of a view, output channel or terminal to open.")),
+    helpEntries: [{ description: ( localize(10174, "Open View")), commandId: OpenViewPickerAction.ID }]
 });
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: CommandsQuickAccessProvider,
     prefix: CommandsQuickAccessProvider.PREFIX,
     contextKey: 'inCommandsPicker',
-    placeholder: ( localize(10040, "Type the name of a command to run.")),
-    helpEntries: [{ description: ( localize(10041, "Show and Run Commands")), commandId: ShowAllCommandsAction.ID, commandCenterOrder: 20 }]
+    placeholder: ( localize(10175, "Type the name of a command to run.")),
+    helpEntries: [{ description: ( localize(10176, "Show and Run Commands")), commandId: ShowAllCommandsAction.ID, commandCenterOrder: 20 }]
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     group: '1_open',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(10042, "&&Command Palette..."))
+        title: ( localize(10177, "&&Command Palette..."))
     },
     order: 1
 });
@@ -53,7 +53,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
     group: '1_welcome',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(10043, "Show All Commands"))
+        title: ( localize(10178, "Show All Commands"))
     },
     order: 2
 });
@@ -61,7 +61,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     group: '1_open',
     command: {
         id: OpenViewPickerAction.ID,
-        title: ( localize(10044, "&&Open View..."))
+        title: ( localize(10179, "&&Open View..."))
     },
     order: 2
 });
@@ -69,7 +69,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '5_infile_nav',
     command: {
         id: 'workbench.action.gotoLine',
-        title: ( localize(10045, "Go to &&Line/Column..."))
+        title: ( localize(10180, "Go to &&Line/Column..."))
     },
     order: 1
 });
@@ -77,7 +77,7 @@ MenuRegistry.appendMenuItem(MenuId.GlobalActivity, {
     group: '1_command',
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(10046, "Command Palette..."))
+        title: ( localize(10181, "Command Palette..."))
     },
     order: 1
 });
@@ -86,7 +86,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     when: ( EditorContextKeys.editorSimpleInput.toNegated()),
     command: {
         id: ShowAllCommandsAction.ID,
-        title: ( localize(10046, "Command Palette...")),
+        title: ( localize(10181, "Command Palette...")),
     },
     order: 1
 });

package/vscode/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.d.ts

@@ -1,5 +1,5 @@
 import { IQuickPickSeparator } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
-import { IPickerQuickAccessItem, PickerQuickAccessProvider } from "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
+import { IPickerQuickAccessItem, PickerQuickAccessProvider } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/browser/pickerQuickAccess";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
 import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
 import { IOutputService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/output/common/output.service";

package/vscode/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.js

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ItemActivation } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
-import { PickerQuickAccessProvider } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
+import { PickerQuickAccessProvider } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
 import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
@@ -28,7 +28,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
     constructor(viewDescriptorService, viewsService, outputService, terminalService, terminalGroupService, debugService, paneCompositeService, contextKeyService) {
         super(ViewQuickAccessProvider_1.PREFIX, {
             noResultsPick: {
-                label: ( localize(10047, "No matching views")),
+                label: ( localize(10182, "No matching views")),
                 containerLabel: ''
             }
         });
@@ -116,9 +116,9 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
                 }
             }
         };
-        addPaneComposites(ViewContainerLocation.Sidebar, ( localize(10048, "Side Bar")));
-        addPaneComposites(ViewContainerLocation.Panel, ( localize(10049, "Panel")));
-        addPaneComposites(ViewContainerLocation.AuxiliaryBar, ( localize(10050, "Secondary Side Bar")));
+        addPaneComposites(ViewContainerLocation.Sidebar, ( localize(10183, "Side Bar")));
+        addPaneComposites(ViewContainerLocation.Panel, ( localize(10184, "Panel")));
+        addPaneComposites(ViewContainerLocation.AuxiliaryBar, ( localize(10185, "Secondary Side Bar")));
         const addPaneCompositeViews = (location) => {
             const paneComposites = this.paneCompositeService.getPaneComposites(location);
             for (const paneComposite of paneComposites) {
@@ -134,14 +134,14 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
         this.terminalGroupService.groups.forEach((group, groupIndex) => {
             group.terminalInstances.forEach((terminal, terminalIndex) => {
                 const label = ( localize(
-                    10051,
+                    10186,
                     "{0}: {1}",
                     `${groupIndex + 1}.${terminalIndex + 1}`,
                     terminal.title
                 ));
                 viewEntries.push({
                     label,
-                    containerLabel: ( localize(10052, "Terminal")),
+                    containerLabel: ( localize(10187, "Terminal")),
                     accept: async () => {
                         await this.terminalGroupService.showPanel(true);
                         this.terminalService.setActiveInstance(terminal);
@@ -153,7 +153,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
             const label = session.name;
             viewEntries.push({
                 label,
-                containerLabel: ( localize(10053, "Debug Console")),
+                containerLabel: ( localize(10188, "Debug Console")),
                 accept: async () => {
                     await this.debugService.focusStackFrame(undefined, undefined, session, { explicit: true });
                     if (!this.viewsService.isViewVisible(REPL_VIEW_ID)) {
@@ -166,7 +166,7 @@ let ViewQuickAccessProvider = class ViewQuickAccessProvider extends PickerQuickA
         for (const channel of channels) {
             viewEntries.push({
                 label: channel.label,
-                containerLabel: ( localize(10054, "Output")),
+                containerLabel: ( localize(10189, "Output")),
                 accept: () => this.outputService.showChannel(channel.id)
             });
         }
@@ -195,7 +195,7 @@ class OpenViewPickerAction extends Action2 {
     constructor() {
         super({
             id: OpenViewPickerAction.ID,
-            title: ( localize2(10055, 'Open View')),
+            title: ( localize2(10190, 'Open View')),
             category: Categories.View,
             f1: true
         });
@@ -214,7 +214,7 @@ class QuickAccessViewPickerAction extends Action2 {
     constructor() {
         super({
             id: QuickAccessViewPickerAction.ID,
-            title: ( localize2(10056, 'Quick Open View')),
+            title: ( localize2(10191, 'Quick Open View')),
             category: Categories.View,
             f1: false,
             keybinding: {

package/vscode/src/vs/workbench/contrib/url/browser/externalUriResolver.d.ts

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
-import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
+import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service";
 export declare class ExternalUriResolverContribution extends Disposable implements IWorkbenchContribution {
     static readonly ID = "workbench.contrib.externalUriResolver";
     constructor(_openerService: IOpenerService, _workbenchEnvironmentService: IBrowserWorkbenchEnvironmentService);

package/vscode/src/vs/workbench/contrib/url/browser/externalUriResolver.js

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
-import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service';
 
 let ExternalUriResolverContribution = class ExternalUriResolverContribution extends Disposable {
     static { this.ID = 'workbench.contrib.externalUriResolver'; }

package/vscode/src/vs/workbench/contrib/url/browser/trustedDomainsFileSystemProvider.js

@@ -7,7 +7,7 @@ import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
-import { TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, readTrustedDomains, TRUSTED_DOMAINS_STORAGE_KEY } from '@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common/vscode/vs/workbench/contrib/url/browser/trustedDomains';
+import { TRUSTED_DOMAINS_CONTENT_STORAGE_KEY, readTrustedDomains, TRUSTED_DOMAINS_STORAGE_KEY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/browser/trustedDomains';
 import { assertReturnsDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 

package/vscode/src/vs/workbench/contrib/url/browser/trustedDomainsValidator.js

@@ -15,8 +15,8 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IWorkspaceTrustManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
 import { ITrustedDomainService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/browser/trustedDomainService.service';
-import { isURLDomainTrusted } from '@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common/vscode/vs/workbench/contrib/url/common/trustedDomains';
-import { readStaticTrustedDomains, configureOpenerTrustedDomainsHandler } from '@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common/vscode/vs/workbench/contrib/url/browser/trustedDomains';
+import { isURLDomainTrusted } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/common/trustedDomains';
+import { readStaticTrustedDomains, configureOpenerTrustedDomainsHandler } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/browser/trustedDomains';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 let OpenerValidatorContributions = class OpenerValidatorContributions {
@@ -68,25 +68,25 @@ let OpenerValidatorContributions = class OpenerValidatorContributions {
             const { result } = await this._dialogService.prompt({
                 type: Severity.Info,
                 message: ( localize(
-                    12725,
+                    12865,
                     'Do you want {0} to open the external website?',
                     this._productService.nameShort
                 )),
                 detail: typeof originalResource === 'string' ? originalResource : formattedLink,
                 buttons: [
                     {
-                        label: ( localize(12726, '&&Open')),
+                        label: ( localize(12866, '&&Open')),
                         run: () => true
                     },
                     {
-                        label: ( localize(12727, '&&Copy')),
+                        label: ( localize(12867, '&&Copy')),
                         run: () => {
                             this._clipboardService.writeText(typeof originalResource === 'string' ? originalResource : ( resourceUri.toString(true)));
                             return false;
                         }
                     },
                     {
-                        label: ( localize(12728, 'Configure &&Trusted Domains')),
+                        label: ( localize(12868, 'Configure &&Trusted Domains')),
                         run: async () => {
                             const { trustedDomains, } = this._instantiationService.invokeFunction(readStaticTrustedDomains);
                             const domainToOpen = `${scheme}://${authority}`;

package/vscode/src/vs/workbench/contrib/url/browser/url.contribution.js

@@ -9,13 +9,13 @@ import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/regist
 import { IURLService } from '@codingame/monaco-vscode-api/vscode/vs/platform/url/common/url.service';
 import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { ExternalUriResolverContribution } from './externalUriResolver.js';
-import { manageTrustedDomainSettingsCommand } from '@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common/vscode/vs/workbench/contrib/url/browser/trustedDomains';
+import { manageTrustedDomainSettingsCommand } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/browser/trustedDomains';
 import { TrustedDomainsFileSystemProvider } from './trustedDomainsFileSystemProvider.js';
 import { OpenerValidatorContributions } from './trustedDomainsValidator.js';
 import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
 import { Extensions as Extensions$1, ConfigurationScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
 import { workbenchConfigurationNodeBase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/configuration';
-import '@codingame/monaco-vscode-9a1a5840-af83-5d07-a156-ba32a36c5c4b-common/vscode/vs/workbench/contrib/url/browser/trustedDomainService';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/url/browser/trustedDomainService';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
@@ -26,7 +26,7 @@ class OpenUrlAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.url.openUrl',
-            title: ( localize2(12729, 'Open URL')),
+            title: ( localize2(12869, 'Open URL')),
             category: Categories.Developer,
             f1: true
         });
@@ -36,7 +36,7 @@ class OpenUrlAction extends Action2 {
         const urlService = accessor.get(IURLService);
         const storageService = accessor.get(IStorageService);
         const value = storageService.get(OpenUrlAction.STORAGE_KEY, StorageScope.WORKSPACE, '');
-        return quickInputService.input({ prompt: ( localize(12730, "URL to open")), value }).then(input => {
+        return quickInputService.input({ prompt: ( localize(12870, "URL to open")), value }).then(input => {
             if (input) {
                 const uri = ( URI.parse(input));
                 urlService.open(uri, { originalUrl: input });
@@ -67,7 +67,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             default: false,
             description: ( localize(
-                12731,
+                12871,
                 "When enabled, trusted domain prompts will appear when opening links in trusted workspaces."
             ))
         }

package/vscode/src/vs/workbench/services/quickinput/browser/quickInputService.js

@@ -8,7 +8,7 @@ import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { QuickInputService as QuickInputService$1 } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/browser/quickInputService';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import { InQuickPickContextKey } from '@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common/vscode/vs/workbench/browser/quickaccess';
+import { InQuickPickContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/quickaccess';
 
 let QuickInputService = class QuickInputService extends QuickInputService$1 {
     constructor(configurationService, instantiationService, keybindingService, contextKeyService, themeService, layoutService) {

package/vscode/src/vs/base/common/normalization.d.ts

@@ -1,3 +0,0 @@
-export declare function normalizeNFC(str: string): string;
-export declare function normalizeNFD(str: string): string;
-export declare const removeAccents: (str: string) => string;

package/vscode/src/vs/base/common/normalization.js

@@ -1,34 +0,0 @@
-
-import { LRUCache } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
-
-const nfdCache = ( new LRUCache(10000));
-function normalizeNFD(str) {
-    return normalize(str, 'NFD', nfdCache);
-}
-const nonAsciiCharactersPattern = /[^\u0000-\u0080]/;
-function normalize(str, form, normalizedCache) {
-    if (!str) {
-        return str;
-    }
-    const cached = normalizedCache.get(str);
-    if (cached) {
-        return cached;
-    }
-    let res;
-    if (nonAsciiCharactersPattern.test(str)) {
-        res = str.normalize(form);
-    }
-    else {
-        res = str;
-    }
-    normalizedCache.set(str, res);
-    return res;
-}
-const removeAccents = (function () {
-    const regex = /[\u0300-\u036f]/g;
-    return function (str) {
-        return normalizeNFD(str).replace(regex, '');
-    };
-})();
-
-export { normalizeNFD, removeAccents };