@codingame/monaco-vscode-api 9.0.3 → 10.0.1

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

@@ -1,23 +1,17 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { status } from '../../../../base/browser/ui/aria/aria.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
-import { KeyMod as KeyMod$1, KeyCode, KeyChord } from '../../../../base/common/keyCodes.js';
+import { KeyChord } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { Constants } from '../../../../base/common/uint.js';
-import { registerEditorContribution, registerEditorAction, EditorContributionInstantiation, EditorAction } from '../../../browser/editorExtensions.js';
-import { EditorOption } from '../../../common/config/editorOptions.js';
-import { CursorChangeReason } from '../../../common/cursorEvents.js';
+import { registerEditorContribution, registerEditorAction, EditorAction } from '../../../browser/editorExtensions.js';
 import { CursorMoveCommands } from '../../../common/cursor/cursorMoveCommands.js';
 import { Range } from '../../../common/core/range.js';
 import { Selection } from '../../../common/core/selection.js';
-import { ScrollType } from '../../../common/editorCommon.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { CommonFindController } from '../../find/browser/findController.js';
-import { FindOptionOverride } from '../../find/browser/findState.js';
 import { localize } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
-import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { getSelectionHighlightDecorationOptions } from '../../wordHighlighter/browser/highlightDecorations.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -28,7 +22,7 @@ function announceCursorChange(previousCursorState, cursorState) {
         const cursorPositions = ( (cursorDiff.map(
             cs => `line ${cs.viewState.position.lineNumber} column ${cs.viewState.position.column}`
         ))).join(', ');
-        const msg = cursorDiff.length === 1 ? ( localize(1527, "Cursor added: {0}", cursorPositions)) : ( localize(1528, "Cursors added: {0}", cursorPositions));
+        const msg = cursorDiff.length === 1 ? ( localize(1539, "Cursor added: {0}", cursorPositions)) : ( localize(1540, "Cursors added: {0}", cursorPositions));
         status(msg);
     }
 }
@@ -36,22 +30,22 @@ class InsertCursorAbove extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.insertCursorAbove',
-            label: ( localize(1529, "Add Cursor Above")),
+            label: ( localize(1541, "Add Cursor Above")),
             alias: 'Add Cursor Above',
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.UpArrow,
+                primary: 2048  | 512  | 16 ,
                 linux: {
-                    primary: KeyMod$1.Shift | KeyMod$1.Alt | KeyCode.UpArrow,
-                    secondary: [KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.UpArrow]
+                    primary: 1024  | 512  | 16 ,
+                    secondary: [2048  | 1024  | 16 ]
                 },
-                weight: KeybindingWeight.EditorContrib
+                weight: 100
             },
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: '3_multi',
-                title: ( localize(1530, "&&Add Cursor Above")),
+                title: ( localize(1542, "&&Add Cursor Above")),
                 order: 2
             }
         });
@@ -70,7 +64,7 @@ class InsertCursorAbove extends EditorAction {
         }
         viewModel.model.pushStackElement();
         const previousCursorState = viewModel.getCursorStates();
-        viewModel.setCursorStates(args.source, CursorChangeReason.Explicit, CursorMoveCommands.addCursorUp(viewModel, previousCursorState, useLogicalLine));
+        viewModel.setCursorStates(args.source, 3 , CursorMoveCommands.addCursorUp(viewModel, previousCursorState, useLogicalLine));
         viewModel.revealTopMostCursor(args.source);
         announceCursorChange(previousCursorState, viewModel.getCursorStates());
     }
@@ -79,22 +73,22 @@ class InsertCursorBelow extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.insertCursorBelow',
-            label: ( localize(1531, "Add Cursor Below")),
+            label: ( localize(1543, "Add Cursor Below")),
             alias: 'Add Cursor Below',
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.DownArrow,
+                primary: 2048  | 512  | 18 ,
                 linux: {
-                    primary: KeyMod$1.Shift | KeyMod$1.Alt | KeyCode.DownArrow,
-                    secondary: [KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.DownArrow]
+                    primary: 1024  | 512  | 18 ,
+                    secondary: [2048  | 1024  | 18 ]
                 },
-                weight: KeybindingWeight.EditorContrib
+                weight: 100
             },
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: '3_multi',
-                title: ( localize(1532, "A&&dd Cursor Below")),
+                title: ( localize(1544, "A&&dd Cursor Below")),
                 order: 3
             }
         });
