@codingame/monaco-vscode-api 9.0.2 → 10.0.0

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

@@ -1,10 +1,8 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Delayer } from '../../../../base/common/async.js';
-import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
-import { registerMultiEditorAction, registerEditorContribution, registerEditorAction, registerEditorCommand, MultiEditorAction, EditorContributionInstantiation, EditorCommand, EditorAction } from '../../../browser/editorExtensions.js';
-import { EditorOption } from '../../../common/config/editorOptions.js';
+import { registerMultiEditorAction, registerEditorContribution, registerEditorAction, registerEditorCommand, MultiEditorAction, EditorCommand, EditorAction } from '../../../browser/editorExtensions.js';
 import { overviewRulerRangeHighlight } from '../../../common/core/editorColorRegistry.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { OverviewRulerLane } from '../../../common/model.js';
@@ -19,11 +17,9 @@ import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextke
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
-import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import '../../../../platform/notification/common/notification.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
-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';
@@ -52,12 +48,6 @@ function getSelectionSearchString(editor, seedSearchStringFromSelection = 'singl
     }
     return null;
 }
-var FindStartFocusAction;
-( ((function(FindStartFocusAction) {
-    FindStartFocusAction[FindStartFocusAction["NoFocusChange"] = 0] = "NoFocusChange";
-    FindStartFocusAction[FindStartFocusAction["FocusFindInput"] = 1] = "FocusFindInput";
-    FindStartFocusAction[FindStartFocusAction["FocusReplaceInput"] = 2] = "FocusReplaceInput";
-})(FindStartFocusAction || (FindStartFocusAction = {}))));
 let CommonFindController = class CommonFindController extends Disposable {
     static { CommonFindController_1 = this; }
     static { this.ID = 'editor.contrib.findController'; }
@@ -86,10 +76,10 @@ let CommonFindController = class CommonFindController extends Disposable {
             this.disposeModel();
             this._state.change({
                 searchScope: null,
-                matchCase: this._storageService.getBoolean('editor.matchCase', StorageScope.WORKSPACE, false),
-                wholeWord: this._storageService.getBoolean('editor.wholeWord', StorageScope.WORKSPACE, false),
-                isRegex: this._storageService.getBoolean('editor.isRegex', StorageScope.WORKSPACE, false),
-                preserveCase: this._storageService.getBoolean('editor.preserveCase', StorageScope.WORKSPACE, false)
+                matchCase: this._storageService.getBoolean('editor.matchCase', 1 , false),
+                wholeWord: this._storageService.getBoolean('editor.wholeWord', 1 , false),
+                isRegex: this._storageService.getBoolean('editor.isRegex', 1 , false),
+                preserveCase: this._storageService.getBoolean('editor.preserveCase', 1 , false)
             }, false);
             if (shouldRestartFind) {
                 this._start({
@@ -97,10 +87,10 @@ let CommonFindController = class CommonFindController extends Disposable {
                     seedSearchStringFromSelection: 'none',
                     seedSearchStringFromNonEmptySelection: false,
                     seedSearchStringFromGlobalClipboard: false,
-                    shouldFocus: FindStartFocusAction.NoFocusChange,
+                    shouldFocus: 0 ,
                     shouldAnimate: false,
                     updateSearchScope: false,
-                    loop: this._editor.getOption(EditorOption.find).loop
+                    loop: this._editor.getOption(43 ).loop
                 });
             }
         }));
