@codingame/monaco-vscode-api 16.1.1 → 17.1.0

package/vscode/src/vs/editor/contrib/clipboard/browser/clipboard.js

@@ -1,13 +1,16 @@
 
 import { isFirefox } from '../../../../base/browser/browser.js';
-import { getActiveDocument } from '../../../../base/browser/dom.js';
+import { getActiveDocument, getActiveWindow } from '../../../../base/browser/dom.js';
 import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { isNative, isWeb } from '../../../../base/common/platform.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { localize, localize2 } from '../../../../nls.js';
 import { MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IProductService } from '../../../../platform/product/common/productService.service.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { CopyOptions, InMemoryClipboardMetadataManager } from '../../../browser/controller/editContext/clipboardUtils.js';
 import { NativeEditContextRegistry } from '../../../browser/controller/editContext/native/nativeEditContextRegistry.js';
 import { MultiCommand, EditorAction, registerEditorAction } from '../../../browser/editorExtensions.js';
@@ -188,26 +191,29 @@ if (PasteAction) {
     PasteAction.addImplementation(10000, 'code-editor', (accessor, args) => {
         const codeEditorService = accessor.get(ICodeEditorService);
         const clipboardService = accessor.get(IClipboardService);
+        const telemetryService = accessor.get(ITelemetryService);
+        const productService = accessor.get(IProductService);
         const focusedEditor = codeEditorService.getFocusedCodeEditor();
         if (focusedEditor && focusedEditor.hasModel() && focusedEditor.hasTextFocus()) {
-            let result;
             const experimentalEditContextEnabled = focusedEditor.getOption(EditorOption.effectiveExperimentalEditContextEnabled);
             if (experimentalEditContextEnabled) {
                 const nativeEditContext = NativeEditContextRegistry.get(focusedEditor.getId());
                 if (nativeEditContext) {
-                    result = nativeEditContext.executePaste();
+                    nativeEditContext.onWillPaste();
                 }
-                else {
-                    result = false;
-                }
-            }
-            else {
-                result = focusedEditor.getContainerDomNode().ownerDocument.execCommand('paste');
             }
-            if (result) {
-                return CopyPasteController.get(focusedEditor)?.finishedPaste() ?? Promise.resolve();
+            const sw = StopWatch.create(true);
+            const triggerPaste = clipboardService.triggerPaste(getActiveWindow().vscodeWindowId);
+            if (triggerPaste) {
+                return triggerPaste.then(async () => {
+                    if (productService.quality !== 'stable') {
+                        const duration = sw.elapsed();
+                        telemetryService.publicLog2('editorAsyncPaste', { duration });
+                    }
+                    return CopyPasteController.get(focusedEditor)?.finishedPaste() ?? Promise.resolve();
+                });
             }
-            else if (isWeb) {
+            if (isWeb) {
                 return (async () => {
                     const clipboardText = await clipboardService.readText();
                     if (clipboardText !== '') {
@@ -234,8 +240,8 @@ if (PasteAction) {
         return false;
     });
     PasteAction.addImplementation(0, 'generic-dom', (accessor, args) => {
-        getActiveDocument().execCommand('paste');
-        return true;
+        const triggerPaste = accessor.get(IClipboardService).triggerPaste(getActiveWindow().vscodeWindowId);
+        return triggerPaste ?? false;
     });
 }
 if (supportsCopy) {

package/vscode/src/vs/editor/contrib/codeAction/browser/codeAction.js

@@ -133,7 +133,9 @@ async function getCodeActions(registry, model, rangeOrSelection, trigger, progre
             ...coalesce(( actions.map(x => x.documentation))),
             ...getAdditionalDocumentationForShowingActions(registry, model, trigger, allActions)
         ];
-        return ( new ManagedCodeActionSet(allActions, allDocumentation, disposables));
+        const managedCodeActionSet = ( new ManagedCodeActionSet(allActions, allDocumentation, disposables));
+        disposables.add(managedCodeActionSet);
+        return managedCodeActionSet;
     }
     catch (err) {
         disposables.dispose();

package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionModel.js

@@ -181,6 +181,7 @@ class CodeActionModel extends Disposable {
                 const actions = createCancelablePromise(async (token) => {
                     if (this._settingEnabledNearbyQuickfixes() && trigger.trigger.type === CodeActionTriggerType.Invoke && (trigger.trigger.triggerAction === CodeActionTriggerSource.QuickFix || trigger.trigger.filter?.include?.contains(CodeActionKind.QuickFix))) {
                         const codeActionSet = await getCodeActions(this._registry, model, trigger.selection, trigger.trigger, Progress.None, token);
+                        this.codeActionsDisposable.value = codeActionSet;
                         const allCodeActions = [...codeActionSet.allActions];
                         if (token.isCancellationRequested) {
                             codeActionSet.dispose();
@@ -269,6 +270,7 @@ class CodeActionModel extends Disposable {
                     }
                     if (trigger.trigger.type === CodeActionTriggerType.Invoke) {
                         const codeActions = await getCodeActions(this._registry, model, trigger.selection, trigger.trigger, Progress.None, token);
+                        this.codeActionsDisposable.value = codeActions;
                         return codeActions;
                     }
                     const codeActionSet = await getCodeActions(this._registry, model, trigger.selection, trigger.trigger, Progress.None, token);
@@ -303,7 +305,7 @@ class CodeActionModel extends Disposable {
     }
     trigger(trigger) {
         this._codeActionOracle.value?.trigger(trigger);
-        this.codeActionsDisposable.clear();
+        this.codeActionsDisposable.dispose();
     }
     setState(newState, skipNotify) {
         if (newState === this._state) {

package/vscode/src/vs/editor/contrib/colorPicker/browser/colorDetector.d.ts

@@ -41,7 +41,7 @@ export declare class ColorDetector extends Disposable implements IEditorContribu
     getColorData(position: Position): IColorData | null;
     isColorDecoration(decoration: IModelDecoration): boolean;
 }
-export declare class DecoratorLimitReporter {
+export declare class DecoratorLimitReporter extends Disposable {
     private _onDidChange;
     readonly onDidChange: Event<void>;
     private _computed;

package/vscode/src/vs/editor/contrib/colorPicker/browser/colorDetector.js

@@ -30,7 +30,7 @@ let ColorDetector = class ColorDetector extends Disposable {
         this._localToDispose = this._register(( new DisposableStore()));
         this._decorationsIds = [];
         this._colorDatas = ( new Map());
-        this._decoratorLimitReporter = ( new DecoratorLimitReporter());
+        this._decoratorLimitReporter = this._register(( new DecoratorLimitReporter()));
         this._colorDecorationClassRefs = this._register(( new DisposableStore()));
         this._colorDecoratorIds = this._editor.createDecorationsCollection();
         this._ruleFactory = ( new DynamicCssRules(this._editor));
@@ -222,9 +222,10 @@ ColorDetector = ColorDetector_1 = ( __decorate([
     ( __param(2, ILanguageFeaturesService)),
     ( __param(3, ILanguageFeatureDebounceService))
 ], ColorDetector));
-class DecoratorLimitReporter {
+class DecoratorLimitReporter extends Disposable {
     constructor() {
-        this._onDidChange = ( new Emitter());
+        super(...arguments);
+        this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this._computed = 0;
         this._limited = false;

package/vscode/src/vs/editor/contrib/find/browser/findController.d.ts

@@ -11,7 +11,6 @@ import { IContextViewService } from "../../../../platform/contextview/browser/co
 import { IKeybindingService } from "../../../../platform/keybinding/common/keybinding.service.js";
 import { INotificationService } from "../../../../platform/notification/common/notification.service.js";
 import { IStorageService } from "../../../../platform/storage/common/storage.service.js";
-import { IThemeService } from "../../../../platform/theme/common/themeService.service.js";
 import { IHoverService } from "../../../../platform/hover/browser/hover.service.js";
 export declare function getSelectionSearchString(editor: ICodeEditor, seedSearchStringFromSelection?: "single" | "multiple", seedSearchStringFromNonEmptySelection?: boolean): string | null;
 export declare enum FindStartFocusAction {
@@ -82,12 +81,11 @@ export declare class CommonFindController extends Disposable implements IEditorC
 export declare class FindController extends CommonFindController implements IFindController {
     private readonly _contextViewService;
     private readonly _keybindingService;
-    private readonly _themeService;
     private _widget;
     private _findOptionsWidget;
     private _findWidgetSearchHistory;
     private _replaceWidgetHistory;
-    constructor(editor: ICodeEditor, _contextViewService: IContextViewService, _contextKeyService: IContextKeyService, _keybindingService: IKeybindingService, _themeService: IThemeService, notificationService: INotificationService, _storageService: IStorageService, clipboardService: IClipboardService, hoverService: IHoverService);
+    constructor(editor: ICodeEditor, _contextViewService: IContextViewService, _contextKeyService: IContextKeyService, _keybindingService: IKeybindingService, notificationService: INotificationService, _storageService: IStorageService, clipboardService: IClipboardService, hoverService: IHoverService);
     protected _start(opts: IFindStartOptions, newState?: INewFindReplaceState): Promise<void>;
     highlightFindOptions(ignoreWhenVisible?: boolean): void;
     private _createFindWidget;

package/vscode/src/vs/editor/contrib/find/browser/findController.js

@@ -27,7 +27,6 @@ import { IQuickInputService } from '../../../../platform/quickinput/common/quick
 import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 import { FindWidgetSearchHistory } from './findWidgetSearchHistory.js';
 import { ReplaceWidgetHistory } from './replaceWidgetHistory.js';
@@ -350,11 +349,10 @@ CommonFindController = CommonFindController_1 = ( __decorate([
     ( __param(5, IHoverService))
 ], CommonFindController));
 let FindController = class FindController extends CommonFindController {
-    constructor(editor, _contextViewService, _contextKeyService, _keybindingService, _themeService, notificationService, _storageService, clipboardService, hoverService) {
+    constructor(editor, _contextViewService, _contextKeyService, _keybindingService, notificationService, _storageService, clipboardService, hoverService) {
         super(editor, _contextKeyService, _storageService, clipboardService, notificationService, hoverService);
         this._contextViewService = _contextViewService;
         this._keybindingService = _keybindingService;
-        this._themeService = _themeService;
         this._widget = null;
         this._findOptionsWidget = null;
         this._findWidgetSearchHistory = FindWidgetSearchHistory.getOrCreate(_storageService);
@@ -409,9 +407,6 @@ let FindController = class FindController extends CommonFindController {
             this._contextViewService,
             this._keybindingService,
             this._contextKeyService,
-            this._themeService,
-            this._storageService,
-            this._notificationService,
             this._hoverService,
             this._findWidgetSearchHistory,
             this._replaceWidgetHistory
@@ -429,11 +424,10 @@ FindController = ( __decorate([
     ( __param(1, IContextViewService)),
     ( __param(2, IContextKeyService)),
     ( __param(3, IKeybindingService)),
-    ( __param(4, IThemeService)),
-    ( __param(5, INotificationService)),
-    ( __param(6, IStorageService)),
-    ( __param(7, IClipboardService)),
-    ( __param(8, IHoverService))
+    ( __param(4, INotificationService)),
+    ( __param(5, IStorageService)),
+    ( __param(6, IClipboardService)),
+    ( __param(7, IHoverService))
 ], FindController));
 const StartFindAction = registerMultiEditorAction(( new MultiEditorAction({
     id: FIND_IDS.StartFindAction,

package/vscode/src/vs/editor/contrib/find/browser/findWidget.d.ts

@@ -6,9 +6,6 @@ import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, IViewZone } from "
 import { FindReplaceState } from "./findState.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
 import { IKeybindingService } from "../../../../platform/keybinding/common/keybinding.service.js";
-import { INotificationService } from "../../../../platform/notification/common/notification.service.js";
-import { IStorageService } from "../../../../platform/storage/common/storage.service.js";
-import { IThemeService } from "../../../../platform/theme/common/themeService.service.js";
 import { ThemeIcon } from "../../../../base/common/themables.js";
 import { IHoverDelegate } from "../../../../base/browser/ui/hover/hoverDelegate.js";
 import { IHoverService } from "../../../../platform/hover/browser/hover.service.js";
@@ -43,8 +40,6 @@ export declare class FindWidget extends Widget implements IOverlayWidget, IVerti
     private readonly _contextViewProvider;
     private readonly _keybindingService;
     private readonly _contextKeyService;
-    private readonly _storageService;
-    private readonly _notificationService;
     private _domNode;
     private _cachedHeight;
     private _findInput;
@@ -60,7 +55,6 @@ export declare class FindWidget extends Widget implements IOverlayWidget, IVerti
     private _isVisible;
     private _isReplaceVisible;
     private _ignoreChangeEvent;
-    private _ctrlEnterReplaceAllWarningPrompted;
     private readonly _findFocusTracker;
     private readonly _findInputFocused;
     private readonly _replaceFocusTracker;
@@ -70,7 +64,7 @@ export declare class FindWidget extends Widget implements IOverlayWidget, IVerti
     private _resizeSash;
     private _resized;
     private readonly _updateHistoryDelayer;
-    constructor(codeEditor: ICodeEditor, controller: IFindController, state: FindReplaceState, contextViewProvider: IContextViewProvider, keybindingService: IKeybindingService, contextKeyService: IContextKeyService, themeService: IThemeService, storageService: IStorageService, notificationService: INotificationService, _hoverService: IHoverService, _findWidgetSearchHistory: IHistory<string> | undefined, _replaceWidgetHistory: IHistory<string> | undefined);
+    constructor(codeEditor: ICodeEditor, controller: IFindController, state: FindReplaceState, contextViewProvider: IContextViewProvider, keybindingService: IKeybindingService, contextKeyService: IContextKeyService, _hoverService: IHoverService, _findWidgetSearchHistory: IHistory<string> | undefined, _replaceWidgetHistory: IHistory<string> | undefined);
     getId(): string;
     getDomNode(): HTMLElement;
     getPosition(): IOverlayWidgetPosition | null;

package/vscode/src/vs/editor/contrib/find/browser/findWidget.js

@@ -10,7 +10,7 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { toDisposable } from '../../../../base/common/lifecycle.js';
-import { isMacintosh, isWindows, isNative, isLinux } from '../../../../base/common/platform.js';
+import { isMacintosh, isLinux } from '../../../../base/common/platform.js';
 import { format } from '../../../../base/common/strings.js';
 import * as findWidget from './findWidget.css';
 import { OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js';
@@ -21,7 +21,6 @@ import { localize } from '../../../../nls.js';
 import { AccessibilitySupport } from '../../../../platform/accessibility/common/accessibility.js';
 import { ContextScopedFindInput, ContextScopedReplaceInput } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
 import { showHistoryKeybindingHint } from '../../../../platform/history/browser/historyWidgetKeybindingHint.js';
-import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
 import { contrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
@@ -73,7 +72,6 @@ const PART_WIDTH = 275;
 const FIND_INPUT_AREA_WIDTH = PART_WIDTH - 54;
 let MAX_MATCHES_COUNT_WIDTH = 69;
 const FIND_INPUT_AREA_HEIGHT = 33;
-const ctrlEnterReplaceAllWarningPromptedKey = 'ctrlEnterReplaceAll.windows.donotask';
 const ctrlKeyMod = (isMacintosh ? KeyMod$1.WinCtrl : KeyMod$1.CtrlCmd);
 class FindWidgetViewZone {
     constructor(afterLineNumber) {
@@ -100,7 +98,7 @@ function stopPropagationForMultiLineDownwards(event, value, textarea) {
 }
 class FindWidget extends Widget {
     static { this.ID = 'editor.contrib.findWidget'; }
-    constructor(codeEditor, controller, state, contextViewProvider, keybindingService, contextKeyService, themeService, storageService, notificationService, _hoverService, _findWidgetSearchHistory, _replaceWidgetHistory) {
+    constructor(codeEditor, controller, state, contextViewProvider, keybindingService, contextKeyService, _hoverService, _findWidgetSearchHistory, _replaceWidgetHistory) {
         super();
         this._hoverService = _hoverService;
         this._findWidgetSearchHistory = _findWidgetSearchHistory;
@@ -113,9 +111,6 @@ class FindWidget extends Widget {
         this._contextViewProvider = contextViewProvider;
         this._keybindingService = keybindingService;
         this._contextKeyService = contextKeyService;
-        this._storageService = storageService;
-        this._notificationService = notificationService;
-        this._ctrlEnterReplaceAllWarningPrompted = !!storageService.getBoolean(ctrlEnterReplaceAllWarningPromptedKey, StorageScope.PROFILE);
         this._isVisible = false;
         this._isReplaceVisible = false;
         this._ignoreChangeEvent = false;
@@ -690,14 +685,6 @@ class FindWidget extends Widget {
                 return;
             }
             else {
-                if (isWindows && isNative && !this._ctrlEnterReplaceAllWarningPrompted) {
-                    this._notificationService.info(( localize(
-                        1044,
-                        'Ctrl+Enter now inserts line break instead of replacing all. You can modify the keybinding for editor.action.replaceAll to override this behavior.'
-                    )));
-                    this._ctrlEnterReplaceAllWarningPrompted = true;
-                    this._storageService.store(ctrlEnterReplaceAllWarningPromptedKey, true, StorageScope.PROFILE, StorageTarget.USER);
-                }
                 this._replaceInput.inputBox.insertAtCursor('\n');
                 e.preventDefault();
                 return;

package/vscode/src/vs/editor/contrib/folding/browser/folding.d.ts

@@ -76,7 +76,7 @@ export declare class FoldingController extends Disposable implements IEditorCont
     private onEditorMouseUp;
     reveal(position: IPosition): void;
 }
-export declare class RangesLimitReporter implements FoldingLimitReporter {
+export declare class RangesLimitReporter extends Disposable implements FoldingLimitReporter {
     private readonly editor;
     constructor(editor: ICodeEditor);
     get limit(): number;

package/vscode/src/vs/editor/contrib/folding/browser/folding.js

@@ -61,7 +61,7 @@ let FoldingController = class FoldingController extends Disposable {
         this.languageFeaturesService = languageFeaturesService;
         this.localToDispose = this._register(( new DisposableStore()));
         this.editor = editor;
-        this._foldingLimitReporter = ( new RangesLimitReporter(editor));
+        this._foldingLimitReporter = this._register(( new RangesLimitReporter(editor)));
         const options = this.editor.getOptions();
         this._isEnabled = options.get(EditorOption.folding);
         this._useFoldingProviders = options.get(EditorOption.foldingStrategy) !== 'indentation';
@@ -410,10 +410,11 @@ FoldingController = FoldingController_1 = ( __decorate([
     ( __param(4, ILanguageFeatureDebounceService)),
     ( __param(5, ILanguageFeaturesService))
 ], FoldingController));
-class RangesLimitReporter {
+class RangesLimitReporter extends Disposable {
     constructor(editor) {
+        super();
         this.editor = editor;
-        this._onDidChange = ( new Emitter());
+        this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this._computed = 0;
         this._limited = false;
@@ -509,7 +510,7 @@ class UnfoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfold',
-            label: ( localize2(1045, "Unfold")),
+            label: ( localize2(1044, "Unfold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -570,7 +571,7 @@ class UnFoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldRecursively',
-            label: ( localize2(1046, "Unfold Recursively")),
+            label: ( localize2(1045, "Unfold Recursively")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -587,7 +588,7 @@ class FoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.fold',
-            label: ( localize2(1047, "Fold")),
+            label: ( localize2(1046, "Fold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -653,7 +654,7 @@ class ToggleFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.toggleFold',
-            label: ( localize2(1048, "Toggle Fold")),
+            label: ( localize2(1047, "Toggle Fold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -671,7 +672,7 @@ class FoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldRecursively',
-            label: ( localize2(1049, "Fold Recursively")),
+            label: ( localize2(1048, "Fold Recursively")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -689,7 +690,7 @@ class ToggleFoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.toggleFoldRecursively',
-            label: ( localize2(1050, "Toggle Fold Recursively")),
+            label: ( localize2(1049, "Toggle Fold Recursively")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -707,7 +708,7 @@ class FoldAllBlockCommentsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllBlockComments',
-            label: ( localize2(1051, "Fold All Block Comments")),
+            label: ( localize2(1050, "Fold All Block Comments")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -737,7 +738,7 @@ class FoldAllRegionsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllMarkerRegions',
-            label: ( localize2(1052, "Fold All Regions")),
+            label: ( localize2(1051, "Fold All Regions")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -767,7 +768,7 @@ class UnfoldAllRegionsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAllMarkerRegions',
-            label: ( localize2(1053, "Unfold All Regions")),
+            label: ( localize2(1052, "Unfold All Regions")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -797,7 +798,7 @@ class FoldAllExceptAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllExcept',
-            label: ( localize2(1054, "Fold All Except Selected")),
+            label: ( localize2(1053, "Fold All Except Selected")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -815,7 +816,7 @@ class UnfoldAllExceptAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAllExcept',
-            label: ( localize2(1055, "Unfold All Except Selected")),
+            label: ( localize2(1054, "Unfold All Except Selected")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -833,7 +834,7 @@ class FoldAllAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAll',
-            label: ( localize2(1056, "Fold All")),
+            label: ( localize2(1055, "Fold All")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -850,7 +851,7 @@ class UnfoldAllAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAll',
-            label: ( localize2(1057, "Unfold All")),
+            label: ( localize2(1056, "Unfold All")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -877,7 +878,7 @@ class GotoParentFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoParentFold',
-            label: ( localize2(1058, "Go to Parent Fold")),
+            label: ( localize2(1057, "Go to Parent Fold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -904,7 +905,7 @@ class GotoPreviousFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoPreviousFold',
-            label: ( localize2(1059, "Go to Previous Folding Range")),
+            label: ( localize2(1058, "Go to Previous Folding Range")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -931,7 +932,7 @@ class GotoNextFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoNextFold',
-            label: ( localize2(1060, "Go to Next Folding Range")),
+            label: ( localize2(1059, "Go to Next Folding Range")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -958,7 +959,7 @@ class FoldRangeFromSelectionAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.createFoldingRangeFromSelection',
-            label: ( localize2(1061, "Create Folding Range from Selection")),
+            label: ( localize2(1060, "Create Folding Range from Selection")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -1006,7 +1007,7 @@ class RemoveFoldRangeFromSelectionAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.removeManualFoldingRanges',
-            label: ( localize2(1062, "Remove Manual Folding Ranges")),
+            label: ( localize2(1061, "Remove Manual Folding Ranges")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -1032,7 +1033,7 @@ class ToggleImportFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.toggleImportFold',
-            label: ( localize2(1063, "Toggle Import Fold")),
+            label: ( localize2(1062, "Toggle Import Fold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -1075,7 +1076,7 @@ registerEditorAction(ToggleImportFoldAction);
 for (let i = 1; i <= 7; i++) {
     registerInstantiatedEditorAction(( new FoldLevelAction({
         id: FoldLevelAction.ID(i),
-        label: ( localize2(1064, "Fold Level {0}", i)),
+        label: ( localize2(1063, "Fold Level {0}", i)),
         precondition: CONTEXT_FOLDING_ENABLED,
         kbOpts: {
             kbExpr: EditorContextKeys.editorTextFocus,

package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js

@@ -19,21 +19,21 @@ import { themeColorFromId } from '../../../../platform/theme/common/themeService
 import { ThemeIcon } from '../../../../base/common/themables.js';
 
 const foldBackground = registerColor('editor.foldBackground', { light: ( transparent(editorSelectionBackground, 0.3)), dark: ( transparent(editorSelectionBackground, 0.3)), hcDark: null, hcLight: null }, ( localize(
-    1065,
+    1064,
     "Background color behind folded ranges. The color must not be opaque so as not to hide underlying decorations."
 )), true);
 registerColor('editor.foldPlaceholderForeground', { light: '#808080', dark: '#808080', hcDark: null, hcLight: null }, ( localize(
-    1066,
+    1065,
     "Color of the collapsed text after the first line of a folded range."
 )));
-registerColor('editorGutter.foldingControlForeground', iconForeground, ( localize(1067, 'Color of the folding control in the editor gutter.')));
-const foldingExpandedIcon = registerIcon('folding-expanded', Codicon.chevronDown, ( localize(1068, 'Icon for expanded ranges in the editor glyph margin.')));
-const foldingCollapsedIcon = registerIcon('folding-collapsed', Codicon.chevronRight, ( localize(1069, 'Icon for collapsed ranges in the editor glyph margin.')));
-const foldingManualCollapsedIcon = registerIcon('folding-manual-collapsed', foldingCollapsedIcon, ( localize(1070, 'Icon for manually collapsed ranges in the editor glyph margin.')));
-const foldingManualExpandedIcon = registerIcon('folding-manual-expanded', foldingExpandedIcon, ( localize(1071, 'Icon for manually expanded ranges in the editor glyph margin.')));
+registerColor('editorGutter.foldingControlForeground', iconForeground, ( localize(1066, 'Color of the folding control in the editor gutter.')));
+const foldingExpandedIcon = registerIcon('folding-expanded', Codicon.chevronDown, ( localize(1067, 'Icon for expanded ranges in the editor glyph margin.')));
+const foldingCollapsedIcon = registerIcon('folding-collapsed', Codicon.chevronRight, ( localize(1068, 'Icon for collapsed ranges in the editor glyph margin.')));
+const foldingManualCollapsedIcon = registerIcon('folding-manual-collapsed', foldingCollapsedIcon, ( localize(1069, 'Icon for manually collapsed ranges in the editor glyph margin.')));
+const foldingManualExpandedIcon = registerIcon('folding-manual-expanded', foldingExpandedIcon, ( localize(1070, 'Icon for manually expanded ranges in the editor glyph margin.')));
 const foldedBackgroundMinimap = { color: themeColorFromId(foldBackground), position: MinimapPosition.Inline };
-const collapsed = ( localize(1072, "Click to expand the range."));
-const expanded = ( localize(1073, "Click to collapse the range."));
+const collapsed = ( localize(1071, "Click to expand the range."));
+const expanded = ( localize(1072, "Click to collapse the range."));
 class FoldingDecorationProvider {
     static { this.COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({
         description: 'folding-collapsed-visual-decoration',

package/vscode/src/vs/editor/contrib/fontZoom/browser/fontZoom.js

@@ -7,7 +7,7 @@ class EditorFontZoomIn extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.fontZoomIn',
-            label: ( localize2(1074, "Increase Editor Font Size")),
+            label: ( localize2(1073, "Increase Editor Font Size")),
             precondition: undefined
         });
     }
@@ -19,7 +19,7 @@ class EditorFontZoomOut extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.fontZoomOut',
-            label: ( localize2(1075, "Decrease Editor Font Size")),
+            label: ( localize2(1074, "Decrease Editor Font Size")),
             precondition: undefined
         });
     }
@@ -31,7 +31,7 @@ class EditorFontZoomReset extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.fontZoomReset',
-            label: ( localize2(1076, "Reset Editor Font Size")),
+            label: ( localize2(1075, "Reset Editor Font Size")),
             precondition: undefined
         });
     }

package/vscode/src/vs/editor/contrib/format/browser/formatActions.js

@@ -164,7 +164,7 @@ class FormatDocumentAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatDocument',
-            label: ( localize2(1077, "Format Document")),
+            label: ( localize2(1076, "Format Document")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.notInCompositeEditor,
                 EditorContextKeys.writable,
@@ -194,7 +194,7 @@ class FormatSelectionAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatSelection',
-            label: ( localize2(1078, "Format Selection")),
+            label: ( localize2(1077, "Format Selection")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 EditorContextKeys.hasDocumentSelectionFormattingProvider