@@ -113,7 +107,7 @@ class InsertCursorBelow extends EditorAction {
         }
         viewModel.model.pushStackElement();
         const previousCursorState = viewModel.getCursorStates();
-        viewModel.setCursorStates(args.source, CursorChangeReason.Explicit, CursorMoveCommands.addCursorDown(viewModel, previousCursorState, useLogicalLine));
+        viewModel.setCursorStates(args.source, 3 , CursorMoveCommands.addCursorDown(viewModel, previousCursorState, useLogicalLine));
         viewModel.revealBottomMostCursor(args.source);
         announceCursorChange(previousCursorState, viewModel.getCursorStates());
     }
@@ -122,18 +116,18 @@ class InsertCursorAtEndOfEachLineSelected extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.insertCursorAtEndOfEachLineSelected',
-            label: ( localize(1533, "Add Cursors to Line Ends")),
+            label: ( localize(1545, "Add Cursors to Line Ends")),
             alias: 'Add Cursors to Line Ends',
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: KeyMod$1.Shift | KeyMod$1.Alt | KeyCode.KeyI,
-                weight: KeybindingWeight.EditorContrib
+                primary: 1024  | 512  | 39 ,
+                weight: 100
             },
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: '3_multi',
-                title: ( localize(1534, "Add C&&ursors to Line Ends")),
+                title: ( localize(1546, "Add C&&ursors to Line Ends")),
                 order: 4
             }
         });
@@ -175,7 +169,7 @@ class InsertCursorAtEndOfLineSelected extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.addCursorsToBottom',
-            label: ( localize(1535, "Add Cursors To Bottom")),
+            label: ( localize(1547, "Add Cursors To Bottom")),
             alias: 'Add Cursors To Bottom',
             precondition: undefined
         });
@@ -202,7 +196,7 @@ class InsertCursorAtTopOfLineSelected extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.addCursorsToTop',
-            label: ( localize(1536, "Add Cursors To Top")),
+            label: ( localize(1548, "Add Cursors To Top")),
             alias: 'Add Cursors To Top',
             precondition: undefined
         });
@@ -308,7 +302,7 @@ class MultiCursorSession {
         }
         const allSelections = this._editor.getSelections();
         return (
-             (new MultiCursorSessionResult(allSelections.concat(nextMatch), nextMatch, ScrollType.Smooth))
+             (new MultiCursorSessionResult(allSelections.concat(nextMatch), nextMatch, 0 ))
         );
     }
     moveSelectionToNextFindMatch() {
@@ -324,7 +318,7 @@ class MultiCursorSession {
              (new MultiCursorSessionResult(
                 allSelections.slice(0, allSelections.length - 1).concat(nextMatch),
                 nextMatch,
-                ScrollType.Smooth
+                0
             ))
         );
     }
@@ -340,7 +334,7 @@ class MultiCursorSession {
         this.findController.highlightFindOptions();
         const allSelections = this._editor.getSelections();
         const lastAddedSelection = allSelections[allSelections.length - 1];
-        const nextMatch = this._editor.getModel().findNextMatch(this.searchText, lastAddedSelection.getEndPosition(), false, this.matchCase, this.wholeWord ? this._editor.getOption(EditorOption.wordSeparators) : null, false);
+        const nextMatch = this._editor.getModel().findNextMatch(this.searchText, lastAddedSelection.getEndPosition(), false, this.matchCase, this.wholeWord ? this._editor.getOption(134 ) : null, false);
         if (!nextMatch) {
             return null;
         }
@@ -363,7 +357,11 @@ class MultiCursorSession {
         }
         const allSelections = this._editor.getSelections();
         return (
-             (new MultiCursorSessionResult(allSelections.concat(previousMatch), previousMatch, ScrollType.Smooth))
+             (new MultiCursorSessionResult(
+                allSelections.concat(previousMatch),
+                previousMatch,
+                0
+            ))
         );
     }
     moveSelectionToPreviousFindMatch() {
@@ -379,7 +377,7 @@ class MultiCursorSession {
              (new MultiCursorSessionResult(
                 allSelections.slice(0, allSelections.length - 1).concat(previousMatch),
                 previousMatch,
-                ScrollType.Smooth
+                0
             ))
         );
     }