@@ -132,24 +122,24 @@ let CommonFindController = class CommonFindController extends Disposable {
     }
     saveQueryState(e) {
         if (e.isRegex) {
-            this._storageService.store('editor.isRegex', this._state.actualIsRegex, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+            this._storageService.store('editor.isRegex', this._state.actualIsRegex, 1 , 1 );
         }
         if (e.wholeWord) {
-            this._storageService.store('editor.wholeWord', this._state.actualWholeWord, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+            this._storageService.store('editor.wholeWord', this._state.actualWholeWord, 1 , 1 );
         }
         if (e.matchCase) {
-            this._storageService.store('editor.matchCase', this._state.actualMatchCase, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+            this._storageService.store('editor.matchCase', this._state.actualMatchCase, 1 , 1 );
         }
         if (e.preserveCase) {
-            this._storageService.store('editor.preserveCase', this._state.actualPreserveCase, StorageScope.WORKSPACE, StorageTarget.MACHINE);
+            this._storageService.store('editor.preserveCase', this._state.actualPreserveCase, 1 , 1 );
         }
     }
     loadQueryState() {
         this._state.change({
-            matchCase: this._storageService.getBoolean('editor.matchCase', StorageScope.WORKSPACE, this._state.matchCase),
-            wholeWord: this._storageService.getBoolean('editor.wholeWord', StorageScope.WORKSPACE, this._state.wholeWord),
-            isRegex: this._storageService.getBoolean('editor.isRegex', StorageScope.WORKSPACE, this._state.isRegex),
-            preserveCase: this._storageService.getBoolean('editor.preserveCase', StorageScope.WORKSPACE, this._state.preserveCase)
+            matchCase: this._storageService.getBoolean('editor.matchCase', 1 , this._state.matchCase),
+            wholeWord: this._storageService.getBoolean('editor.wholeWord', 1 , this._state.wholeWord),
+            isRegex: this._storageService.getBoolean('editor.isRegex', 1 , this._state.isRegex),
+            preserveCase: this._storageService.getBoolean('editor.preserveCase', 1 , this._state.preserveCase)
         }, false);
     }
     isFindInputFocused() {
@@ -306,7 +296,7 @@ let CommonFindController = class CommonFindController extends Disposable {
     replaceAll() {
         if (this._model) {
             if (this._editor.getModel()?.isTooLargeForHeapOperation()) {
-                this._notificationService.warn(( localize(1261, "The file is too large to perform a replace all operation.")));
+                this._notificationService.warn(( localize(1406, "The file is too large to perform a replace all operation.")));
                 return false;
             }
             this._model.replaceAll();
@@ -323,7 +313,7 @@ let CommonFindController = class CommonFindController extends Disposable {
         return false;
     }
     async getGlobalBufferTerm() {
-        if (this._editor.getOption(EditorOption.find).globalFindClipboard
+        if (this._editor.getOption(43 ).globalFindClipboard
             && this._editor.hasModel()
             && !this._editor.getModel().isTooLargeForSyncing()) {
             return this._clipboardService.readFindText();
@@ -331,7 +321,7 @@ let CommonFindController = class CommonFindController extends Disposable {
         return '';
     }
     setGlobalBufferTerm(text) {
-        if (this._editor.getOption(EditorOption.find).globalFindClipboard
+        if (this._editor.getOption(43 ).globalFindClipboard
             && this._editor.hasModel()
             && !this._editor.getModel().isTooLargeForSyncing()) {
             this._clipboardService.writeFindText(text);
@@ -360,7 +350,7 @@ let FindController = class FindController extends CommonFindController {
         }
         const selection = this._editor.getSelection();
         let updateSearchScope = false;
-        switch (this._editor.getOption(EditorOption.find).autoFindInSelection) {
+        switch (this._editor.getOption(43 ).autoFindInSelection) {
             case 'always':
                 updateSearchScope = true;
                 break;
@@ -376,10 +366,10 @@ let FindController = class FindController extends CommonFindController {
         opts.updateSearchScope = opts.updateSearchScope || updateSearchScope;
         await super._start(opts, newState);
         if (this._widget) {
-            if (opts.shouldFocus === FindStartFocusAction.FocusReplaceInput) {
+            if (opts.shouldFocus === 2 ) {
                 this._widget.focusReplaceInput();
             }
-            else if (opts.shouldFocus === FindStartFocusAction.FocusFindInput) {
+            else if (opts.shouldFocus === 1 ) {
                 this._widget.focusFindInput();
             }
         }
@@ -429,7 +419,7 @@ FindController = ( (__decorate([
 ], FindController)));
 const StartFindAction = registerMultiEditorAction(( (new MultiEditorAction({
     id: FIND_IDS.StartFindAction,
-    label: ( localize(1262, "Find")),
+    label: ( localize(1407, "Find")),
     alias: 'Find',
     precondition: ( (ContextKeyExpr.or(
         EditorContextKeys.focus,
@@ -437,13 +427,13 @@ const StartFindAction = registerMultiEditorAction(( (new MultiEditorAction({
     ))),
     kbOpts: {
         kbExpr: null,
-        primary: KeyMod$1.CtrlCmd | KeyCode.KeyF,
-        weight: KeybindingWeight.EditorContrib
+        primary: 2048  | 36 ,
+        weight: 100
     },
     menuOpts: {
         menuId: MenuId.MenubarEditMenu,
         group: '3_find',
-        title: ( localize(1263, "&&Find")),
+        title: ( localize(1408, "&&Find")),
         order: 1
     }
 }))));
@@ -454,13 +444,13 @@ StartFindAction.addImplementation(0, (accessor, editor, args) => {
     }
     return controller.start({
         forceRevealReplace: false,
-        seedSearchStringFromSelection: editor.getOption(EditorOption.find).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
-        seedSearchStringFromNonEmptySelection: editor.getOption(EditorOption.find).seedSearchStringFromSelection === 'selection',
-        seedSearchStringFromGlobalClipboard: editor.getOption(EditorOption.find).globalFindClipboard,
-        shouldFocus: FindStartFocusAction.FocusFindInput,
+        seedSearchStringFromSelection: editor.getOption(43 ).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
+        seedSearchStringFromNonEmptySelection: editor.getOption(43 ).seedSearchStringFromSelection === 'selection',
+        seedSearchStringFromGlobalClipboard: editor.getOption(43 ).globalFindClipboard,
+        shouldFocus: 1 ,
         shouldAnimate: true,
         updateSearchScope: false,
-        loop: editor.getOption(EditorOption.find).loop
+        loop: editor.getOption(43 ).loop
     });
 });
 const findArgDescription = {
@@ -484,13 +474,13 @@ class StartFindWithArgsAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.StartFindWithArgs,
-            label: ( localize(1264, "Find With Arguments")),
+            label: ( localize(1409, "Find With Arguments")),
             alias: 'Find With Arguments',
             precondition: undefined,
             kbOpts: {
                 kbExpr: null,
                 primary: 0,
-                weight: KeybindingWeight.EditorContrib
+                weight: 100
             },
             metadata: findArgDescription
         });
@@ -509,13 +499,13 @@ class StartFindWithArgsAction extends EditorAction {
             } : {};
             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',
+                seedSearchStringFromSelection: (controller.getState().searchString.length === 0) && editor.getOption(43 ).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
+                seedSearchStringFromNonEmptySelection: editor.getOption(43 ).seedSearchStringFromSelection === 'selection',
                 seedSearchStringFromGlobalClipboard: true,
-                shouldFocus: FindStartFocusAction.FocusFindInput,
+                shouldFocus: 1 ,
                 shouldAnimate: true,
                 updateSearchScope: args?.findInSelection || false,
-                loop: editor.getOption(EditorOption.find).loop
+                loop: editor.getOption(43 ).loop
             }, newState);
             controller.setGlobalBufferTerm(controller.getState().searchString);
         }
@@ -525,16 +515,16 @@ class StartFindWithSelectionAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.StartFindWithSelection,
-            label: ( localize(1265, "Find With Selection")),
+            label: ( localize(1410, "Find With Selection")),
             alias: 'Find With Selection',
             precondition: undefined,
             kbOpts: {
                 kbExpr: null,
                 primary: 0,
                 mac: {
-                    primary: KeyMod$1.CtrlCmd | KeyCode.KeyE,
+                    primary: 2048  | 35 ,
                 },
-                weight: KeybindingWeight.EditorContrib
+                weight: 100
             }
         });
     }
@@ -546,10 +536,10 @@ class StartFindWithSelectionAction extends EditorAction {
                 seedSearchStringFromSelection: 'multiple',
                 seedSearchStringFromNonEmptySelection: false,
                 seedSearchStringFromGlobalClipboard: false,
-                shouldFocus: FindStartFocusAction.NoFocusChange,
+                shouldFocus: 0 ,
                 shouldAnimate: true,
                 updateSearchScope: false,
-                loop: editor.getOption(EditorOption.find).loop
+                loop: editor.getOption(43 ).loop
             });
             controller.setGlobalBufferTerm(controller.getState().searchString);
         }
@@ -561,13 +551,13 @@ class MatchFindAction extends EditorAction {
         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',
+                seedSearchStringFromSelection: (controller.getState().searchString.length === 0) && editor.getOption(43 ).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
+                seedSearchStringFromNonEmptySelection: editor.getOption(43 ).seedSearchStringFromSelection === 'selection',
                 seedSearchStringFromGlobalClipboard: true,
-                shouldFocus: FindStartFocusAction.NoFocusChange,
+                shouldFocus: 0 ,
                 shouldAnimate: true,
                 updateSearchScope: false,
-                loop: editor.getOption(EditorOption.find).loop
+                loop: editor.getOption(43 ).loop
             });
             this._run(controller);
         }
@@ -577,18 +567,18 @@ class NextMatchFindAction extends MatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.NextMatchFindAction,
-            label: ( localize(1266, "Find Next")),
+            label: ( localize(1411, "Find Next")),
             alias: 'Find Next',
             precondition: undefined,
             kbOpts: [{
                     kbExpr: EditorContextKeys.focus,
-                    primary: KeyCode.F3,
-                    mac: { primary: KeyMod$1.CtrlCmd | KeyCode.KeyG, secondary: [KeyCode.F3] },
-                    weight: KeybindingWeight.EditorContrib
+                    primary: 61 ,
+                    mac: { primary: 2048  | 37 , secondary: [61 ] },
+                    weight: 100
                 }, {
                     kbExpr: ( (ContextKeyExpr.and(EditorContextKeys.focus, CONTEXT_FIND_INPUT_FOCUSED))),
-                    primary: KeyCode.Enter,
-                    weight: KeybindingWeight.EditorContrib
+                    primary: 3 ,
+                    weight: 100
                 }]
         });
     }
@@ -605,18 +595,18 @@ class PreviousMatchFindAction extends MatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.PreviousMatchFindAction,
-            label: ( localize(1267, "Find Previous")),
+            label: ( localize(1412, "Find Previous")),
             alias: '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
+                    primary: 1024  | 61 ,
+                    mac: { primary: 2048  | 1024  | 37 , secondary: [1024  | 61 ] },
+                    weight: 100
                 }, {
                     kbExpr: ( (ContextKeyExpr.and(EditorContextKeys.focus, CONTEXT_FIND_INPUT_FOCUSED))),
-                    primary: KeyMod$1.Shift | KeyCode.Enter,
-                    weight: KeybindingWeight.EditorContrib
+                    primary: 1024  | 3 ,
+                    weight: 100
                 }
             ]
         });
@@ -629,7 +619,7 @@ class MoveToMatchFindAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.GoToMatchFindAction,
-            label: ( localize(1268, "Go to Match...")),
+            label: ( localize(1413, "Go to Match...")),
             alias: 'Go to Match...',
             precondition: CONTEXT_FIND_WIDGET_VISIBLE
         });
@@ -645,7 +635,7 @@ class MoveToMatchFindAction extends EditorAction {
             const notificationService = accessor.get(INotificationService);
             notificationService.notify({
                 severity: Severity$1.Warning,
-                message: ( localize(1269, "No matches. Try searching for something else."))
+                message: ( localize(1414, "No matches. Try searching for something else."))
             });
             return;
         }
@@ -653,7 +643,7 @@ class MoveToMatchFindAction extends EditorAction {
         const disposables = ( (new DisposableStore()));
         const inputBox = disposables.add(quickInputService.createInputBox());
         inputBox.placeholder = ( localize(
-            1270,
+            1415,
             "Type a number to go to a specific match (between 1 and {0})",
             matchesCount
         ));
@@ -683,7 +673,7 @@ class MoveToMatchFindAction extends EditorAction {
             }
             else {
                 inputBox.validationMessage = ( localize(
-                    1271,
+                    1416,
                     "Please type a number between 1 and {0}",
                     controller.getState().matchesCount
                 ));
@@ -701,7 +691,7 @@ class MoveToMatchFindAction extends EditorAction {
             }
             else {
                 inputBox.validationMessage = ( localize(
-                    1271,
+                    1416,
                     "Please type a number between 1 and {0}",
                     controller.getState().matchesCount
                 ));
@@ -759,10 +749,10 @@ class SelectionMatchFindAction extends EditorAction {
                 seedSearchStringFromSelection: 'none',
                 seedSearchStringFromNonEmptySelection: false,
                 seedSearchStringFromGlobalClipboard: false,
-                shouldFocus: FindStartFocusAction.NoFocusChange,
+                shouldFocus: 0 ,
                 shouldAnimate: true,
                 updateSearchScope: false,
-                loop: editor.getOption(EditorOption.find).loop
+                loop: editor.getOption(43 ).loop
             });
             this._run(controller);
         }
@@ -772,13 +762,13 @@ class NextSelectionMatchFindAction extends SelectionMatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.NextSelectionMatchFindAction,
-            label: ( localize(1272, "Find Next Selection")),
+            label: ( localize(1417, "Find Next Selection")),
             alias: 'Find Next Selection',
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.focus,
-                primary: KeyMod$1.CtrlCmd | KeyCode.F3,
-                weight: KeybindingWeight.EditorContrib
+                primary: 2048  | 61 ,
+                weight: 100
             }
         });
     }
