@codingame/monaco-vscode-api 5.2.0 → 6.0.0

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

@@ -1,8 +1,10 @@
 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 } from '../../../../base/common/lifecycle.js';
 import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
-import { registerMultiEditorAction, registerEditorContribution, registerEditorAction, registerEditorCommand, MultiEditorAction, EditorCommand, EditorAction } from '../../../browser/editorExtensions.js';
+import { registerMultiEditorAction, registerEditorContribution, registerEditorAction, registerEditorCommand, MultiEditorAction, EditorContributionInstantiation, EditorCommand, EditorAction } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { overviewRulerRangeHighlight } from '../../../common/core/editorColorRegistry.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { OverviewRulerLane } from '../../../common/model.js';
@@ -17,9 +19,11 @@ 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';
@@ -49,6 +53,12 @@ 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'; }
@@ -77,10 +87,10 @@ let CommonFindController = class CommonFindController extends Disposable {
             this.disposeModel();
             this._state.change({
                 searchScope: null,
-                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)
+                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)
             }, false);
             if (shouldRestartFind) {
                 this._start({
@@ -88,10 +98,10 @@ let CommonFindController = class CommonFindController extends Disposable {
                     seedSearchStringFromSelection: 'none',
                     seedSearchStringFromNonEmptySelection: false,
                     seedSearchStringFromGlobalClipboard: false,
-                    shouldFocus: 0 ,
+                    shouldFocus: FindStartFocusAction.NoFocusChange,
                     shouldAnimate: false,
                     updateSearchScope: false,
-                    loop: this._editor.getOption(41 ).loop
+                    loop: this._editor.getOption(EditorOption.find).loop
                 });
             }
         }));