@@ -395,7 +393,7 @@ class MultiCursorSession {
         this.findController.highlightFindOptions();
         const allSelections = this._editor.getSelections();
         const lastAddedSelection = allSelections[allSelections.length - 1];
-        const previousMatch = this._editor.getModel().findPreviousMatch(this.searchText, lastAddedSelection.getStartPosition(), false, this.matchCase, this.wholeWord ? this._editor.getOption(EditorOption.wordSeparators) : null, false);
+        const previousMatch = this._editor.getModel().findPreviousMatch(this.searchText, lastAddedSelection.getStartPosition(), false, this.matchCase, this.wholeWord ? this._editor.getOption(134 ) : null, false);
         if (!previousMatch) {
             return null;
         }
@@ -415,9 +413,9 @@ class MultiCursorSession {
         this.findController.highlightFindOptions();
         const editorModel = this._editor.getModel();
         if (searchScope) {
-            return editorModel.findMatches(this.searchText, searchScope, false, this.matchCase, this.wholeWord ? this._editor.getOption(EditorOption.wordSeparators) : null, false, Constants.MAX_SAFE_SMALL_INTEGER);
+            return editorModel.findMatches(this.searchText, searchScope, false, this.matchCase, this.wholeWord ? this._editor.getOption(134 ) : null, false, 1073741824 );
         }
-        return editorModel.findMatches(this.searchText, true, false, this.matchCase, this.wholeWord ? this._editor.getOption(EditorOption.wordSeparators) : null, false, Constants.MAX_SAFE_SMALL_INTEGER);
+        return editorModel.findMatches(this.searchText, true, false, this.matchCase, this.wholeWord ? this._editor.getOption(134 ) : null, false, 1073741824 );
     }
 }
 class MultiCursorSelectionController extends Disposable {
@@ -445,9 +443,9 @@ class MultiCursorSelectionController extends Disposable {
             this._session = session;
             const newState = { searchString: this._session.searchText };
             if (this._session.isDisconnectedFromFindController) {
-                newState.wholeWordOverride = FindOptionOverride.True;
-                newState.matchCaseOverride = FindOptionOverride.True;
-                newState.isRegexOverride = FindOptionOverride.False;
+                newState.wholeWordOverride = 1 ;
+                newState.matchCaseOverride = 1 ;
+                newState.isRegexOverride = 2 ;
             }
             findController.getState().change(newState, false);
             this._sessionDispose.add(this._editor.onDidChangeCursorSelection((e) => {
@@ -470,9 +468,9 @@ class MultiCursorSelectionController extends Disposable {
         this._sessionDispose.clear();
         if (this._session && this._session.isDisconnectedFromFindController) {
             const newState = {
-                wholeWordOverride: FindOptionOverride.NotSet,
-                matchCaseOverride: FindOptionOverride.NotSet,
-                isRegexOverride: FindOptionOverride.NotSet,
+                wholeWordOverride: 0 ,
+                matchCaseOverride: 0 ,
+                isRegexOverride: 0 ,
             };
             this._session.findController.getState().change(newState, false);
         }
@@ -565,10 +563,10 @@ class MultiCursorSelectionController extends Disposable {
         if (findState.isRevealed && findState.searchString.length > 0 && findState.isRegex) {
             const editorModel = this._editor.getModel();
             if (findState.searchScope) {
-                matches = editorModel.findMatches(findState.searchString, findState.searchScope, findState.isRegex, findState.matchCase, findState.wholeWord ? this._editor.getOption(EditorOption.wordSeparators) : null, false, Constants.MAX_SAFE_SMALL_INTEGER);
+                matches = editorModel.findMatches(findState.searchString, findState.searchScope, findState.isRegex, findState.matchCase, findState.wholeWord ? this._editor.getOption(134 ) : null, false, 1073741824 );
             }
             else {
-                matches = editorModel.findMatches(findState.searchString, true, findState.isRegex, findState.matchCase, findState.wholeWord ? this._editor.getOption(EditorOption.wordSeparators) : null, false, Constants.MAX_SAFE_SMALL_INTEGER);
+                matches = editorModel.findMatches(findState.searchString, true, findState.isRegex, findState.matchCase, findState.wholeWord ? this._editor.getOption(134 ) : null, false, 1073741824 );
             }
         }
         else {
@@ -629,18 +627,18 @@ class AddSelectionToNextFindMatchAction extends MultiCursorSelectionControllerAc
     constructor() {
         super({
             id: 'editor.action.addSelectionToNextFindMatch',
-            label: ( localize(1537, "Add Selection To Next Find Match")),
+            label: ( localize(1549, "Add Selection To Next Find Match")),
             alias: 'Add Selection To Next Find Match',
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.focus,
-                primary: KeyMod$1.CtrlCmd | KeyCode.KeyD,
-                weight: KeybindingWeight.EditorContrib
+                primary: 2048  | 34 ,
+                weight: 100
             },
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: '3_multi',
-                title: ( localize(1538, "Add &&Next Occurrence")),
+                title: ( localize(1550, "Add &&Next Occurrence")),
                 order: 5
             }
         });
@@ -653,13 +651,13 @@ class AddSelectionToPreviousFindMatchAction extends MultiCursorSelectionControll
     constructor() {
         super({
             id: 'editor.action.addSelectionToPreviousFindMatch',
-            label: ( localize(1539, "Add Selection To Previous Find Match")),
+            label: ( localize(1551, "Add Selection To Previous Find Match")),
             alias: 'Add Selection To Previous Find Match',
             precondition: undefined,
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: '3_multi',
-                title: ( localize(1540, "Add P&&revious Occurrence")),
+                title: ( localize(1552, "Add P&&revious Occurrence")),
                 order: 6
             }
         });
@@ -672,13 +670,13 @@ class MoveSelectionToNextFindMatchAction extends MultiCursorSelectionControllerA
     constructor() {
         super({
             id: 'editor.action.moveSelectionToNextFindMatch',
-            label: ( localize(1541, "Move Last Selection To Next Find Match")),
+            label: ( localize(1553, "Move Last Selection To Next Find Match")),
             alias: 'Move Last Selection To Next Find Match',
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.focus,
-                primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.CtrlCmd | KeyCode.KeyD),
-                weight: KeybindingWeight.EditorContrib
+                primary: KeyChord(2048  | 41 , 2048  | 34 ),
+                weight: 100
             }
         });
     }
@@ -690,7 +688,7 @@ class MoveSelectionToPreviousFindMatchAction extends MultiCursorSelectionControl
     constructor() {
         super({
             id: 'editor.action.moveSelectionToPreviousFindMatch',
-            label: ( localize(1542, "Move Last Selection To Previous Find Match")),
+            label: ( localize(1554, "Move Last Selection To Previous Find Match")),
             alias: 'Move Last Selection To Previous Find Match',
             precondition: undefined
         });
@@ -703,18 +701,18 @@ class SelectHighlightsAction extends MultiCursorSelectionControllerAction {
     constructor() {
         super({
             id: 'editor.action.selectHighlights',
-            label: ( localize(1543, "Select All Occurrences of Find Match")),
+            label: ( localize(1555, "Select All Occurrences of Find Match")),
             alias: 'Select All Occurrences of Find Match',
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.focus,
-                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyL,
-                weight: KeybindingWeight.EditorContrib
+                primary: 2048  | 1024  | 42 ,
+                weight: 100
             },
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: '3_multi',
-                title: ( localize(1544, "Select All &&Occurrences")),
+                title: ( localize(1556, "Select All &&Occurrences")),
                 order: 7
             }
         });
@@ -727,13 +725,13 @@ class CompatChangeAll extends MultiCursorSelectionControllerAction {
     constructor() {
         super({
             id: 'editor.action.changeAll',
-            label: ( localize(1545, "Change All Occurrences")),
+            label: ( localize(1557, "Change All Occurrences")),
             alias: 'Change All Occurrences',
             precondition: ( (ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.editorTextFocus))),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: KeyMod$1.CtrlCmd | KeyCode.F2,
-                weight: KeybindingWeight.EditorContrib
+                primary: 2048  | 60 ,
+                weight: 100
             },
             contextMenuOpts: {
                 group: '1_modification',
@@ -777,19 +775,19 @@ let SelectionHighlighter = class SelectionHighlighter extends Disposable {
         super();
         this._languageFeaturesService = _languageFeaturesService;
         this.editor = editor;
-        this._isEnabled = editor.getOption(EditorOption.selectionHighlight);
+        this._isEnabled = editor.getOption(111 );
         this._decorations = editor.createDecorationsCollection();
         this.updateSoon = this._register(( (new RunOnceScheduler(() => this._update(), 300))));
         this.state = null;
         this._register(editor.onDidChangeConfiguration((e) => {
-            this._isEnabled = editor.getOption(EditorOption.selectionHighlight);
+            this._isEnabled = editor.getOption(111 );
         }));
         this._register(editor.onDidChangeCursorSelection((e) => {
             if (!this._isEnabled) {
                 return;
             }
             if (e.selection.isEmpty()) {
-                if (e.reason === CursorChangeReason.Explicit) {
+                if (e.reason === 3 ) {
                     if (this.state) {
                         this._setState(null);
                     }
@@ -886,7 +884,7 @@ let SelectionHighlighter = class SelectionHighlighter extends Disposable {
                 editor.getModel(),
                 r.searchText,
                 r.matchCase,
-                r.wholeWord ? editor.getOption(EditorOption.wordSeparators) : null,
+                r.wholeWord ? editor.getOption(134 ) : null,
                 oldState
             ))
         );
@@ -931,7 +929,7 @@ let SelectionHighlighter = class SelectionHighlighter extends Disposable {
                 }
             }
         }
-        const occurrenceHighlighting = this.editor.getOption(EditorOption.occurrencesHighlight) !== 'off';
+        const occurrenceHighlighting = this.editor.getOption(83 ) !== 'off';
         const hasSemanticHighlights = ( (this._languageFeaturesService.documentHighlightProvider.has(model))) && occurrenceHighlighting;
         const decorations = ( (matches.map(r => {
             return {
@@ -971,9 +969,9 @@ class FocusNextCursor extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.focusNextCursor',
-            label: ( localize(1546, "Focus Next Cursor")),
+            label: ( localize(1558, "Focus Next Cursor")),
             metadata: {
-                description: ( localize(1547, "Focuses the next cursor")),
+                description: ( localize(1559, "Focuses the next cursor")),
                 args: [],
             },
             alias: 'Focus Next Cursor',
@@ -995,7 +993,7 @@ class FocusNextCursor extends EditorAction {
             return;
         }
         previousCursorState.push(firstCursor);
-        viewModel.setCursorStates(args.source, CursorChangeReason.Explicit, previousCursorState);
+        viewModel.setCursorStates(args.source, 3 , previousCursorState);
         viewModel.revealPrimaryCursor(args.source, true);
         announceCursorChange(previousCursorState, viewModel.getCursorStates());
     }
@@ -1004,9 +1002,9 @@ class FocusPreviousCursor extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.focusPreviousCursor',
-            label: ( localize(1548, "Focus Previous Cursor")),
+            label: ( localize(1560, "Focus Previous Cursor")),
             metadata: {
-                description: ( localize(1549, "Focuses the previous cursor")),
+                description: ( localize(1561, "Focuses the previous cursor")),
                 args: [],
             },
             alias: 'Focus Previous Cursor',
@@ -1028,13 +1026,13 @@ class FocusPreviousCursor extends EditorAction {
             return;
         }
         previousCursorState.unshift(firstCursor);
-        viewModel.setCursorStates(args.source, CursorChangeReason.Explicit, previousCursorState);
+        viewModel.setCursorStates(args.source, 3 , previousCursorState);
         viewModel.revealPrimaryCursor(args.source, true);
         announceCursorChange(previousCursorState, viewModel.getCursorStates());
     }
 }
-registerEditorContribution(MultiCursorSelectionController.ID, MultiCursorSelectionController, EditorContributionInstantiation.Lazy);
-registerEditorContribution(SelectionHighlighter.ID, SelectionHighlighter, EditorContributionInstantiation.AfterFirstRender);
+registerEditorContribution(MultiCursorSelectionController.ID, MultiCursorSelectionController, 4 );
+registerEditorContribution(SelectionHighlighter.ID, SelectionHighlighter, 1 );
 registerEditorAction(InsertCursorAbove);
 registerEditorAction(InsertCursorBelow);
 registerEditorAction(InsertCursorAtEndOfEachLineSelected);

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

@@ -1,8 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { KeyCode, KeyMod as KeyMod$1 } from '../../../../base/common/keyCodes.js';
 import { Lazy } from '../../../../base/common/lazy.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { registerEditorContribution, registerEditorAction, registerEditorCommand, EditorContributionInstantiation, EditorCommand, EditorAction } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, registerEditorAction, registerEditorCommand, EditorCommand, EditorAction } from '../../../browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { SignatureHelpTriggerKind } from '../../../common/languages.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
@@ -11,7 +10,6 @@ import { Context } from './provideSignatureHelp.js';
 import { localize } from '../../../../nls.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ParameterHintsWidget } from './parameterHintsWidget.js';
 var ParameterHintsController_1;
 let ParameterHintsController = class ParameterHintsController extends Disposable {
@@ -58,13 +56,13 @@ class TriggerParameterHintsAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.triggerParameterHints',
-            label: ( localize(1550, "Trigger Parameter Hints")),
+            label: ( localize(1563, "Trigger Parameter Hints")),
             alias: 'Trigger Parameter Hints',
             precondition: EditorContextKeys.hasSignatureHelpProvider,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.Space,
-                weight: KeybindingWeight.EditorContrib
+                primary: 2048  | 1024  | 10 ,
+                weight: 100
             }
         });
     }
@@ -75,9 +73,9 @@ class TriggerParameterHintsAction extends EditorAction {
         });
     }
 }
-registerEditorContribution(ParameterHintsController.ID, ParameterHintsController, EditorContributionInstantiation.BeforeFirstInteraction);
+registerEditorContribution(ParameterHintsController.ID, ParameterHintsController, 2 );
 registerEditorAction(TriggerParameterHintsAction);
-const weight = KeybindingWeight.EditorContrib + 75;
+const weight = 100  + 75;
 const ParameterHintsCommand = EditorCommand.bindToContribution(ParameterHintsController.get);
 registerEditorCommand(( (new ParameterHintsCommand({
     id: 'closeParameterHints',
@@ -86,8 +84,8 @@ registerEditorCommand(( (new ParameterHintsCommand({
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.focus,
-        primary: KeyCode.Escape,
-        secondary: [KeyMod$1.Shift | KeyCode.Escape]
+        primary: 9 ,
+        secondary: [1024  | 9 ]
     }
 }))));
 registerEditorCommand(( (new ParameterHintsCommand({
@@ -97,9 +95,9 @@ registerEditorCommand(( (new ParameterHintsCommand({
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.focus,
-        primary: KeyCode.UpArrow,
-        secondary: [KeyMod$1.Alt | KeyCode.UpArrow],
-        mac: { primary: KeyCode.UpArrow, secondary: [KeyMod$1.Alt | KeyCode.UpArrow, KeyMod$1.WinCtrl | KeyCode.KeyP] }
+        primary: 16 ,
+        secondary: [512  | 16 ],
+        mac: { primary: 16 , secondary: [512  | 16 , 256  | 46 ] }
     }
 }))));
 registerEditorCommand(( (new ParameterHintsCommand({
@@ -109,9 +107,9 @@ registerEditorCommand(( (new ParameterHintsCommand({
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.focus,
-        primary: KeyCode.DownArrow,
-        secondary: [KeyMod$1.Alt | KeyCode.DownArrow],
-        mac: { primary: KeyCode.DownArrow, secondary: [KeyMod$1.Alt | KeyCode.DownArrow, KeyMod$1.WinCtrl | KeyCode.KeyN] }
+        primary: 18 ,
+        secondary: [512  | 18 ],
+        mac: { primary: 18 , secondary: [512  | 18 , 256  | 44 ] }
     }
 }))));
 export { ParameterHintsController, TriggerParameterHintsAction };

package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHintsModel.js

@@ -2,31 +2,29 @@ import { Delayer, createCancelablePromise } from '../../../../base/common/async.
 import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { EditorOption } from '../../../common/config/editorOptions.js';
 import { CharacterSet } from '../../../common/core/characterClassifier.js';
 import { SignatureHelpTriggerKind } from '../../../common/languages.js';
 import { provideSignatureHelp } from './provideSignatureHelp.js';
 var ParameterHintState;
 ( (function(ParameterHintState) {
-    let Type;
     ( (function(Type) {
         Type[Type["Default"] = 0] = "Default";
         Type[Type["Active"] = 1] = "Active";
         Type[Type["Pending"] = 2] = "Pending";
-    })(Type = ParameterHintState.Type || (ParameterHintState.Type = {})));
-    ParameterHintState.Default = { type: Type.Default };
+    })(ParameterHintState.Type || (ParameterHintState.Type = {})));
+    ParameterHintState.Default = { type: 0  };
     class Pending {
         constructor(request, previouslyActiveHints) {
             this.request = request;
             this.previouslyActiveHints = previouslyActiveHints;
-            this.type = Type.Pending;
+            this.type = 2 ;
         }
     }
     ParameterHintState.Pending = Pending;
     class Active {
         constructor(hints) {
             this.hints = hints;
-            this.type = Type.Active;
+            this.type = 1 ;
         }
     }
     ParameterHintState.Active = Active;
@@ -60,7 +58,7 @@ class ParameterHintsModel extends Disposable {
     }
     get state() { return this._state; }
     set state(value) {
-        if (this._state.type === ParameterHintState.Type.Pending) {
+        if (this._state.type === 2 ) {
             this._state.request.cancel();
         }
         this._state = value;
@@ -85,13 +83,13 @@ class ParameterHintsModel extends Disposable {
             .catch(onUnexpectedError);
     }
     next() {
-        if (this.state.type !== ParameterHintState.Type.Active) {
+        if (this.state.type !== 1 ) {
             return;
         }
         const length = this.state.hints.signatures.length;
         const activeSignature = this.state.hints.activeSignature;
         const last = (activeSignature % length) === (length - 1);
-        const cycle = this.editor.getOption(EditorOption.parameterHints).cycle;
+        const cycle = this.editor.getOption(88 ).cycle;
         if ((length < 2 || last) && !cycle) {
             this.cancel();
             return;
@@ -99,13 +97,13 @@ class ParameterHintsModel extends Disposable {
         this.updateActiveSignature(last && cycle ? 0 : activeSignature + 1);
     }
     previous() {
-        if (this.state.type !== ParameterHintState.Type.Active) {
+        if (this.state.type !== 1 ) {
             return;
         }
         const length = this.state.hints.signatures.length;
         const activeSignature = this.state.hints.activeSignature;
         const first = activeSignature === 0;
-        const cycle = this.editor.getOption(EditorOption.parameterHints).cycle;
+        const cycle = this.editor.getOption(88 ).cycle;
         if ((length < 2 || first) && !cycle) {
             this.cancel();
             return;
@@ -113,14 +111,14 @@ class ParameterHintsModel extends Disposable {
         this.updateActiveSignature(first && cycle ? length - 1 : activeSignature - 1);
     }
     updateActiveSignature(activeSignature) {
-        if (this.state.type !== ParameterHintState.Type.Active) {
+        if (this.state.type !== 1 ) {
             return;
         }
         this.state = new ParameterHintState.Active({ ...this.state.hints, activeSignature });
         this._onChangedHints.fire(this.state.hints);
     }
     async doTrigger(triggerId) {
-        const isRetrigger = this.state.type === ParameterHintState.Type.Active || this.state.type === ParameterHintState.Type.Pending;
+        const isRetrigger = this.state.type === 1  || this.state.type === 2 ;
         const activeSignatureHelp = this.getLastActiveHints();
         this.cancel(true);
         if (this._pendingTriggers.length === 0) {
@@ -169,14 +167,14 @@ class ParameterHintsModel extends Disposable {
     }
     getLastActiveHints() {
         switch (this.state.type) {
-            case ParameterHintState.Type.Active: return this.state.hints;
-            case ParameterHintState.Type.Pending: return this.state.previouslyActiveHints;
+            case 1 : return this.state.hints;
+            case 2 : return this.state.previouslyActiveHints;
             default: return undefined;
         }
     }
     get isTriggered() {
-        return this.state.type === ParameterHintState.Type.Active
-            || this.state.type === ParameterHintState.Type.Pending
+        return this.state.type === 1
+            || this.state.type === 2
             || this.throttledDelayer.isTriggered();
     }
     onModelChanged() {
@@ -229,7 +227,7 @@ class ParameterHintsModel extends Disposable {
         }
     }
     onEditorConfigurationChange() {
-        this.triggerOnType = this.editor.getOption(EditorOption.parameterHints).enabled;
+        this.triggerOnType = this.editor.getOption(88 ).enabled;
         if (!this.triggerOnType) {
             this.cancel();
         }