@codingame/monaco-vscode-api 26.2.2 → 28.0.0

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

@@ -1,11 +1,11 @@
 
 import { registerCss } from '../../../../../../../css.js';
-import { createElement, trackFocus, getTotalWidth, createTextNode, getDomNodePagePosition, getTopLeftOffset, getComputedStyle } from '../../../../base/browser/dom.js';
+import { createElement, trackFocus, addDisposableListener, isHTMLElement, getWindow, getTotalWidth, createTextNode, getDomNodePagePosition, getTopLeftOffset, getComputedStyle } from '../../../../base/browser/dom.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
 import { Toggle } from '../../../../base/browser/ui/toggle/toggle.js';
 import { Sash, Orientation } from '../../../../base/browser/ui/sash/sash.js';
 import { Widget } from '../../../../base/browser/ui/widget.js';
-import { Delayer } from '../../../../base/common/async.js';
+import { Delayer, disposableTimeout } from '../../../../base/common/async.js';
 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';
@@ -16,7 +16,7 @@ import * as findWidget from './findWidget.css';
 import { OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
-import { MATCHES_LIMIT, CONTEXT_FIND_INPUT_FOCUSED, CONTEXT_REPLACE_INPUT_FOCUSED, FIND_IDS } from './findModel.js';
+import { MATCHES_LIMIT, CONTEXT_FIND_INPUT_FOCUSED, CONTEXT_REPLACE_INPUT_FOCUSED, CONTEXT_FIND_WIDGET_FOCUSED, FIND_IDS } from './findModel.js';
 import { localize } from '../../../../nls.js';
 import { AccessibilitySupport } from '../../../../platform/accessibility/common/accessibility.js';
 import { ContextScopedFindInput, ContextScopedReplaceInput } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
@@ -41,32 +41,32 @@ import { defaultToggleStyles, defaultInputBoxStyles } from '../../../../platform
 import { HoverStyle } from '../../../../base/browser/ui/hover/hover.js';
 
 registerCss(findWidget);
-const findCollapsedIcon = registerIcon("find-collapsed", Codicon.chevronRight, ( localize(1061, "Icon to indicate that the editor find widget is collapsed.")));
-const findExpandedIcon = registerIcon("find-expanded", Codicon.chevronDown, ( localize(1062, "Icon to indicate that the editor find widget is expanded.")));
-const findSelectionIcon = registerIcon("find-selection", Codicon.selection, ( localize(1063, "Icon for 'Find in Selection' in the editor find widget.")));
-const findReplaceIcon = registerIcon("find-replace", Codicon.replace, ( localize(1064, "Icon for 'Replace' in the editor find widget.")));
-const findReplaceAllIcon = registerIcon("find-replace-all", Codicon.replaceAll, ( localize(1065, "Icon for 'Replace All' in the editor find widget.")));
-const findPreviousMatchIcon = registerIcon("find-previous-match", Codicon.arrowUp, ( localize(1066, "Icon for 'Find Previous' in the editor find widget.")));
-const findNextMatchIcon = registerIcon("find-next-match", Codicon.arrowDown, ( localize(1067, "Icon for 'Find Next' in the editor find widget.")));
-const NLS_FIND_DIALOG_LABEL = ( localize(1068, "Find / Replace"));
-const NLS_FIND_INPUT_LABEL = ( localize(1069, "Find"));
-const NLS_FIND_INPUT_PLACEHOLDER = ( localize(1070, "Find"));
-const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(1071, "Previous Match"));
-const NLS_NEXT_MATCH_BTN_LABEL = ( localize(1072, "Next Match"));
-const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localize(1073, "Find in Selection"));
-const NLS_CLOSE_BTN_LABEL = ( localize(1074, "Close"));
-const NLS_REPLACE_INPUT_LABEL = ( localize(1075, "Replace"));
-const NLS_REPLACE_INPUT_PLACEHOLDER = ( localize(1076, "Replace"));
-const NLS_REPLACE_BTN_LABEL = ( localize(1077, "Replace"));
-const NLS_REPLACE_ALL_BTN_LABEL = ( localize(1078, "Replace All"));
-const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localize(1079, "Toggle Replace"));
+const findCollapsedIcon = registerIcon("find-collapsed", Codicon.chevronRight, ( localize(1081, "Icon to indicate that the editor find widget is collapsed.")));
+const findExpandedIcon = registerIcon("find-expanded", Codicon.chevronDown, ( localize(1082, "Icon to indicate that the editor find widget is expanded.")));
+const findSelectionIcon = registerIcon("find-selection", Codicon.selection, ( localize(1083, "Icon for 'Find in Selection' in the editor find widget.")));
+const findReplaceIcon = registerIcon("find-replace", Codicon.replace, ( localize(1084, "Icon for 'Replace' in the editor find widget.")));
+const findReplaceAllIcon = registerIcon("find-replace-all", Codicon.replaceAll, ( localize(1085, "Icon for 'Replace All' in the editor find widget.")));
+const findPreviousMatchIcon = registerIcon("find-previous-match", Codicon.arrowUp, ( localize(1086, "Icon for 'Find Previous' in the editor find widget.")));
+const findNextMatchIcon = registerIcon("find-next-match", Codicon.arrowDown, ( localize(1087, "Icon for 'Find Next' in the editor find widget.")));
+const NLS_FIND_DIALOG_LABEL = ( localize(1088, "Find / Replace"));
+const NLS_FIND_INPUT_LABEL = ( localize(1089, "Find"));
+const NLS_FIND_INPUT_PLACEHOLDER = ( localize(1090, "Find"));
+const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(1091, "Previous Match"));
+const NLS_NEXT_MATCH_BTN_LABEL = ( localize(1092, "Next Match"));
+const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localize(1093, "Find in Selection"));
+const NLS_CLOSE_BTN_LABEL = ( localize(1094, "Close"));
+const NLS_REPLACE_INPUT_LABEL = ( localize(1095, "Replace"));
+const NLS_REPLACE_INPUT_PLACEHOLDER = ( localize(1096, "Replace"));
+const NLS_REPLACE_BTN_LABEL = ( localize(1097, "Replace"));
+const NLS_REPLACE_ALL_BTN_LABEL = ( localize(1098, "Replace All"));
+const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localize(1099, "Toggle Replace"));
 const NLS_MATCHES_COUNT_LIMIT_TITLE = ( localize(
-    1080,
+    1100,
     "Only the first {0} results are highlighted, but all find operations work on the entire text.",
     MATCHES_LIMIT
 ));
