@codingame/monaco-vscode-api 22.1.8 → 23.0.0

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

@@ -309,7 +309,7 @@ let CommonFindController = class CommonFindController extends Disposable {
     replaceAll() {
         if (this._model) {
             if (this._editor.getModel()?.isTooLargeForHeapOperation()) {
-                this._notificationService.warn(( localize(1032, "The file is too large to perform a replace all operation.")));
+                this._notificationService.warn(( localize(1031, "The file is too large to perform a replace all operation.")));
                 return false;
             }
             this._model.replaceAll();
@@ -431,7 +431,7 @@ FindController = ( __decorate([
 ], FindController));
 const StartFindAction = registerMultiEditorAction(( new MultiEditorAction({
     id: FIND_IDS.StartFindAction,
-    label: ( localize2(1033, "Find")),
+    label: ( localize2(1032, "Find")),
     precondition: ( ContextKeyExpr.or(EditorContextKeys.focus, ( ContextKeyExpr.has('editorIsOpen')))),
     kbOpts: {
         kbExpr: null,
@@ -441,7 +441,7 @@ const StartFindAction = registerMultiEditorAction(( new MultiEditorAction({
     menuOpts: {
         menuId: MenuId.MenubarEditMenu,
         group: '3_find',
-        title: ( localize(1034, "&&Find")),
+        title: ( localize(1033, "&&Find")),
         order: 1
     }
 })));
@@ -482,7 +482,7 @@ class StartFindWithArgsAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.StartFindWithArgs,
-            label: ( localize2(1035, "Find with Arguments")),
+            label: ( localize2(1034, "Find with Arguments")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: null,
@@ -522,7 +522,7 @@ class StartFindWithSelectionAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.StartFindWithSelection,
-            label: ( localize2(1036, "Find with Selection")),
+            label: ( localize2(1035, "Find with Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: null,
@@ -551,79 +551,74 @@ class StartFindWithSelectionAction extends EditorAction {
         }
     }
 }
-class MatchFindAction extends EditorAction {
-    async run(accessor, editor) {
-        const controller = CommonFindController.get(editor);
-        if (controller && !this._run(controller)) {
-            await controller.start({
-                forceRevealReplace: false,
-                seedSearchStringFromSelection: (controller.getState().searchString.length === 0) && editor.getOption(EditorOption.find).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
-                seedSearchStringFromNonEmptySelection: editor.getOption(EditorOption.find).seedSearchStringFromSelection === 'selection',
-                seedSearchStringFromGlobalClipboard: true,
-                shouldFocus: FindStartFocusAction.NoFocusChange,
-                shouldAnimate: true,
-                updateSearchScope: false,
-                loop: editor.getOption(EditorOption.find).loop
-            });
-            this._run(controller);
-        }
-    }
-}
-class NextMatchFindAction extends MatchFindAction {
-    constructor() {
-        super({
-            id: FIND_IDS.NextMatchFindAction,
-            label: ( localize2(1037, "Find Next")),
-            precondition: undefined,
-            kbOpts: [{
-                    kbExpr: EditorContextKeys.focus,
-                    primary: KeyCode.F3,
-                    mac: { primary: KeyMod$1.CtrlCmd | KeyCode.KeyG, secondary: [KeyCode.F3] },
-                    weight: KeybindingWeight.EditorContrib
-                }, {
-                    kbExpr: ( ContextKeyExpr.and(EditorContextKeys.focus, CONTEXT_FIND_INPUT_FOCUSED)),
-                    primary: KeyCode.Enter,
-                    weight: KeybindingWeight.EditorContrib
-                }]
-        });
+async function matchFindAction(editor, next) {
+    const controller = CommonFindController.get(editor);
+    if (!controller) {
+        return;
     }
-    _run(controller) {
-        const result = controller.moveToNextMatch();
+    const runMatch = () => {
+        const result = next ? controller.moveToNextMatch() : controller.moveToPrevMatch();
         if (result) {
             controller.editor.pushUndoStop();
             return true;
         }
         return false;
-    }
-}
-class PreviousMatchFindAction extends MatchFindAction {
-    constructor() {
-        super({
-            id: FIND_IDS.PreviousMatchFindAction,
-            label: ( localize2(1038, "Find Previous")),
-            precondition: undefined,
-            kbOpts: [{
-                    kbExpr: EditorContextKeys.focus,
-                    primary: KeyMod$1.Shift | KeyCode.F3,
-                    mac: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyG, secondary: [KeyMod$1.Shift | KeyCode.F3] },
-                    weight: KeybindingWeight.EditorContrib
-                }, {
-                    kbExpr: ( ContextKeyExpr.and(EditorContextKeys.focus, CONTEXT_FIND_INPUT_FOCUSED)),
-                    primary: KeyMod$1.Shift | KeyCode.Enter,
-                    weight: KeybindingWeight.EditorContrib
-                }
-            ]
+    };
+    if (!runMatch()) {
+        await controller.start({
+            forceRevealReplace: false,
+            seedSearchStringFromSelection: (controller.getState().searchString.length === 0) && editor.getOption(EditorOption.find).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
+            seedSearchStringFromNonEmptySelection: editor.getOption(EditorOption.find).seedSearchStringFromSelection === 'selection',
+            seedSearchStringFromGlobalClipboard: true,
+            shouldFocus: FindStartFocusAction.NoFocusChange,
+            shouldAnimate: true,
+            updateSearchScope: false,
+            loop: editor.getOption(EditorOption.find).loop
         });
-    }
-    _run(controller) {
-        return controller.moveToPrevMatch();
+        runMatch();
     }
 }
+const NextMatchFindAction = registerMultiEditorAction(( new MultiEditorAction({
+    id: FIND_IDS.NextMatchFindAction,
+    label: ( localize2(1036, "Find Next")),
+    precondition: undefined,
+    kbOpts: [{
+            kbExpr: EditorContextKeys.focus,
+            primary: KeyCode.F3,
+            mac: { primary: KeyMod$1.CtrlCmd | KeyCode.KeyG, secondary: [KeyCode.F3] },
+            weight: KeybindingWeight.EditorContrib
+        }, {
+            kbExpr: ( ContextKeyExpr.and(EditorContextKeys.focus, CONTEXT_FIND_INPUT_FOCUSED)),
+            primary: KeyCode.Enter,
+            weight: KeybindingWeight.EditorContrib
+        }]
+})));
+NextMatchFindAction.addImplementation(0, async (accessor, editor, args) => {
+    return matchFindAction(editor, true);
+});
+const PreviousMatchFindAction = registerMultiEditorAction(( new MultiEditorAction({
+    id: FIND_IDS.PreviousMatchFindAction,
+    label: ( localize2(1037, "Find Previous")),
+    precondition: undefined,
+    kbOpts: [{
+            kbExpr: EditorContextKeys.focus,
+            primary: KeyMod$1.Shift | KeyCode.F3,
+            mac: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyG, secondary: [KeyMod$1.Shift | KeyCode.F3] },
+            weight: KeybindingWeight.EditorContrib
+        }, {
+            kbExpr: ( ContextKeyExpr.and(EditorContextKeys.focus, CONTEXT_FIND_INPUT_FOCUSED)),
+            primary: KeyMod$1.Shift | KeyCode.Enter,
+            weight: KeybindingWeight.EditorContrib
+        }]
+})));
+PreviousMatchFindAction.addImplementation(0, async (accessor, editor, args) => {
+    return matchFindAction(editor, false);
+});
 class MoveToMatchFindAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.GoToMatchFindAction,
-            label: ( localize2(1039, "Go to Match...")),
+            label: ( localize2(1038, "Go to Match...")),
             precondition: CONTEXT_FIND_WIDGET_VISIBLE
         });
         this._highlightDecorations = [];
@@ -638,7 +633,7 @@ class MoveToMatchFindAction extends EditorAction {
             const notificationService = accessor.get(INotificationService);
             notificationService.notify({
                 severity: Severity$1.Warning,
-                message: ( localize(1040, "No matches. Try searching for something else."))
+                message: ( localize(1039, "No matches. Try searching for something else."))
             });
             return;
         }
@@ -646,7 +641,7 @@ class MoveToMatchFindAction extends EditorAction {
         const disposables = ( new DisposableStore());
         const inputBox = disposables.add(quickInputService.createInputBox());
         inputBox.placeholder = ( localize(
-            1041,
+            1040,
             "Type a number to go to a specific match (between 1 and {0})",
             matchesCount
         ));
@@ -676,7 +671,7 @@ class MoveToMatchFindAction extends EditorAction {
             }
             else {
                 inputBox.validationMessage = ( localize(
-                    1042,
+                    1041,
                     "Please type a number between 1 and {0}",
                     controller.getState().matchesCount
                 ));
@@ -694,7 +689,7 @@ class MoveToMatchFindAction extends EditorAction {
             }
             else {
                 inputBox.validationMessage = ( localize(
-                    1042,
+                    1041,
                     "Please type a number between 1 and {0}",
                     controller.getState().matchesCount
                 ));
@@ -765,7 +760,7 @@ class NextSelectionMatchFindAction extends SelectionMatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.NextSelectionMatchFindAction,
-            label: ( localize2(1043, "Find Next Selection")),
+            label: ( localize2(1042, "Find Next Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.focus,
@@ -782,7 +777,7 @@ class PreviousSelectionMatchFindAction extends SelectionMatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.PreviousSelectionMatchFindAction,
-            label: ( localize2(1044, "Find Previous Selection")),
+            label: ( localize2(1043, "Find Previous Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.focus,
@@ -797,7 +792,7 @@ class PreviousSelectionMatchFindAction extends SelectionMatchFindAction {
 }
 const StartFindReplaceAction = registerMultiEditorAction(( new MultiEditorAction({
     id: FIND_IDS.StartFindReplaceAction,
-    label: ( localize2(1045, "Replace")),
+    label: ( localize2(1044, "Replace")),
     precondition: ( ContextKeyExpr.or(EditorContextKeys.focus, ( ContextKeyExpr.has('editorIsOpen')))),
     kbOpts: {
         kbExpr: null,
@@ -808,7 +803,7 @@ const StartFindReplaceAction = registerMultiEditorAction(( new MultiEditorAction
     menuOpts: {
         menuId: MenuId.MenubarEditMenu,
         group: '3_find',
-        title: ( localize(1046, "&&Replace")),
+        title: ( localize(1045, "&&Replace")),
         order: 2
     }
 })));
@@ -842,8 +837,6 @@ StartFindReplaceAction.addImplementation(0, (accessor, editor, args) => {
 registerEditorContribution(CommonFindController.ID, FindController, EditorContributionInstantiation.Eager);
 registerEditorAction(StartFindWithArgsAction);
 registerEditorAction(StartFindWithSelectionAction);
-registerEditorAction(NextMatchFindAction);
-registerEditorAction(PreviousMatchFindAction);
 registerEditorAction(MoveToMatchFindAction);
 registerEditorAction(NextSelectionMatchFindAction);
 registerEditorAction(PreviousSelectionMatchFindAction);
@@ -978,4 +971,4 @@ registerEditorCommand(( new FindCommand({
     }
 })));
 
-export { CommonFindController, FindController, FindStartFocusAction, MatchFindAction, MoveToMatchFindAction, NextMatchFindAction, NextSelectionMatchFindAction, PreviousMatchFindAction, PreviousSelectionMatchFindAction, SelectionMatchFindAction, StartFindAction, StartFindReplaceAction, StartFindWithArgsAction, StartFindWithSelectionAction, getSelectionSearchString };
+export { CommonFindController, FindController, FindStartFocusAction, MoveToMatchFindAction, NextMatchFindAction, NextSelectionMatchFindAction, PreviousMatchFindAction, PreviousSelectionMatchFindAction, SelectionMatchFindAction, StartFindAction, StartFindReplaceAction, StartFindWithArgsAction, StartFindWithSelectionAction, getSelectionSearchString };

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

@@ -18,7 +18,6 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-import { createInstantHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 
 registerCss(findOptionsWidget);
 class FindOptionsWidget extends Widget {
@@ -42,11 +41,11 @@ class FindOptionsWidget extends Widget {
             inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
             inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground),
         };
-        const hoverDelegate = this._register(createInstantHoverDelegate());
+        const hoverLifecycleOptions = { groupId: 'find-options-widget' };
         this.caseSensitive = this._register(( new CaseSensitiveToggle({
             appendTitle: this._keybindingLabelFor(FIND_IDS.ToggleCaseSensitiveCommand),
             isChecked: this._state.matchCase,
-            hoverDelegate,
+            hoverLifecycleOptions,
             ...toggleStyles
         })));
         this._domNode.appendChild(this.caseSensitive.domNode);
@@ -58,7 +57,7 @@ class FindOptionsWidget extends Widget {
         this.wholeWords = this._register(( new WholeWordsToggle({
             appendTitle: this._keybindingLabelFor(FIND_IDS.ToggleWholeWordCommand),
             isChecked: this._state.wholeWord,
-            hoverDelegate,
+            hoverLifecycleOptions,
             ...toggleStyles
         })));
         this._domNode.appendChild(this.wholeWords.domNode);
@@ -70,7 +69,7 @@ class FindOptionsWidget extends Widget {
         this.regex = this._register(( new RegexToggle({
             appendTitle: this._keybindingLabelFor(FIND_IDS.ToggleRegexCommand),
             isChecked: this._state.isRegex,
-            hoverDelegate,
+            hoverLifecycleOptions,
             ...toggleStyles
         })));
         this._domNode.appendChild(this.regex.domNode);

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

@@ -24,7 +24,7 @@
 	background-color: var(--vscode-editorWidget-background);
 }
 
-.monaco-workbench.reduce-motion .monaco-editor .find-widget {
+.monaco-reduce-motion .monaco-editor .find-widget {
 	transition: transform 0ms linear;
 }
 
@@ -41,7 +41,7 @@
 	display: flex;
 }
 
-.monaco-editor .find-widget.visible  {
+.monaco-editor .find-widget.visible {
 	transform: translateY(0);
 }
 
@@ -101,7 +101,7 @@
 .monaco-editor .find-widget .monaco-findInput {
 	vertical-align: middle;
 	display: flex;
-	flex:1;
+	flex: 1;
 }
 
 .monaco-editor .find-widget .monaco-findInput .monaco-scrollable-element {
@@ -201,7 +201,7 @@
 
 /* REDUCED */
 .monaco-editor .find-widget.reduced-find-widget .matchesCount {
-	display:none;
+	display: none;
 }
 
 /* NARROW (SMALLER THAN REDUCED) */
@@ -219,7 +219,7 @@
 .monaco-editor .find-widget.collapsed-find-widget .button.replace,
 .monaco-editor .find-widget.collapsed-find-widget .button.replace-all,
 .monaco-editor .find-widget.collapsed-find-widget > .find-part .monaco-findInput .controls {
-	display:none;
+	display: none;
 }
 
 .monaco-editor .find-widget.no-results .matchesCount {

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

@@ -7,9 +7,9 @@ import { FindReplaceState } from "./findState.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
 import { IKeybindingService } from "../../../../platform/keybinding/common/keybinding.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";
 import { IHistory } from "../../../../base/common/history.js";
+import { type IHoverLifecycleOptions } from "../../../../base/browser/ui/hover/hover.js";
 export declare const findSelectionIcon: ThemeIcon;
 export declare const findReplaceIcon: ThemeIcon;
 export declare const findReplaceAllIcon: ThemeIcon;
@@ -112,7 +112,7 @@ export interface ISimpleButtonOpts {
     readonly label: string;
     readonly className?: string;
     readonly icon?: ThemeIcon;
-    readonly hoverDelegate?: IHoverDelegate;
+    readonly hoverLifecycleOptions?: IHoverLifecycleOptions;
     readonly onTrigger: () => void;
     readonly onKeyDown?: (e: IKeyboardEvent) => void;
 }

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

@@ -1,6 +1,6 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
-import { createElement, trackFocus, getTotalWidth, getDomNodePagePosition, getTopLeftOffset, getComputedStyle } from '../../../../base/browser/dom.js';
+import { createElement, trackFocus, 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';
@@ -38,35 +38,35 @@ import { ThemeIcon } from '../../../../base/common/themables.js';
 import { isHighContrast } from '../../../../platform/theme/common/theme.js';
 import { assertReturnsDefined } from '../../../../base/common/types.js';
 import { defaultToggleStyles, defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { HoverStyle } from '../../../../base/browser/ui/hover/hover.js';
 
 registerCss(findWidget);
-const findCollapsedIcon = registerIcon('find-collapsed', Codicon.chevronRight, ( localize(1047, 'Icon to indicate that the editor find widget is collapsed.')));
-const findExpandedIcon = registerIcon('find-expanded', Codicon.chevronDown, ( localize(1048, 'Icon to indicate that the editor find widget is expanded.')));
-const findSelectionIcon = registerIcon('find-selection', Codicon.selection, ( localize(1049, 'Icon for \'Find in Selection\' in the editor find widget.')));
-const findReplaceIcon = registerIcon('find-replace', Codicon.replace, ( localize(1050, 'Icon for \'Replace\' in the editor find widget.')));
-const findReplaceAllIcon = registerIcon('find-replace-all', Codicon.replaceAll, ( localize(1051, 'Icon for \'Replace All\' in the editor find widget.')));
-const findPreviousMatchIcon = registerIcon('find-previous-match', Codicon.arrowUp, ( localize(1052, 'Icon for \'Find Previous\' in the editor find widget.')));
-const findNextMatchIcon = registerIcon('find-next-match', Codicon.arrowDown, ( localize(1053, 'Icon for \'Find Next\' in the editor find widget.')));
-const NLS_FIND_DIALOG_LABEL = ( localize(1054, "Find / Replace"));
-const NLS_FIND_INPUT_LABEL = ( localize(1055, "Find"));
-const NLS_FIND_INPUT_PLACEHOLDER = ( localize(1056, "Find"));
-const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(1057, "Previous Match"));
-const NLS_NEXT_MATCH_BTN_LABEL = ( localize(1058, "Next Match"));
-const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localize(1059, "Find in Selection"));
-const NLS_CLOSE_BTN_LABEL = ( localize(1060, "Close"));
-const NLS_REPLACE_INPUT_LABEL = ( localize(1061, "Replace"));
-const NLS_REPLACE_INPUT_PLACEHOLDER = ( localize(1062, "Replace"));
-const NLS_REPLACE_BTN_LABEL = ( localize(1063, "Replace"));
-const NLS_REPLACE_ALL_BTN_LABEL = ( localize(1064, "Replace All"));
-const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localize(1065, "Toggle Replace"));
+const findCollapsedIcon = registerIcon('find-collapsed', Codicon.chevronRight, ( localize(1046, 'Icon to indicate that the editor find widget is collapsed.')));
+const findExpandedIcon = registerIcon('find-expanded', Codicon.chevronDown, ( localize(1047, 'Icon to indicate that the editor find widget is expanded.')));
+const findSelectionIcon = registerIcon('find-selection', Codicon.selection, ( localize(1048, 'Icon for \'Find in Selection\' in the editor find widget.')));
+const findReplaceIcon = registerIcon('find-replace', Codicon.replace, ( localize(1049, 'Icon for \'Replace\' in the editor find widget.')));
+const findReplaceAllIcon = registerIcon('find-replace-all', Codicon.replaceAll, ( localize(1050, 'Icon for \'Replace All\' in the editor find widget.')));
+const findPreviousMatchIcon = registerIcon('find-previous-match', Codicon.arrowUp, ( localize(1051, 'Icon for \'Find Previous\' in the editor find widget.')));
+const findNextMatchIcon = registerIcon('find-next-match', Codicon.arrowDown, ( localize(1052, 'Icon for \'Find Next\' in the editor find widget.')));
+const NLS_FIND_DIALOG_LABEL = ( localize(1053, "Find / Replace"));
+const NLS_FIND_INPUT_LABEL = ( localize(1054, "Find"));
+const NLS_FIND_INPUT_PLACEHOLDER = ( localize(1055, "Find"));
+const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(1056, "Previous Match"));
+const NLS_NEXT_MATCH_BTN_LABEL = ( localize(1057, "Next Match"));
+const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localize(1058, "Find in Selection"));
+const NLS_CLOSE_BTN_LABEL = ( localize(1059, "Close"));
+const NLS_REPLACE_INPUT_LABEL = ( localize(1060, "Replace"));
+const NLS_REPLACE_INPUT_PLACEHOLDER = ( localize(1061, "Replace"));
+const NLS_REPLACE_BTN_LABEL = ( localize(1062, "Replace"));
+const NLS_REPLACE_ALL_BTN_LABEL = ( localize(1063, "Replace All"));
+const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localize(1064, "Toggle Replace"));
 const NLS_MATCHES_COUNT_LIMIT_TITLE = ( localize(
-    1066,
+    1065,
     "Only the first {0} results are highlighted, but all find operations work on the entire text.",
     MATCHES_LIMIT
 ));
-const NLS_MATCHES_LOCATION = ( localize(1067, "{0} of {1}"));
-const NLS_NO_RESULTS = ( localize(1068, "No results"));
+const NLS_MATCHES_LOCATION = ( localize(1066, "{0} of {1}"));
+const NLS_NO_RESULTS = ( localize(1067, "No results"));
 const FIND_WIDGET_INITIAL_WIDTH = 419;
 const PART_WIDTH = 275;
 const FIND_INPUT_AREA_WIDTH = PART_WIDTH - 54;
@@ -329,19 +329,19 @@ class FindWidget extends Widget {
         else {
             label = NLS_NO_RESULTS;
         }
-        this._matchesCount.appendChild(document.createTextNode(label));
+        this._matchesCount.appendChild(createTextNode(label));
         alert(this._getAriaLabel(label, this._state.currentMatch, this._state.searchString));
         MAX_MATCHES_COUNT_WIDTH = Math.max(MAX_MATCHES_COUNT_WIDTH, this._matchesCount.clientWidth);
     }
     _getAriaLabel(label, currentMatch, searchString) {
         if (label === NLS_NO_RESULTS) {
             return searchString === ''
-                ? ( localize(1069, "{0} found", label))
-                : ( localize(1070, "{0} found for '{1}'", label, searchString));
+                ? ( localize(1068, "{0} found", label))
+                : ( localize(1069, "{0} found for '{1}'", label, searchString));
         }
         if (currentMatch) {
             const ariaLabel = ( localize(
-                1071,
+                1070,
                 "{0} found for '{1}', at {2}",
                 label,
                 searchString,
@@ -354,7 +354,7 @@ class FindWidget extends Widget {
             }
             return ariaLabel;
         }
-        return localize(1072, "{0} found for '{1}'", label, searchString);
+        return localize(1071, "{0} found for '{1}'", label, searchString);
     }
     _updateToggleSelectionFindButton() {
         const selection = this._codeEditor.getSelection();
@@ -804,11 +804,11 @@ class FindWidget extends Widget {
         this._matchesCount = createElement('div');
         this._matchesCount.className = 'matchesCount';
         this._updateMatchesCount();
-        const hoverDelegate = this._register(createInstantHoverDelegate());
+        const hoverLifecycleOptions = { groupId: 'find-widget' };
         this._prevBtn = this._register(( new SimpleButton({
             label: NLS_PREVIOUS_MATCH_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.PreviousMatchFindAction),
             icon: findPreviousMatchIcon,
-            hoverDelegate,
+            hoverLifecycleOptions,
             onTrigger: () => {
                 assertReturnsDefined(this._codeEditor.getAction(FIND_IDS.PreviousMatchFindAction)).run().then(undefined, onUnexpectedError);
             }
@@ -816,7 +816,7 @@ class FindWidget extends Widget {
         this._nextBtn = this._register(( new SimpleButton({
             label: NLS_NEXT_MATCH_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.NextMatchFindAction),
             icon: findNextMatchIcon,
-            hoverDelegate,
+            hoverLifecycleOptions,
             onTrigger: () => {
                 assertReturnsDefined(this._codeEditor.getAction(FIND_IDS.NextMatchFindAction)).run().then(undefined, onUnexpectedError);
             }
@@ -834,7 +834,7 @@ class FindWidget extends Widget {
             icon: findSelectionIcon,
             title: NLS_TOGGLE_SELECTION_FIND_TITLE + this._keybindingLabelFor(FIND_IDS.ToggleSearchScopeCommand),
             isChecked: false,
-            hoverDelegate: hoverDelegate,
+            hoverLifecycleOptions,
             inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground),
             inputActiveOptionBorder: asCssVariable(inputActiveOptionBorder),
             inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
@@ -865,7 +865,7 @@ class FindWidget extends Widget {
         this._closeBtn = this._register(( new SimpleButton({
             label: NLS_CLOSE_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.CloseFindWidgetCommand),
             icon: widgetClose,
-            hoverDelegate,
+            hoverLifecycleOptions,
             onTrigger: () => {
                 this._state.change({ isRevealed: false, searchScope: null }, false);
             },
@@ -894,6 +894,7 @@ class FindWidget extends Widget {
             showHistoryHint: () => showHistoryKeybindingHint(this._keybindingService),
             inputBoxStyles: defaultInputBoxStyles,
             toggleStyles: defaultToggleStyles,
+            hoverLifecycleOptions,
         }, this._contextKeyService, true)));
         this._replaceInput.setPreserveCase(!!this._state.preserveCase);
         this._register(this._replaceInput.onKeyDown((e) => this._onReplaceInputKeyDown(e)));
@@ -927,11 +928,10 @@ class FindWidget extends Widget {
                 e.preventDefault();
             }
         }));
-        const replaceHoverDelegate = this._register(createInstantHoverDelegate());
         this._replaceBtn = this._register(( new SimpleButton({
             label: NLS_REPLACE_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.ReplaceOneAction),
             icon: findReplaceIcon,
-            hoverDelegate: replaceHoverDelegate,
+            hoverLifecycleOptions,
             onTrigger: () => {
                 this._controller.replace();
             },
@@ -945,7 +945,7 @@ class FindWidget extends Widget {
         this._replaceAllBtn = this._register(( new SimpleButton({
             label: NLS_REPLACE_ALL_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.ReplaceAllAction),
             icon: findReplaceAllIcon,
-            hoverDelegate: replaceHoverDelegate,
+            hoverLifecycleOptions,
             onTrigger: () => {
                 this._controller.replaceAll();
             }
@@ -1061,7 +1061,10 @@ class SimpleButton extends Widget {
         this._domNode.className = className;
         this._domNode.setAttribute('role', 'button');
         this._domNode.setAttribute('aria-label', this._opts.label);
-        this._register(hoverService.setupManagedHover(opts.hoverDelegate ?? getDefaultHoverDelegate('element'), this._domNode, this._opts.label));
+        this._register(hoverService.setupDelayedHover(this._domNode, {
+            content: this._opts.label,
+            style: HoverStyle.Pointer,
+        }, opts.hoverLifecycleOptions));
         this.onclick(this._domNode, (e) => {
             this._opts.onTrigger();
             e.preventDefault();

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

@@ -16,10 +16,10 @@
 	margin-left: 2px;
 }
 
-.monaco-workbench.reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-manual-collapsed,
-.monaco-workbench.reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-manual-expanded,
-.monaco-workbench.reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-expanded,
-.monaco-workbench.reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-collapsed {
+.monaco-reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-manual-collapsed,
+.monaco-reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-manual-expanded,
+.monaco-reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-expanded,
+.monaco-reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-collapsed {
 	transition: initial;
 }