@@ -790,13 +780,13 @@ class PreviousSelectionMatchFindAction extends SelectionMatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.PreviousSelectionMatchFindAction,
-            label: ( localize(1273, "Find Previous Selection")),
+            label: ( localize(1418, "Find Previous Selection")),
             alias: 'Find Previous Selection',
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.focus,
-                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.F3,
-                weight: KeybindingWeight.EditorContrib
+                primary: 2048  | 1024  | 61 ,
+                weight: 100
             }
         });
     }
@@ -806,7 +796,7 @@ class PreviousSelectionMatchFindAction extends SelectionMatchFindAction {
 }
 const StartFindReplaceAction = registerMultiEditorAction(( (new MultiEditorAction({
     id: FIND_IDS.StartFindReplaceAction,
-    label: ( localize(1274, "Replace")),
+    label: ( localize(1419, "Replace")),
     alias: 'Replace',
     precondition: ( (ContextKeyExpr.or(
         EditorContextKeys.focus,
@@ -814,19 +804,19 @@ const StartFindReplaceAction = registerMultiEditorAction(( (new MultiEditorActio
     ))),
     kbOpts: {
         kbExpr: null,
-        primary: KeyMod$1.CtrlCmd | KeyCode.KeyH,
-        mac: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.KeyF },
-        weight: KeybindingWeight.EditorContrib
+        primary: 2048  | 38 ,
+        mac: { primary: 2048  | 512  | 36  },
+        weight: 100
     },
     menuOpts: {
         menuId: MenuId.MenubarEditMenu,
         group: '3_find',
-        title: ( localize(1275, "&&Replace")),
+        title: ( localize(1420, "&&Replace")),
         order: 2
     }
 }))));
 StartFindReplaceAction.addImplementation(0, (accessor, editor, args) => {
-    if (!editor.hasModel() || editor.getOption(EditorOption.readOnly)) {
+    if (!editor.hasModel() || editor.getOption(94 )) {
         return false;
     }
     const controller = CommonFindController.get(editor);
@@ -837,22 +827,22 @@ StartFindReplaceAction.addImplementation(0, (accessor, editor, args) => {
     const findInputFocused = controller.isFindInputFocused();
     const seedSearchStringFromSelection = !currentSelection.isEmpty()
         && currentSelection.startLineNumber === currentSelection.endLineNumber
-        && (editor.getOption(EditorOption.find).seedSearchStringFromSelection !== 'never')
+        && (editor.getOption(43 ).seedSearchStringFromSelection !== 'never')
         && !findInputFocused;
     const shouldFocus = (findInputFocused || seedSearchStringFromSelection) ?
-        FindStartFocusAction.FocusReplaceInput : FindStartFocusAction.FocusFindInput;
+        2  : 1 ;
     return controller.start({
         forceRevealReplace: true,
         seedSearchStringFromSelection: seedSearchStringFromSelection ? 'single' : 'none',
-        seedSearchStringFromNonEmptySelection: editor.getOption(EditorOption.find).seedSearchStringFromSelection === 'selection',
-        seedSearchStringFromGlobalClipboard: editor.getOption(EditorOption.find).seedSearchStringFromSelection !== 'never',
+        seedSearchStringFromNonEmptySelection: editor.getOption(43 ).seedSearchStringFromSelection === 'selection',
+        seedSearchStringFromGlobalClipboard: editor.getOption(43 ).seedSearchStringFromSelection !== 'never',
         shouldFocus: shouldFocus,
         shouldAnimate: true,
         updateSearchScope: false,
-        loop: editor.getOption(EditorOption.find).loop
+        loop: editor.getOption(43 ).loop
     });
 });
-registerEditorContribution(CommonFindController.ID, FindController, EditorContributionInstantiation.Eager);
+registerEditorContribution(CommonFindController.ID, FindController, 0 );
 registerEditorAction(StartFindWithArgsAction);
 registerEditorAction(StartFindWithSelectionAction);
 registerEditorAction(NextMatchFindAction);
@@ -866,10 +856,10 @@ registerEditorCommand(( (new FindCommand({
     precondition: CONTEXT_FIND_WIDGET_VISIBLE,
     handler: x => x.closeFindWidget(),
     kbOpts: {
-        weight: KeybindingWeight.EditorContrib + 5,
+        weight: 100  + 5,
         kbExpr: ( (ContextKeyExpr.and(EditorContextKeys.focus, ContextKeyExpr.not('isComposing')))),
-        primary: KeyCode.Escape,
-        secondary: [KeyMod$1.Shift | KeyCode.Escape]
+        primary: 9 ,
+        secondary: [1024  | 9 ]
     }
 }))));
 registerEditorCommand(( (new FindCommand({
@@ -877,7 +867,7 @@ registerEditorCommand(( (new FindCommand({
     precondition: undefined,
     handler: x => x.toggleCaseSensitive(),
     kbOpts: {
-        weight: KeybindingWeight.EditorContrib + 5,
+        weight: 100  + 5,
         kbExpr: EditorContextKeys.focus,
         primary: ToggleCaseSensitiveKeybinding.primary,
         mac: ToggleCaseSensitiveKeybinding.mac,
@@ -890,7 +880,7 @@ registerEditorCommand(( (new FindCommand({
     precondition: undefined,
     handler: x => x.toggleWholeWords(),
     kbOpts: {
-        weight: KeybindingWeight.EditorContrib + 5,
+        weight: 100  + 5,
         kbExpr: EditorContextKeys.focus,
         primary: ToggleWholeWordKeybinding.primary,
         mac: ToggleWholeWordKeybinding.mac,
@@ -903,7 +893,7 @@ registerEditorCommand(( (new FindCommand({
     precondition: undefined,
     handler: x => x.toggleRegex(),
     kbOpts: {
-        weight: KeybindingWeight.EditorContrib + 5,
+        weight: 100  + 5,
         kbExpr: EditorContextKeys.focus,
         primary: ToggleRegexKeybinding.primary,
         mac: ToggleRegexKeybinding.mac,
@@ -916,7 +906,7 @@ registerEditorCommand(( (new FindCommand({
     precondition: undefined,
     handler: x => x.toggleSearchScope(),
     kbOpts: {
-        weight: KeybindingWeight.EditorContrib + 5,
+        weight: 100  + 5,
         kbExpr: EditorContextKeys.focus,
         primary: ToggleSearchScopeKeybinding.primary,
         mac: ToggleSearchScopeKeybinding.mac,
@@ -929,7 +919,7 @@ registerEditorCommand(( (new FindCommand({
     precondition: undefined,
     handler: x => x.togglePreserveCase(),
     kbOpts: {
-        weight: KeybindingWeight.EditorContrib + 5,
+        weight: 100  + 5,
         kbExpr: EditorContextKeys.focus,
         primary: TogglePreserveCaseKeybinding.primary,
         mac: TogglePreserveCaseKeybinding.mac,
@@ -942,9 +932,9 @@ registerEditorCommand(( (new FindCommand({
     precondition: CONTEXT_FIND_WIDGET_VISIBLE,
     handler: x => x.replace(),
     kbOpts: {
-        weight: KeybindingWeight.EditorContrib + 5,
+        weight: 100  + 5,
         kbExpr: EditorContextKeys.focus,
-        primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.Digit1
+        primary: 2048  | 1024  | 22
     }
 }))));
 registerEditorCommand(( (new FindCommand({
@@ -952,9 +942,9 @@ registerEditorCommand(( (new FindCommand({
     precondition: CONTEXT_FIND_WIDGET_VISIBLE,
     handler: x => x.replace(),
     kbOpts: {
-        weight: KeybindingWeight.EditorContrib + 5,
+        weight: 100  + 5,
         kbExpr: ( (ContextKeyExpr.and(EditorContextKeys.focus, CONTEXT_REPLACE_INPUT_FOCUSED))),
-        primary: KeyCode.Enter
+        primary: 3
     }
 }))));
 registerEditorCommand(( (new FindCommand({
@@ -962,9 +952,9 @@ registerEditorCommand(( (new FindCommand({
     precondition: CONTEXT_FIND_WIDGET_VISIBLE,
     handler: x => x.replaceAll(),
     kbOpts: {
-        weight: KeybindingWeight.EditorContrib + 5,
+        weight: 100  + 5,
         kbExpr: EditorContextKeys.focus,
-        primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.Enter
+        primary: 2048  | 512  | 3
     }
 }))));
 registerEditorCommand(( (new FindCommand({
@@ -972,11 +962,11 @@ registerEditorCommand(( (new FindCommand({
     precondition: CONTEXT_FIND_WIDGET_VISIBLE,
     handler: x => x.replaceAll(),
     kbOpts: {
-        weight: KeybindingWeight.EditorContrib + 5,
+        weight: 100  + 5,
         kbExpr: ( (ContextKeyExpr.and(EditorContextKeys.focus, CONTEXT_REPLACE_INPUT_FOCUSED))),
         primary: undefined,
         mac: {
-            primary: KeyMod$1.CtrlCmd | KeyCode.Enter,
+            primary: 2048  | 3 ,
         }
     }
 }))));
@@ -985,9 +975,9 @@ registerEditorCommand(( (new FindCommand({
     precondition: CONTEXT_FIND_WIDGET_VISIBLE,
     handler: x => x.selectAllMatches(),
     kbOpts: {
-        weight: KeybindingWeight.EditorContrib + 5,
+        weight: 100  + 5,
         kbExpr: EditorContextKeys.focus,
-        primary: KeyMod$1.Alt | KeyCode.Enter
+        primary: 512  | 3
     }
 }))));
-export { CommonFindController, FindController, FindStartFocusAction, MatchFindAction, MoveToMatchFindAction, NextMatchFindAction, NextSelectionMatchFindAction, PreviousMatchFindAction, PreviousSelectionMatchFindAction, SelectionMatchFindAction, StartFindAction, StartFindReplaceAction, StartFindWithArgsAction, StartFindWithSelectionAction, getSelectionSearchString };
+export { CommonFindController, FindController, MatchFindAction, MoveToMatchFindAction, NextMatchFindAction, NextSelectionMatchFindAction, PreviousMatchFindAction, PreviousSelectionMatchFindAction, SelectionMatchFindAction, StartFindAction, StartFindReplaceAction, StartFindWithArgsAction, StartFindWithSelectionAction, getSelectionSearchString };

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

@@ -1,5 +1,5 @@
 import { Range } from '../../../common/core/range.js';
-import { TrackedRangeStickiness, OverviewRulerLane, MinimapPosition } from '../../../common/model.js';
+import { OverviewRulerLane } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
@@ -245,7 +245,7 @@ class FindDecorations {
     }
     static { this._CURRENT_FIND_MATCH_DECORATION = ModelDecorationOptions.register({
         description: 'current-find-match',
-        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+        stickiness: 1 ,
         zIndex: 13,
         className: 'currentFindMatch',
         inlineClassName: 'currentFindMatchInline',
@@ -256,12 +256,12 @@ class FindDecorations {
         },
         minimap: {
             color: themeColorFromId(minimapFindMatch),
-            position: MinimapPosition.Inline
+            position: 1
         }
     }); }
     static { this._FIND_MATCH_DECORATION = ModelDecorationOptions.register({
         description: 'find-match',
-        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+        stickiness: 1 ,
         zIndex: 10,
         className: 'findMatch',
         inlineClassName: 'findMatchInline',
@@ -272,18 +272,18 @@ class FindDecorations {
         },
         minimap: {
             color: themeColorFromId(minimapFindMatch),
-            position: MinimapPosition.Inline
+            position: 1
         }
     }); }
     static { this._FIND_MATCH_NO_OVERVIEW_DECORATION = ModelDecorationOptions.register({
         description: 'find-match-no-overview',
-        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+        stickiness: 1 ,
         className: 'findMatch',
         showIfCollapsed: true
     }); }
     static { this._FIND_MATCH_ONLY_OVERVIEW_DECORATION = ModelDecorationOptions.register({
         description: 'find-match-only-overview',
-        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+        stickiness: 1 ,
         overviewRuler: {
             color: themeColorFromId(overviewRulerFindMatchForeground),
             position: OverviewRulerLane.Center
@@ -291,7 +291,7 @@ class FindDecorations {
     }); }
     static { this._RANGE_HIGHLIGHT_DECORATION = ModelDecorationOptions.register({
         description: 'find-range-highlight',
-        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+        stickiness: 1 ,
         className: 'rangeHighlight',
         isWholeLine: true
     }); }