@@ -123,24 +133,24 @@ let CommonFindController = class CommonFindController extends Disposable {
     }
     saveQueryState(e) {
         if (e.isRegex) {
-            this._storageService.store('editor.isRegex', this._state.actualIsRegex, 1 , 1 );
+            this._storageService.store('editor.isRegex', this._state.actualIsRegex, StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         if (e.wholeWord) {
-            this._storageService.store('editor.wholeWord', this._state.actualWholeWord, 1 , 1 );
+            this._storageService.store('editor.wholeWord', this._state.actualWholeWord, StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         if (e.matchCase) {
-            this._storageService.store('editor.matchCase', this._state.actualMatchCase, 1 , 1 );
+            this._storageService.store('editor.matchCase', this._state.actualMatchCase, StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         if (e.preserveCase) {
-            this._storageService.store('editor.preserveCase', this._state.actualPreserveCase, 1 , 1 );
+            this._storageService.store('editor.preserveCase', this._state.actualPreserveCase, StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
     }
     loadQueryState() {
         this._state.change({
-            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)
+            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)
         }, false);
     }
     isFindInputFocused() {
@@ -314,7 +324,7 @@ let CommonFindController = class CommonFindController extends Disposable {
         return false;
     }
     async getGlobalBufferTerm() {
-        if (this._editor.getOption(41 ).globalFindClipboard
+        if (this._editor.getOption(EditorOption.find).globalFindClipboard
             && this._editor.hasModel()
             && !this._editor.getModel().isTooLargeForSyncing()) {
             return this._clipboardService.readFindText();
@@ -322,7 +332,7 @@ let CommonFindController = class CommonFindController extends Disposable {
         return '';
     }
     setGlobalBufferTerm(text) {
-        if (this._editor.getOption(41 ).globalFindClipboard
+        if (this._editor.getOption(EditorOption.find).globalFindClipboard
             && this._editor.hasModel()
             && !this._editor.getModel().isTooLargeForSyncing()) {
             this._clipboardService.writeFindText(text);
@@ -351,7 +361,7 @@ let FindController = class FindController extends CommonFindController {
         }
         const selection = this._editor.getSelection();
         let updateSearchScope = false;
-        switch (this._editor.getOption(41 ).autoFindInSelection) {
+        switch (this._editor.getOption(EditorOption.find).autoFindInSelection) {
             case 'always':
                 updateSearchScope = true;
                 break;
@@ -367,10 +377,10 @@ let FindController = class FindController extends CommonFindController {
         opts.updateSearchScope = opts.updateSearchScope || updateSearchScope;
         await super._start(opts, newState);
         if (this._widget) {
-            if (opts.shouldFocus === 2 ) {
+            if (opts.shouldFocus === FindStartFocusAction.FocusReplaceInput) {
                 this._widget.focusReplaceInput();
             }
-            else if (opts.shouldFocus === 1 ) {
+            else if (opts.shouldFocus === FindStartFocusAction.FocusFindInput) {
                 this._widget.focusFindInput();
             }
         }
@@ -428,8 +438,8 @@ const StartFindAction = registerMultiEditorAction(( (new MultiEditorAction({
     ))),
     kbOpts: {
         kbExpr: null,
-        primary: 2048  | 36 ,
-        weight: 100
+        primary: KeyMod$1.CtrlCmd | KeyCode.KeyF,
+        weight: KeybindingWeight.EditorContrib
     },
     menuOpts: {
         menuId: MenuId.MenubarEditMenu,
@@ -445,13 +455,13 @@ StartFindAction.addImplementation(0, (accessor, editor, args) => {
     }
     return controller.start({
         forceRevealReplace: false,
-        seedSearchStringFromSelection: editor.getOption(41 ).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
-        seedSearchStringFromNonEmptySelection: editor.getOption(41 ).seedSearchStringFromSelection === 'selection',
-        seedSearchStringFromGlobalClipboard: editor.getOption(41 ).globalFindClipboard,
-        shouldFocus: 1 ,
+        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,
         shouldAnimate: true,
         updateSearchScope: false,
-        loop: editor.getOption(41 ).loop
+        loop: editor.getOption(EditorOption.find).loop
     });
 });
 const findArgDescription = {
@@ -481,7 +491,7 @@ class StartFindWithArgsAction extends EditorAction {
             kbOpts: {
                 kbExpr: null,
                 primary: 0,
-                weight: 100
+                weight: KeybindingWeight.EditorContrib
             },
             metadata: findArgDescription
         });
@@ -500,13 +510,13 @@ class StartFindWithArgsAction extends EditorAction {
             } : {};
             await controller.start({
                 forceRevealReplace: false,
-                seedSearchStringFromSelection: (controller.getState().searchString.length === 0) && editor.getOption(41 ).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
-                seedSearchStringFromNonEmptySelection: editor.getOption(41 ).seedSearchStringFromSelection === 'selection',
+                seedSearchStringFromSelection: (controller.getState().searchString.length === 0) && editor.getOption(EditorOption.find).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
+                seedSearchStringFromNonEmptySelection: editor.getOption(EditorOption.find).seedSearchStringFromSelection === 'selection',
                 seedSearchStringFromGlobalClipboard: true,
-                shouldFocus: 1 ,
+                shouldFocus: FindStartFocusAction.FocusFindInput,
                 shouldAnimate: true,
                 updateSearchScope: args?.findInSelection || false,
-                loop: editor.getOption(41 ).loop
+                loop: editor.getOption(EditorOption.find).loop
             }, newState);
             controller.setGlobalBufferTerm(controller.getState().searchString);
         }
@@ -523,9 +533,9 @@ class StartFindWithSelectionAction extends EditorAction {
                 kbExpr: null,
                 primary: 0,
                 mac: {
-                    primary: 2048  | 35 ,
+                    primary: KeyMod$1.CtrlCmd | KeyCode.KeyE,
                 },
-                weight: 100
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -537,10 +547,10 @@ class StartFindWithSelectionAction extends EditorAction {
                 seedSearchStringFromSelection: 'multiple',
                 seedSearchStringFromNonEmptySelection: false,
                 seedSearchStringFromGlobalClipboard: false,
-                shouldFocus: 0 ,
+                shouldFocus: FindStartFocusAction.NoFocusChange,
                 shouldAnimate: true,
                 updateSearchScope: false,
-                loop: editor.getOption(41 ).loop
+                loop: editor.getOption(EditorOption.find).loop
             });
             controller.setGlobalBufferTerm(controller.getState().searchString);
         }
@@ -552,13 +562,13 @@ class MatchFindAction extends EditorAction {
         if (controller && !this._run(controller)) {
             await controller.start({
                 forceRevealReplace: false,
-                seedSearchStringFromSelection: (controller.getState().searchString.length === 0) && editor.getOption(41 ).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
-                seedSearchStringFromNonEmptySelection: editor.getOption(41 ).seedSearchStringFromSelection === 'selection',
+                seedSearchStringFromSelection: (controller.getState().searchString.length === 0) && editor.getOption(EditorOption.find).seedSearchStringFromSelection !== 'never' ? 'single' : 'none',
+                seedSearchStringFromNonEmptySelection: editor.getOption(EditorOption.find).seedSearchStringFromSelection === 'selection',
                 seedSearchStringFromGlobalClipboard: true,
-                shouldFocus: 0 ,
+                shouldFocus: FindStartFocusAction.NoFocusChange,
                 shouldAnimate: true,
                 updateSearchScope: false,
-                loop: editor.getOption(41 ).loop
+                loop: editor.getOption(EditorOption.find).loop
             });
             this._run(controller);
         }
@@ -573,13 +583,13 @@ class NextMatchFindAction extends MatchFindAction {
             precondition: undefined,
             kbOpts: [{
                     kbExpr: EditorContextKeys.focus,
-                    primary: 61 ,
-                    mac: { primary: 2048  | 37 , secondary: [61 ] },
-                    weight: 100
+                    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: 3 ,
-                    weight: 100
+                    primary: KeyCode.Enter,
+                    weight: KeybindingWeight.EditorContrib
                 }]
         });
     }
@@ -601,13 +611,13 @@ class PreviousMatchFindAction extends MatchFindAction {
             precondition: undefined,
             kbOpts: [{
                     kbExpr: EditorContextKeys.focus,
-                    primary: 1024  | 61 ,
-                    mac: { primary: 2048  | 1024  | 37 , secondary: [1024  | 61 ] },
-                    weight: 100
+                    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: 1024  | 3 ,
-                    weight: 100
+                    primary: KeyMod$1.Shift | KeyCode.Enter,
+                    weight: KeybindingWeight.EditorContrib
                 }
             ]
         });
@@ -752,10 +762,10 @@ class SelectionMatchFindAction extends EditorAction {
                 seedSearchStringFromSelection: 'none',
                 seedSearchStringFromNonEmptySelection: false,
                 seedSearchStringFromGlobalClipboard: false,
-                shouldFocus: 0 ,
+                shouldFocus: FindStartFocusAction.NoFocusChange,
                 shouldAnimate: true,
                 updateSearchScope: false,
-                loop: editor.getOption(41 ).loop
+                loop: editor.getOption(EditorOption.find).loop
             });
             this._run(controller);
         }
@@ -770,8 +780,8 @@ class NextSelectionMatchFindAction extends SelectionMatchFindAction {
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.focus,
-                primary: 2048  | 61 ,
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyCode.F3,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -788,8 +798,8 @@ class PreviousSelectionMatchFindAction extends SelectionMatchFindAction {
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.focus,
-                primary: 2048  | 1024  | 61 ,
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.F3,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -807,9 +817,9 @@ const StartFindReplaceAction = registerMultiEditorAction(( (new MultiEditorActio
     ))),
     kbOpts: {
         kbExpr: null,
-        primary: 2048  | 38 ,
-        mac: { primary: 2048  | 512  | 36  },
-        weight: 100
+        primary: KeyMod$1.CtrlCmd | KeyCode.KeyH,
+        mac: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.KeyF },
+        weight: KeybindingWeight.EditorContrib
     },
     menuOpts: {
         menuId: MenuId.MenubarEditMenu,
@@ -819,7 +829,7 @@ const StartFindReplaceAction = registerMultiEditorAction(( (new MultiEditorActio
     }
 }))));
 StartFindReplaceAction.addImplementation(0, (accessor, editor, args) => {
-    if (!editor.hasModel() || editor.getOption(91 )) {
+    if (!editor.hasModel() || editor.getOption(EditorOption.readOnly)) {
         return false;
     }
     const controller = CommonFindController.get(editor);
@@ -830,22 +840,22 @@ StartFindReplaceAction.addImplementation(0, (accessor, editor, args) => {
     const findInputFocused = controller.isFindInputFocused();
     const seedSearchStringFromSelection = !currentSelection.isEmpty()
         && currentSelection.startLineNumber === currentSelection.endLineNumber
-        && (editor.getOption(41 ).seedSearchStringFromSelection !== 'never')
+        && (editor.getOption(EditorOption.find).seedSearchStringFromSelection !== 'never')
         && !findInputFocused;
     const shouldFocus = (findInputFocused || seedSearchStringFromSelection) ?
-        2  : 1 ;
+        FindStartFocusAction.FocusReplaceInput : FindStartFocusAction.FocusFindInput;
     return controller.start({
         forceRevealReplace: true,
         seedSearchStringFromSelection: seedSearchStringFromSelection ? 'single' : 'none',
-        seedSearchStringFromNonEmptySelection: editor.getOption(41 ).seedSearchStringFromSelection === 'selection',
-        seedSearchStringFromGlobalClipboard: editor.getOption(41 ).seedSearchStringFromSelection !== 'never',
+        seedSearchStringFromNonEmptySelection: editor.getOption(EditorOption.find).seedSearchStringFromSelection === 'selection',
+        seedSearchStringFromGlobalClipboard: editor.getOption(EditorOption.find).seedSearchStringFromSelection !== 'never',
         shouldFocus: shouldFocus,
         shouldAnimate: true,
         updateSearchScope: false,
-        loop: editor.getOption(41 ).loop
+        loop: editor.getOption(EditorOption.find).loop
     });
 });
-registerEditorContribution(CommonFindController.ID, FindController, 0 );
+registerEditorContribution(CommonFindController.ID, FindController, EditorContributionInstantiation.Eager);
 registerEditorAction(StartFindWithArgsAction);
 registerEditorAction(StartFindWithSelectionAction);
 registerEditorAction(NextMatchFindAction);
@@ -859,10 +869,10 @@ registerEditorCommand(( (new FindCommand({
     precondition: CONTEXT_FIND_WIDGET_VISIBLE,
     handler: x => x.closeFindWidget(),
     kbOpts: {
-        weight: 100  + 5,
+        weight: KeybindingWeight.EditorContrib + 5,
         kbExpr: ( (ContextKeyExpr.and(EditorContextKeys.focus, ContextKeyExpr.not('isComposing')))),
-        primary: 9 ,
-        secondary: [1024  | 9 ]
+        primary: KeyCode.Escape,
+        secondary: [KeyMod$1.Shift | KeyCode.Escape]
     }
 }))));
 registerEditorCommand(( (new FindCommand({
@@ -870,7 +880,7 @@ registerEditorCommand(( (new FindCommand({
     precondition: undefined,
     handler: x => x.toggleCaseSensitive(),
     kbOpts: {
-        weight: 100  + 5,
+        weight: KeybindingWeight.EditorContrib + 5,
         kbExpr: EditorContextKeys.focus,
         primary: ToggleCaseSensitiveKeybinding.primary,
         mac: ToggleCaseSensitiveKeybinding.mac,
@@ -883,7 +893,7 @@ registerEditorCommand(( (new FindCommand({
     precondition: undefined,
     handler: x => x.toggleWholeWords(),
     kbOpts: {
-        weight: 100  + 5,
+        weight: KeybindingWeight.EditorContrib + 5,
         kbExpr: EditorContextKeys.focus,
         primary: ToggleWholeWordKeybinding.primary,
         mac: ToggleWholeWordKeybinding.mac,
@@ -896,7 +906,7 @@ registerEditorCommand(( (new FindCommand({
     precondition: undefined,
     handler: x => x.toggleRegex(),
     kbOpts: {
-        weight: 100  + 5,
+        weight: KeybindingWeight.EditorContrib + 5,
         kbExpr: EditorContextKeys.focus,
         primary: ToggleRegexKeybinding.primary,
         mac: ToggleRegexKeybinding.mac,
@@ -909,7 +919,7 @@ registerEditorCommand(( (new FindCommand({
     precondition: undefined,
     handler: x => x.toggleSearchScope(),
     kbOpts: {
-        weight: 100  + 5,
+        weight: KeybindingWeight.EditorContrib + 5,
         kbExpr: EditorContextKeys.focus,
         primary: ToggleSearchScopeKeybinding.primary,
         mac: ToggleSearchScopeKeybinding.mac,
@@ -922,7 +932,7 @@ registerEditorCommand(( (new FindCommand({
     precondition: undefined,
     handler: x => x.togglePreserveCase(),
     kbOpts: {
-        weight: 100  + 5,
+        weight: KeybindingWeight.EditorContrib + 5,
         kbExpr: EditorContextKeys.focus,
         primary: TogglePreserveCaseKeybinding.primary,
         mac: TogglePreserveCaseKeybinding.mac,
@@ -935,9 +945,9 @@ registerEditorCommand(( (new FindCommand({
     precondition: CONTEXT_FIND_WIDGET_VISIBLE,
     handler: x => x.replace(),
     kbOpts: {
-        weight: 100  + 5,
+        weight: KeybindingWeight.EditorContrib + 5,
         kbExpr: EditorContextKeys.focus,
-        primary: 2048  | 1024  | 22
+        primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.Digit1
     }
 }))));
 registerEditorCommand(( (new FindCommand({
@@ -945,9 +955,9 @@ registerEditorCommand(( (new FindCommand({
     precondition: CONTEXT_FIND_WIDGET_VISIBLE,
     handler: x => x.replace(),
     kbOpts: {
-        weight: 100  + 5,
+        weight: KeybindingWeight.EditorContrib + 5,
         kbExpr: ( (ContextKeyExpr.and(EditorContextKeys.focus, CONTEXT_REPLACE_INPUT_FOCUSED))),
-        primary: 3
+        primary: KeyCode.Enter
     }
 }))));
 registerEditorCommand(( (new FindCommand({
@@ -955,9 +965,9 @@ registerEditorCommand(( (new FindCommand({
     precondition: CONTEXT_FIND_WIDGET_VISIBLE,
     handler: x => x.replaceAll(),
     kbOpts: {
-        weight: 100  + 5,
+        weight: KeybindingWeight.EditorContrib + 5,
         kbExpr: EditorContextKeys.focus,
-        primary: 2048  | 512  | 3
+        primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.Enter
     }
 }))));
 registerEditorCommand(( (new FindCommand({
@@ -965,11 +975,11 @@ registerEditorCommand(( (new FindCommand({
     precondition: CONTEXT_FIND_WIDGET_VISIBLE,
     handler: x => x.replaceAll(),
     kbOpts: {
-        weight: 100  + 5,
+        weight: KeybindingWeight.EditorContrib + 5,
         kbExpr: ( (ContextKeyExpr.and(EditorContextKeys.focus, CONTEXT_REPLACE_INPUT_FOCUSED))),
         primary: undefined,
         mac: {
-            primary: 2048  | 3 ,
+            primary: KeyMod$1.CtrlCmd | KeyCode.Enter,
         }
     }
 }))));
@@ -978,9 +988,9 @@ registerEditorCommand(( (new FindCommand({
     precondition: CONTEXT_FIND_WIDGET_VISIBLE,
     handler: x => x.selectAllMatches(),
     kbOpts: {
-        weight: 100  + 5,
+        weight: KeybindingWeight.EditorContrib + 5,
         kbExpr: EditorContextKeys.focus,
-        primary: 512  | 3
+        primary: KeyMod$1.Alt | KeyCode.Enter
     }
 }))));
-export { CommonFindController, FindController, MatchFindAction, MoveToMatchFindAction, NextMatchFindAction, NextSelectionMatchFindAction, PreviousMatchFindAction, PreviousSelectionMatchFindAction, SelectionMatchFindAction, StartFindAction, StartFindReplaceAction, StartFindWithArgsAction, StartFindWithSelectionAction, getSelectionSearchString };
+export { CommonFindController, FindController, FindStartFocusAction, 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 { OverviewRulerLane } from '../../../common/model.js';
+import { TrackedRangeStickiness, OverviewRulerLane, MinimapPosition } 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,9 +245,10 @@ class FindDecorations {
     }
     static { this._CURRENT_FIND_MATCH_DECORATION = ModelDecorationOptions.register({
         description: 'current-find-match',
-        stickiness: 1 ,
+        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
         zIndex: 13,
         className: 'currentFindMatch',
+        inlineClassName: 'currentFindMatchInline',
         showIfCollapsed: true,
         overviewRuler: {
             color: themeColorFromId(overviewRulerFindMatchForeground),
@@ -255,14 +256,15 @@ class FindDecorations {
         },
         minimap: {
             color: themeColorFromId(minimapFindMatch),
-            position: 1
+            position: MinimapPosition.Inline
         }
     }); }
     static { this._FIND_MATCH_DECORATION = ModelDecorationOptions.register({
         description: 'find-match',
-        stickiness: 1 ,
+        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
         zIndex: 10,
         className: 'findMatch',
+        inlineClassName: 'findMatchInline',
         showIfCollapsed: true,
         overviewRuler: {
             color: themeColorFromId(overviewRulerFindMatchForeground),
@@ -270,18 +272,18 @@ class FindDecorations {
         },
         minimap: {
             color: themeColorFromId(minimapFindMatch),
-            position: 1
+            position: MinimapPosition.Inline
         }
     }); }
     static { this._FIND_MATCH_NO_OVERVIEW_DECORATION = ModelDecorationOptions.register({
         description: 'find-match-no-overview',
-        stickiness: 1 ,
+        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
         className: 'findMatch',
         showIfCollapsed: true
     }); }
     static { this._FIND_MATCH_ONLY_OVERVIEW_DECORATION = ModelDecorationOptions.register({
         description: 'find-match-only-overview',
-        stickiness: 1 ,
+        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
         overviewRuler: {
             color: themeColorFromId(overviewRulerFindMatchForeground),
             position: OverviewRulerLane.Center
@@ -289,7 +291,7 @@ class FindDecorations {
     }); }
     static { this._RANGE_HIGHLIGHT_DECORATION = ModelDecorationOptions.register({
         description: 'find-range-highlight',
-        stickiness: 1 ,
+        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
         className: 'rangeHighlight',
         isWholeLine: true
     }); }