-const NLS_MATCHES_LOCATION = ( localize(1081, "{0} of {1}"));
-const NLS_NO_RESULTS = ( localize(1082, "No results"));
+const NLS_MATCHES_LOCATION = ( localize(1101, "{0} of {1}"));
+const NLS_NO_RESULTS = ( localize(1102, "No results"));
 const FIND_WIDGET_INITIAL_WIDTH = 419;
 const PART_WIDTH = 275;
 const FIND_INPUT_AREA_WIDTH = PART_WIDTH - 54;
@@ -109,13 +109,19 @@ class FindWidget extends Widget {
         contextKeyService,
         _hoverService,
         _findWidgetSearchHistory,
-        _replaceWidgetHistory
+        _replaceWidgetHistory,
+        _configurationService,
+        _accessibilityService
     ) {
         super();
         this._hoverService = _hoverService;
         this._findWidgetSearchHistory = _findWidgetSearchHistory;
         this._replaceWidgetHistory = _replaceWidgetHistory;
+        this._configurationService = _configurationService;
+        this._accessibilityService = _accessibilityService;
         this._cachedHeight = null;
+        this._lastFocusedInputWasReplace = false;
+        this._lastFocusedElement = null;
         this._revealTimeouts = [];
         this._codeEditor = codeEditor;
         this._controller = controller;
@@ -126,6 +132,7 @@ class FindWidget extends Widget {
         this._isVisible = false;
         this._isReplaceVisible = false;
         this._ignoreChangeEvent = false;
+        this._accessibilityHelpHintAnnounced = false;
         this._updateHistoryDelayer = ( new Delayer(500));
         this._register(toDisposable(() => this._updateHistoryDelayer.cancel()));
         this._register(this._state.onFindReplaceStateChange(e => this._onStateChanged(e)));
@@ -184,6 +191,7 @@ class FindWidget extends Widget {
         this._findFocusTracker = this._register(trackFocus(this._findInput.inputBox.inputElement));
         this._register(this._findFocusTracker.onDidFocus(() => {
             this._findInputFocused.set(true);
+            this._lastFocusedInputWasReplace = false;
             this._updateSearchScope();
         }));
         this._register(this._findFocusTracker.onDidBlur(() => {
@@ -193,11 +201,25 @@ class FindWidget extends Widget {
         this._replaceFocusTracker = this._register(trackFocus(this._replaceInput.inputBox.inputElement));
         this._register(this._replaceFocusTracker.onDidFocus(() => {
             this._replaceInputFocused.set(true);
+            this._lastFocusedInputWasReplace = true;
             this._updateSearchScope();
         }));
         this._register(this._replaceFocusTracker.onDidBlur(() => {
             this._replaceInputFocused.set(false);
         }));
+        this._findWidgetFocused = CONTEXT_FIND_WIDGET_FOCUSED.bindTo(contextKeyService);
+        this._widgetFocusTracker = this._register(trackFocus(this._domNode));
+        this._register(this._widgetFocusTracker.onDidFocus(() => {
+            this._findWidgetFocused.set(true);
+        }));
+        this._register(this._widgetFocusTracker.onDidBlur(() => {
+            this._findWidgetFocused.set(false);
+        }));
+        this._register(addDisposableListener(this._domNode, "focusin", e => {
+            if (isHTMLElement(e.target)) {
+                this._lastFocusedElement = e.target;
+            }
+        }));
         this._codeEditor.addOverlayWidget(this);
         if (this._codeEditor.getOption(EditorOption.find).addExtraSpaceOnTop) {
             this._viewZone = ( new FindWidgetViewZone(0));
@@ -224,6 +246,24 @@ class FindWidget extends Widget {
     getDomNode() {
         return this._domNode;
     }
+    get lastFocusedInputWasReplace() {
+        return this._lastFocusedInputWasReplace;
+    }
+    get lastFocusedElement() {
+        return this._lastFocusedElement;
+    }
+    focusLastElement() {
+        if (!this._isVisible) {
+            return;
+        }
+        if (this._lastFocusedElement && this._domNode.contains(this._lastFocusedElement) && getWindow(this._lastFocusedElement).document.body.contains(this._lastFocusedElement)) {
+            this._lastFocusedElement.focus();
+        } else if (this._lastFocusedInputWasReplace) {
+            this.focusReplaceInput();
+        } else {
+            this.focusFindInput();
+        }
+    }
     getPosition() {
         if (this._isVisible) {
             return {
@@ -348,12 +388,12 @@ class FindWidget extends Widget {
         MAX_MATCHES_COUNT_WIDTH = Math.max(MAX_MATCHES_COUNT_WIDTH, this._matchesCount.clientWidth);
     }
     _getAriaLabel(label, currentMatch, searchString) {
+        let result;
         if (label === NLS_NO_RESULTS) {
-            return searchString === "" ? ( localize(1083, "{0} found", label)) : ( localize(1084, "{0} found for '{1}'", label, searchString));
-        }
-        if (currentMatch) {
+            result = searchString === "" ? ( localize(1103, "{0} found", label)) : ( localize(1104, "{0} found for '{1}'", label, searchString));
+        } else if (currentMatch) {
             const ariaLabel = ( localize(
-                1085,
+                1105,
                 "{0} found for '{1}', at {2}",
                 label,
                 searchString,
@@ -362,11 +402,14 @@ class FindWidget extends Widget {
             const model = this._codeEditor.getModel();
             if (model && (currentMatch.startLineNumber <= model.getLineCount()) && (currentMatch.startLineNumber >= 1)) {
                 const lineContent = model.getLineContent(currentMatch.startLineNumber);
-                return `${lineContent}, ${ariaLabel}`;
+                result = `${lineContent}, ${ariaLabel}`;
+            } else {
+                result = ariaLabel;
             }
-            return ariaLabel;
+        } else {
+            result = ( localize(1106, "{0} found for '{1}'", label, searchString));
         }
-        return localize(1086, "{0} found for '{1}'", label, searchString);
+        return result;
     }
     _updateToggleSelectionFindButton() {
         const selection = this._codeEditor.getSelection();
@@ -425,6 +468,7 @@ class FindWidget extends Widget {
             this._revealTimeouts.push(setTimeout(() => {
                 this._domNode.classList.add("visible");
                 this._domNode.setAttribute("aria-hidden", "false");
+                this._updateFindInputAriaLabel();
             }, 0));
             this._revealTimeouts.push(setTimeout(() => {
                 this._findInput.validate();
@@ -464,6 +508,7 @@ class FindWidget extends Widget {
         this._revealTimeouts = [];
         if (this._isVisible) {
             this._isVisible = false;
+            this._accessibilityHelpHintAnnounced = false;
             this._updateButtons();
             this._domNode.classList.remove("visible");
             this._domNode.setAttribute("aria-hidden", "true");
@@ -1075,6 +1120,29 @@ class FindWidget extends Widget {
     updateAccessibilitySupport() {
         const value = this._codeEditor.getOption(EditorOption.accessibilitySupport);
         this._findInput.setFocusInputOnOptionClick(value !== AccessibilitySupport.Enabled);
+        this._updateFindInputAriaLabel();
+    }
+    _updateFindInputAriaLabel() {
+        let findLabel = NLS_FIND_INPUT_LABEL;
+        let replaceLabel = NLS_REPLACE_INPUT_LABEL;
+        if (!this._accessibilityHelpHintAnnounced && this._configurationService.getValue("accessibility.verbosity.find") && this._accessibilityService.isScreenReaderOptimized()) {
+            const accessibilityHelpKeybinding = this._keybindingService.lookupKeybinding("editor.action.accessibilityHelp")?.getAriaLabel();
+            if (accessibilityHelpKeybinding) {
+                const hint = ( localize(1107, "Press {0} for accessibility help", accessibilityHelpKeybinding));
+                findLabel = ( localize(1108, "{0}, {1}", findLabel, hint));
+                replaceLabel = ( localize(1109, "{0}, {1}", replaceLabel, hint));
+            }
+            this._accessibilityHelpHintAnnounced = true;
+            this._labelResetTimeout?.dispose();
+            this._labelResetTimeout = disposableTimeout(() => {
+                if (this._isVisible) {
+                    this._findInput.inputBox.setAriaLabel(NLS_FIND_INPUT_LABEL);
+                    this._replaceInput.inputBox.setAriaLabel(NLS_REPLACE_INPUT_LABEL);
+                }
+            }, 1000);
+        }
+        this._findInput.inputBox.setAriaLabel(findLabel);
+        this._replaceInput.inputBox.setAriaLabel(replaceLabel);
     }
     getViewState() {
         let widgetViewZoneVisible = false;

package/vscode/src/vs/editor/contrib/floatingMenu/browser/floatingMenu.css

@@ -7,16 +7,39 @@
 	padding: 2px 4px;
 	color: var(--vscode-foreground);
 	background-color: var(--vscode-editorWidget-background);
-	border-radius: 6px;
+	border-radius: var(--vscode-cornerRadius-medium);
 	border: 1px solid var(--vscode-contrastBorder);
 	display: flex;
 	align-items: center;
 	justify-content: center;
 	gap: 4px;
 	z-index: 10;
-	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+	box-shadow: var(--vscode-shadow-lg);
 	overflow: hidden;
 
+	&.single-button {
+		background-color: transparent;
+		border-width: 0;
+		padding: 0;
+		overflow: visible;
+
+		.action-item > .action-label,
+		.action-item > .action-label.codicon:not(.separator) {
+			height: 28px;
+			line-height: 28px;
+			border-radius: var(--vscode-cornerRadius-medium);
+			box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+		}
+
+		.action-item > .action-label {
+			padding: 0 8px;
+		}
+
+		.action-item > .action-label.codicon:not(.separator) {
+			width: 28px;
+		}
+	}
+
 	.actions-container {
 		gap: 4px;
 	}
@@ -25,7 +48,7 @@
 		padding: 4px 6px;
 		font-size: 11px;
 		line-height: 14px;
-		border-radius: 4px;
+		border-radius: var(--vscode-cornerRadius-small);
 	}
 
 	.action-item > .action-label.codicon:not(.separator) {
@@ -50,3 +73,16 @@
 		background-color: var(--vscode-button-hoverBackground) !important;
 	}
 }
+
+.hc-black .floating-menu-overlay-widget.single-button,
+.hc-light .floating-menu-overlay-widget.single-button {
+	border-width: 1px;
+	border-style: solid;
+	border-color: var(--vscode-contrastBorder);
+	background-color: var(--vscode-editorWidget-background);
+	padding: 0;
+	.action-item > .action-label,
+	.action-item > .action-label.codicon:not(.separator) {
+		box-shadow: none;
+	}
+}

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

@@ -1,9 +1,10 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { Separator } from '../../../../base/common/actions.js';
 import { h } from '../../../../base/browser/dom.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { getActionBarActions, MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import '../../../../base/common/observableInternal/index.js';
+import { getActionBarActions, MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuWorkbenchToolBar, HiddenItemStrategy } from '../../../../platform/actions/browser/toolbar.js';
 import { MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
@@ -59,20 +60,23 @@ let FloatingEditorToolbarWidget = class FloatingEditorToolbarWidget extends Disp
         super();
         const menu = this._register(menuService.createMenu(_menuId, _scopedContextKeyService));
         const menuGroupsObs = observableFromEvent(this, menu.onDidChange, () => menu.getActions());
-        const menuPrimaryActionIdObs = derived(reader => {
+        const menuPrimaryActionsObs = derived(reader => {
             const menuGroups = menuGroupsObs.read(reader);
             const {
                 primary
             } = getActionBarActions(menuGroups, () => true);
-            return primary.length > 0 ? primary[0].id : undefined;
+            return primary.filter(a => a.id !== Separator.ID);
         });
-        this.hasActions = derived(reader => menuGroupsObs.read(reader).length > 0);
+        this.hasActions = derived(reader => menuPrimaryActionsObs.read(reader).length > 0);
         this.element = h("div.floating-menu-overlay-widget").root;
         this._register(toDisposable(() => this.element.remove()));
-        this.element.style.height = "26px";
         this._register(autorun(reader => {
-            const hasActions = this.hasActions.read(reader);
-            const menuPrimaryActionId = menuPrimaryActionIdObs.read(reader);
+            const primaryActions = menuPrimaryActionsObs.read(reader);
+            const hasActions = primaryActions.length > 0;
+            const menuPrimaryActionId = hasActions ? primaryActions[0].id : undefined;
+            const isSingleButton = primaryActions.length === 1;
+            this.element.classList.toggle("single-button", isSingleButton);
+            this.element.style.height = isSingleButton ? "28px" : "26px";
             if (!hasActions) {
                 return;
             }

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

@@ -548,7 +548,7 @@ class UnfoldAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.unfold",
-            label: ( localize2(1087, "Unfold")),
+            label: ( localize2(1110, "Unfold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -606,7 +606,7 @@ class UnFoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.unfoldRecursively",
-            label: ( localize2(1088, "Unfold Recursively")),
+            label: ( localize2(1111, "Unfold Recursively")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -623,7 +623,7 @@ class FoldAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.fold",
-            label: ( localize2(1089, "Fold")),
+            label: ( localize2(1112, "Fold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -685,7 +685,7 @@ class ToggleFoldAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.toggleFold",
-            label: ( localize2(1090, "Toggle Fold")),
+            label: ( localize2(1113, "Toggle Fold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -703,7 +703,7 @@ class FoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.foldRecursively",
-            label: ( localize2(1091, "Fold Recursively")),
+            label: ( localize2(1114, "Fold Recursively")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -721,7 +721,7 @@ class ToggleFoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.toggleFoldRecursively",
-            label: ( localize2(1092, "Toggle Fold Recursively")),
+            label: ( localize2(1115, "Toggle Fold Recursively")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -742,7 +742,7 @@ class FoldAllBlockCommentsAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.foldAllBlockComments",
-            label: ( localize2(1093, "Fold All Block Comments")),
+            label: ( localize2(1116, "Fold All Block Comments")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -777,7 +777,7 @@ class FoldAllRegionsAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.foldAllMarkerRegions",
-            label: ( localize2(1094, "Fold All Regions")),
+            label: ( localize2(1117, "Fold All Regions")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -812,7 +812,7 @@ class UnfoldAllRegionsAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.unfoldAllMarkerRegions",
-            label: ( localize2(1095, "Unfold All Regions")),
+            label: ( localize2(1118, "Unfold All Regions")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -847,7 +847,7 @@ class FoldAllExceptAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.foldAllExcept",
-            label: ( localize2(1096, "Fold All Except Selected")),
+            label: ( localize2(1119, "Fold All Except Selected")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -865,7 +865,7 @@ class UnfoldAllExceptAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.unfoldAllExcept",
-            label: ( localize2(1097, "Unfold All Except Selected")),
+            label: ( localize2(1120, "Unfold All Except Selected")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -883,7 +883,7 @@ class FoldAllAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.foldAll",
-            label: ( localize2(1098, "Fold All")),
+            label: ( localize2(1121, "Fold All")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -900,7 +900,7 @@ class UnfoldAllAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.unfoldAll",
-            label: ( localize2(1099, "Unfold All")),
+            label: ( localize2(1122, "Unfold All")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -931,7 +931,7 @@ class GotoParentFoldAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.gotoParentFold",
-            label: ( localize2(1100, "Go to Parent Fold")),
+            label: ( localize2(1123, "Go to Parent Fold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -958,7 +958,7 @@ class GotoPreviousFoldAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.gotoPreviousFold",
-            label: ( localize2(1101, "Go to Previous Folding Range")),
+            label: ( localize2(1124, "Go to Previous Folding Range")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -985,7 +985,7 @@ class GotoNextFoldAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.gotoNextFold",
-            label: ( localize2(1102, "Go to Next Folding Range")),
+            label: ( localize2(1125, "Go to Next Folding Range")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -1012,7 +1012,7 @@ class FoldRangeFromSelectionAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.createFoldingRangeFromSelection",
-            label: ( localize2(1103, "Create Folding Range from Selection")),
+            label: ( localize2(1126, "Create Folding Range from Selection")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -1060,7 +1060,7 @@ class RemoveFoldRangeFromSelectionAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.removeManualFoldingRanges",
-            label: ( localize2(1104, "Remove Manual Folding Ranges")),
+            label: ( localize2(1127, "Remove Manual Folding Ranges")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -1095,7 +1095,7 @@ class ToggleImportFoldAction extends FoldingAction {
     constructor() {
         super({
             id: "editor.toggleImportFold",
-            label: ( localize2(1105, "Toggle Import Fold")),
+            label: ( localize2(1128, "Toggle Import Fold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -1142,7 +1142,7 @@ registerEditorAction(ToggleImportFoldAction);
 for (let i = 1; i <= 7; i++) {
     registerInstantiatedEditorAction(( new FoldLevelAction({
         id: FoldLevelAction.ID(i),
-        label: ( localize2(1106, "Fold Level {0}", i)),
+        label: ( localize2(1129, "Fold Level {0}", i)),
         precondition: CONTEXT_FOLDING_ENABLED,
         kbOpts: {
             kbExpr: EditorContextKeys.editorTextFocus,

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

@@ -24,7 +24,7 @@ const foldBackground = registerColor("editor.foldBackground", {
     hcDark: null,
     hcLight: null
 }, ( localize(
-    1107,
+    1130,
     "Background color behind folded ranges. The color must not be opaque so as not to hide underlying decorations."
 )), true);
 registerColor("editor.foldPlaceholderForeground", {
@@ -33,20 +33,20 @@ registerColor("editor.foldPlaceholderForeground", {
     hcDark: null,
     hcLight: null
 }, ( localize(
-    1108,
+    1131,
     "Color of the collapsed text after the first line of a folded range."
 )));
-registerColor("editorGutter.foldingControlForeground", iconForeground, ( localize(1109, "Color of the folding control in the editor gutter.")));
-const foldingExpandedIcon = registerIcon("folding-expanded", Codicon.chevronDown, ( localize(1110, "Icon for expanded ranges in the editor glyph margin.")));
-const foldingCollapsedIcon = registerIcon("folding-collapsed", Codicon.chevronRight, ( localize(1111, "Icon for collapsed ranges in the editor glyph margin.")));
-const foldingManualCollapsedIcon = registerIcon("folding-manual-collapsed", foldingCollapsedIcon, ( localize(1112, "Icon for manually collapsed ranges in the editor glyph margin.")));
-const foldingManualExpandedIcon = registerIcon("folding-manual-expanded", foldingExpandedIcon, ( localize(1113, "Icon for manually expanded ranges in the editor glyph margin.")));
+registerColor("editorGutter.foldingControlForeground", iconForeground, ( localize(1132, "Color of the folding control in the editor gutter.")));
+const foldingExpandedIcon = registerIcon("folding-expanded", Codicon.chevronDown, ( localize(1133, "Icon for expanded ranges in the editor glyph margin.")));
+const foldingCollapsedIcon = registerIcon("folding-collapsed", Codicon.chevronRight, ( localize(1134, "Icon for collapsed ranges in the editor glyph margin.")));
+const foldingManualCollapsedIcon = registerIcon("folding-manual-collapsed", foldingCollapsedIcon, ( localize(1135, "Icon for manually collapsed ranges in the editor glyph margin.")));
+const foldingManualExpandedIcon = registerIcon("folding-manual-expanded", foldingExpandedIcon, ( localize(1136, "Icon for manually expanded ranges in the editor glyph margin.")));
 const foldedBackgroundMinimap = {
     color: themeColorFromId(foldBackground),
     position: MinimapPosition.Inline
 };
-const collapsed = ( localize(1114, "Click to expand the range."));
-const expanded = ( localize(1115, "Click to collapse the range."));
+const collapsed = ( localize(1137, "Click to expand the range."));
+const expanded = ( localize(1138, "Click to collapse the range."));
 class FoldingDecorationProvider {
     static {
         this.COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({

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

@@ -2,6 +2,7 @@ import { Event } from "../../../../base/common/event.js";
 import { IModelDecorationOptions, IModelDecorationsChangeAccessor, ITextModel } from "../../../common/model.js";
 import { FoldingRegion, FoldingRegions, ILineRange, FoldSource } from "./foldingRanges.js";
 import { SelectedLines } from "./folding.js";
+import { IDisposable } from "../../../../base/common/lifecycle.js";
 export interface IDecorationProvider {
     getDecorationOption(isCollapsed: boolean, isHidden: boolean, isManual: boolean): IModelDecorationOptions;
     changeDecorations<T>(callback: (changeAccessor: IModelDecorationsChangeAccessor) => T): T | null;
@@ -17,7 +18,7 @@ interface ILineMemento extends ILineRange {
     source?: FoldSource;
 }
 export type CollapseMemento = ILineMemento[];
-export declare class FoldingModel {
+export declare class FoldingModel implements IDisposable {
     private readonly _textModel;
     private readonly _decorationProvider;
     private _regions;

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

@@ -200,6 +200,7 @@ class FoldingModel {
     }
     dispose() {
         this._decorationProvider.removeDecorations(this._editorDecorationIds);
+        this._updateEventEmitter.dispose();
     }
     getAllRegionsAtLine(lineNumber, filter) {
         const result = [];

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

@@ -1,9 +1,10 @@
 import { Event } from "../../../../base/common/event.js";
+import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { IRange } from "../../../common/core/range.js";
 import { Selection } from "../../../common/core/selection.js";
 import { IModelContentChangedEvent } from "../../../common/textModelEvents.js";
 import { FoldingModel } from "./foldingModel.js";
-export declare class HiddenRangeModel {
+export declare class HiddenRangeModel implements IDisposable {
     private readonly _foldingModel;
     private _hiddenRanges;
     private _foldingModelListener;

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

@@ -108,6 +108,7 @@ class HiddenRangeModel {
             this._foldingModelListener.dispose();
             this._foldingModelListener = null;
         }
+        this._updateEventEmitter.dispose();
     }
 }
 function isInside(line, range) {

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(1116, "Increase Editor Font Size")),
+            label: ( localize2(1139, "Increase Editor Font Size")),
             precondition: undefined
         });
     }
@@ -19,7 +19,7 @@ class EditorFontZoomOut extends EditorAction {
     constructor() {
         super({
             id: "editor.action.fontZoomOut",
-            label: ( localize2(1117, "Decrease Editor Font Size")),
+            label: ( localize2(1140, "Decrease Editor Font Size")),
             precondition: undefined
         });
     }
@@ -31,7 +31,7 @@ class EditorFontZoomReset extends EditorAction {
     constructor() {
         super({
             id: "editor.action.fontZoomReset",
-            label: ( localize2(1118, "Reset Editor Font Size")),
+            label: ( localize2(1141, "Reset Editor Font Size")),
             precondition: undefined
         });
     }