@codingame/monaco-vscode-api 11.1.1 → 12.0.0

package/vscode/src/vs/editor/contrib/suggest/browser/suggestController.js

@@ -1,35 +1,42 @@
+
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
 import { isNonEmptyArray } from '../../../../base/common/arrays.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { onUnexpectedExternalError, onUnexpectedError } from '../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
+import { KeyCode, KeyMod as KeyMod$1 } from '../../../../base/common/keyCodes.js';
 import { KeyCodeChord } from '../../../../base/common/keybindings.js';
 import { MutableDisposable, DisposableStore, toDisposable, dispose } from '../../../../base/common/lifecycle.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { assertType, isObject } from '../../../../base/common/types.js';
 import { StableEditorScrollState } from '../../../browser/stableEditorScroll.js';
-import { EditorAction, registerEditorContribution, registerEditorAction, EditorCommand, registerEditorCommand } from '../../../browser/editorExtensions.js';
+import { EditorAction, registerEditorContribution, EditorContributionInstantiation, registerEditorAction, EditorCommand, registerEditorCommand } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { EditOperation } from '../../../common/core/editOperation.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
+import { ScrollType } from '../../../common/editorCommon.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { TrackedRangeStickiness } from '../../../common/model.js';
+import { CompletionItemInsertTextRule, CompletionTriggerKind } from '../../../common/languages.js';
 import { SnippetController2 } from '../../snippet/browser/snippetController2.js';
 import { SnippetParser } from '../../snippet/browser/snippetParser.js';
 import { ISuggestMemoryService } from './suggestMemory.js';
 import { WordContextKey } from './wordContextKey.js';
-import { localize } from '../../../../nls.js';
+import { localize, localize2 } from '../../../../nls.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { Context, suggestWidgetStatusbarMenu } from './suggest.js';
 import { SuggestAlternatives } from './suggestAlternatives.js';
 import { CommitCharacterController } from './suggestCommitCharacters.js';
-import { SuggestModel } from './suggestModel.js';
+import { SuggestModel, State } from './suggestModel.js';
 import { OvertypingCapturer } from './suggestOvertypingCapturer.js';
 import { SuggestWidget } from './suggestWidget.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
@@ -45,7 +52,7 @@ class LineSuffix {
         this._position = _position;
         this._decorationOptions = ModelDecorationOptions.register({
             description: 'suggest-line-suffix',
-            stickiness: 1
+            stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges
         });
         const maxColumn = _model.getLineMaxColumn(_position.lineNumber);
         if (maxColumn !== _position.column) {
@@ -81,6 +88,14 @@ class LineSuffix {
         }
     }
 }
+var InsertFlags;
+(function (InsertFlags) {
+    InsertFlags[InsertFlags["None"] = 0] = "None";
+    InsertFlags[InsertFlags["NoBeforeUndoStop"] = 1] = "NoBeforeUndoStop";
+    InsertFlags[InsertFlags["NoAfterUndoStop"] = 2] = "NoAfterUndoStop";
+    InsertFlags[InsertFlags["KeepAlternativeSuggestions"] = 4] = "KeepAlternativeSuggestions";
+    InsertFlags[InsertFlags["AlternativeOverwriteConfig"] = 8] = "AlternativeOverwriteConfig";
+})(InsertFlags || (InsertFlags = {}));
 let SuggestController = class SuggestController {
     static { SuggestController_1 = this; }
     static { this.ID = 'editor.contrib.suggestController'; }
@@ -94,10 +109,10 @@ let SuggestController = class SuggestController {
         this._instantiationService = _instantiationService;
         this._logService = _logService;
         this._telemetryService = _telemetryService;
-        this._lineSuffix = ( (new MutableDisposable()));
-        this._toDispose = ( (new DisposableStore()));
-        this._selectors = ( (new PriorityRegistry(s => s.priority)));
-        this._onWillInsertSuggestItem = ( (new Emitter()));
+        this._lineSuffix = ( new MutableDisposable());
+        this._toDispose = ( new DisposableStore());
+        this._selectors = ( new PriorityRegistry(s => s.priority));
+        this._onWillInsertSuggestItem = ( new Emitter());
         this.onWillInsertSuggestItem = this._onWillInsertSuggestItem.event;
         this.editor = editor;
         this.model = _instantiationService.createInstance(SuggestModel, this.editor);
@@ -106,18 +121,18 @@ let SuggestController = class SuggestController {
             select: (model, pos, items) => this._memoryService.select(model, pos, items)
         });
         const ctxInsertMode = Context.InsertMode.bindTo(_contextKeyService);
-        ctxInsertMode.set(editor.getOption(121 ).insertMode);
-        this._toDispose.add(this.model.onDidTrigger(() => ctxInsertMode.set(editor.getOption(121 ).insertMode)));
-        this.widget = this._toDispose.add(( (new WindowIdleValue(getWindow(editor.getDomNode()), () => {
+        ctxInsertMode.set(editor.getOption(EditorOption.suggest).insertMode);
+        this._toDispose.add(this.model.onDidTrigger(() => ctxInsertMode.set(editor.getOption(EditorOption.suggest).insertMode)));
+        this.widget = this._toDispose.add(( new WindowIdleValue(getWindow(editor.getDomNode()), () => {
             const widget = this._instantiationService.createInstance(SuggestWidget, this.editor);
             this._toDispose.add(widget);
-            this._toDispose.add(widget.onDidSelect(item => this._insertSuggestion(item, 0 ), this));
-            const commitCharacterController = ( (new CommitCharacterController(
+            this._toDispose.add(widget.onDidSelect(item => this._insertSuggestion(item, InsertFlags.None), this));
+            const commitCharacterController = ( new CommitCharacterController(
                 this.editor,
                 widget,
                 this.model,
-                item => this._insertSuggestion(item, 2 )
-            )));
+                item => this._insertSuggestion(item, InsertFlags.NoAfterUndoStop)
+            ));
             this._toDispose.add(commitCharacterController);
             const ctxMakesTextEdit = Context.MakesTextEdit.bindTo(this._contextKeyService);
             const ctxHasInsertAndReplace = Context.HasInsertAndReplaceRange.bindTo(this._contextKeyService);
@@ -132,10 +147,10 @@ let SuggestController = class SuggestController {
                 const startColumn = item.editStart.column;
                 const endColumn = position.column;
                 let value = true;
-                if (this.editor.getOption(1 ) === 'smart'
-                    && this.model.state === 2
+                if (this.editor.getOption(EditorOption.acceptSuggestionOnEnter) === 'smart'
+                    && this.model.state === State.Auto
                     && !item.completion.additionalTextEdits
-                    && !((item.completion.insertTextRules & 4) )
+                    && !(item.completion.insertTextRules & CompletionItemInsertTextRule.InsertAsSnippet)
                     && endColumn - startColumn === item.completion.insertText.length) {
                     const oldText = this.editor.getModel().getValueInRange({
                         startLineNumber: position.lineNumber,
@@ -150,8 +165,8 @@ let SuggestController = class SuggestController {
                 ctxCanResolve.set(Boolean(item.provider.resolveCompletionItem) || Boolean(item.completion.documentation) || item.completion.detail !== item.completion.label);
             }));
             this._toDispose.add(widget.onDetailsKeyDown(e => {
-                if (e.toKeyCodeChord().equals(( (new KeyCodeChord(true, false, false, false, 33 )))) ||
-                    (isMacintosh && e.toKeyCodeChord().equals(( (new KeyCodeChord(false, false, false, true, 33 )))))) {
+                if (e.toKeyCodeChord().equals(( new KeyCodeChord(true, false, false, false, KeyCode.KeyC))) ||
+                    (isMacintosh && e.toKeyCodeChord().equals(( new KeyCodeChord(false, false, false, true, KeyCode.KeyC))))) {
                     e.stopPropagation();
                     return;
                 }
@@ -160,17 +175,17 @@ let SuggestController = class SuggestController {
                 }
             }));
             return widget;
-        }))));
-        this._overtypingCapturer = this._toDispose.add(( (new WindowIdleValue(getWindow(editor.getDomNode()), () => {
-            return this._toDispose.add(( (new OvertypingCapturer(this.editor, this.model))));
-        }))));
-        this._alternatives = this._toDispose.add(( (new WindowIdleValue(getWindow(editor.getDomNode()), () => {
-            return this._toDispose.add(( (new SuggestAlternatives(this.editor, this._contextKeyService))));
-        }))));
+        })));
+        this._overtypingCapturer = this._toDispose.add(( new WindowIdleValue(getWindow(editor.getDomNode()), () => {
+            return this._toDispose.add(( new OvertypingCapturer(this.editor, this.model)));
+        })));
+        this._alternatives = this._toDispose.add(( new WindowIdleValue(getWindow(editor.getDomNode()), () => {
+            return this._toDispose.add(( new SuggestAlternatives(this.editor, this._contextKeyService)));
+        })));
         this._toDispose.add(_instantiationService.createInstance(WordContextKey, editor));
         this._toDispose.add(this.model.onDidTrigger(e => {
             this.widget.value.showTriggered(e.auto, e.shy ? 250 : 50);
-            this._lineSuffix.value = ( (new LineSuffix(this.editor.getModel(), e.position)));
+            this._lineSuffix.value = ( new LineSuffix(this.editor.getModel(), e.position));
         }));
         this._toDispose.add(this.model.onDidSuggest(e => {
             if (e.triggerOptions.shy) {
@@ -186,20 +201,20 @@ let SuggestController = class SuggestController {
             if (index === -1) {
                 index = 0;
             }
-            if (this.model.state === 0 ) {
+            if (this.model.state === State.Idle) {
                 return;
             }
             let noFocus = false;
             if (e.triggerOptions.auto) {
-                const options = this.editor.getOption(121 );
+                const options = this.editor.getOption(EditorOption.suggest);
                 if (options.selectionMode === 'never' || options.selectionMode === 'always') {
                     noFocus = options.selectionMode === 'never';
                 }
                 else if (options.selectionMode === 'whenTriggerCharacter') {
-                    noFocus = e.triggerOptions.triggerKind !== 1 ;
+                    noFocus = e.triggerOptions.triggerKind !== CompletionTriggerKind.TriggerCharacter;
                 }
                 else if (options.selectionMode === 'whenQuickSuggestion') {
-                    noFocus = e.triggerOptions.triggerKind === 1  && !e.triggerOptions.refilter;
+                    noFocus = e.triggerOptions.triggerKind === CompletionTriggerKind.TriggerCharacter && !e.triggerOptions.refilter;
                 }
             }
             this.widget.value.showSuggestions(e.completionModel, index, e.isFrozen, e.triggerOptions.auto, noFocus);
@@ -217,7 +232,7 @@ let SuggestController = class SuggestController {
         }));
         const acceptSuggestionsOnEnter = Context.AcceptSuggestionsOnEnter.bindTo(_contextKeyService);
         const updateFromConfig = () => {
-            const acceptSuggestionOnEnter = this.editor.getOption(1 );
+            const acceptSuggestionOnEnter = this.editor.getOption(EditorOption.acceptSuggestionOnEnter);
             acceptSuggestionsOnEnter.set(acceptSuggestionOnEnter === 'on' || acceptSuggestionOnEnter === 'smart');
         };
         this._toDispose.add(this.editor.onDidChangeConfiguration(() => updateFromConfig()));
@@ -250,11 +265,11 @@ let SuggestController = class SuggestController {
         const modelVersionNow = model.getAlternativeVersionId();
         const { item } = event;
         const tasks = [];
-        const cts = ( (new CancellationTokenSource()));
-        if (!((flags & 1) )) {
+        const cts = ( new CancellationTokenSource());
+        if (!(flags & InsertFlags.NoBeforeUndoStop)) {
             this.editor.pushUndoStop();
         }
-        const info = this.getOverwriteInfo(item, Boolean(flags & 8 ));
+        const info = this.getOverwriteInfo(item, Boolean(flags & InsertFlags.AlternativeOverwriteConfig));
         this._memoryService.memorize(model, this.editor.getPosition(), item);
         const isResolved = item.isResolved;
         let _commandExectionDuration = -1;
@@ -262,25 +277,25 @@ let SuggestController = class SuggestController {
         if (Array.isArray(item.completion.additionalTextEdits)) {
             this.model.cancel();
             const scrollState = StableEditorScrollState.capture(this.editor);
-            this.editor.executeEdits('suggestController.additionalTextEdits.sync', ( (item.completion.additionalTextEdits.map(edit => {
+            this.editor.executeEdits('suggestController.additionalTextEdits.sync', ( item.completion.additionalTextEdits.map(edit => {
                 let range = Range.lift(edit.range);
                 if (range.startLineNumber === item.position.lineNumber && range.startColumn > item.position.column) {
                     const columnDelta = this.editor.getPosition().column - item.position.column;
                     const startColumnDelta = columnDelta;
                     const endColumnDelta = Range.spansMultipleLines(range) ? 0 : columnDelta;
-                    range = ( (new Range(
+                    range = ( new Range(
                         range.startLineNumber,
                         range.startColumn + startColumnDelta,
                         range.endLineNumber,
                         range.endColumn + endColumnDelta
-                    )));
+                    ));
                 }
                 return EditOperation.replaceMove(range, edit.text);
-            }))));
+            })));
             scrollState.restoreRelativeVerticalPositionOfCursor(this.editor);
         }
         else if (!isResolved) {
-            const sw = ( (new StopWatch()));
+            const sw = ( new StopWatch());
             let position;
             const docListener = model.onDidChangeContent(e => {
                 if (e.isFlush) {
@@ -296,12 +311,12 @@ let SuggestController = class SuggestController {
                 }
             });
             const oldFlags = flags;
-            flags |= 2 ;
+            flags |= InsertFlags.NoAfterUndoStop;
             let didType = false;
             const typeListener = this.editor.onWillType(() => {
                 typeListener.dispose();
                 didType = true;
-                if (!((oldFlags & 2) )) {
+                if (!(oldFlags & InsertFlags.NoAfterUndoStop)) {
                     this.editor.pushUndoStop();
                 }
             });
@@ -309,16 +324,16 @@ let SuggestController = class SuggestController {
                 if (!item.completion.additionalTextEdits || cts.token.isCancellationRequested) {
                     return undefined;
                 }
-                if (position && ( (item.completion.additionalTextEdits.some(edit => Position.isBefore(position, Range.getStartPosition(edit.range)))))) {
+                if (position && ( item.completion.additionalTextEdits.some(edit => Position.isBefore(position, Range.getStartPosition(edit.range))))) {
                     return false;
                 }
                 if (didType) {
                     this.editor.pushUndoStop();
                 }
                 const scrollState = StableEditorScrollState.capture(this.editor);
-                this.editor.executeEdits('suggestController.additionalTextEdits.async', ( (item.completion.additionalTextEdits.map(edit => EditOperation.replaceMove(Range.lift(edit.range), edit.text)))));
+                this.editor.executeEdits('suggestController.additionalTextEdits.async', ( item.completion.additionalTextEdits.map(edit => EditOperation.replaceMove(Range.lift(edit.range), edit.text))));
                 scrollState.restoreRelativeVerticalPositionOfCursor(this.editor);
-                if (didType || !((oldFlags & 2) )) {
+                if (didType || !(oldFlags & InsertFlags.NoAfterUndoStop)) {
                     this.editor.pushUndoStop();
                 }
                 return true;
@@ -331,7 +346,7 @@ let SuggestController = class SuggestController {
             }));
         }
         let { insertText } = item.completion;
-        if (!((item.completion.insertTextRules & 4) )) {
+        if (!(item.completion.insertTextRules & CompletionItemInsertTextRule.InsertAsSnippet)) {
             insertText = SnippetParser.escape(insertText);
         }
         this.model.cancel();
@@ -340,11 +355,11 @@ let SuggestController = class SuggestController {
             overwriteAfter: info.overwriteAfter,
             undoStopBefore: false,
             undoStopAfter: false,
-            adjustWhitespace: !((item.completion.insertTextRules & 1) ),
+            adjustWhitespace: !(item.completion.insertTextRules & CompletionItemInsertTextRule.KeepWhitespace),
             clipboardText: event.model.clipboardText,
             overtypingCapturer: this._overtypingCapturer.value
         });
-        if (!((flags & 2) )) {
+        if (!(flags & InsertFlags.NoAfterUndoStop)) {
             this.editor.pushUndoStop();
         }
         if (item.completion.command) {
@@ -352,7 +367,7 @@ let SuggestController = class SuggestController {
                 this.model.trigger({ auto: true, retrigger: true });
             }
             else {
-                const sw = ( (new StopWatch()));
+                const sw = ( new StopWatch());
                 tasks.push(this._commandService.executeCommand(item.completion.command.id, ...(item.completion.command.arguments ? [...item.completion.command.arguments] : [])).catch(e => {
                     if (item.completion.extensionId) {
                         onUnexpectedExternalError(e);
@@ -365,14 +380,14 @@ let SuggestController = class SuggestController {
                 }));
             }
         }
-        if (flags & 4 ) {
+        if (flags & InsertFlags.KeepAlternativeSuggestions) {
             this._alternatives.value.set(event, next => {
                 cts.cancel();
                 while (model.canUndo()) {
                     if (modelVersionNow !== model.getAlternativeVersionId()) {
                         model.undo();
                     }
-                    this._insertSuggestion(next, 1  | 2  | (flags & 8  ? 8  : 0));
+                    this._insertSuggestion(next, InsertFlags.NoBeforeUndoStop | InsertFlags.NoAfterUndoStop | (flags & InsertFlags.AlternativeOverwriteConfig ? InsertFlags.AlternativeOverwriteConfig : 0));
                     break;
                 }
             });
@@ -388,10 +403,10 @@ let SuggestController = class SuggestController {
         if (Math.floor(Math.random() * 100) === 0) {
             return;
         }
-        const labelMap = ( (new Map()));
+        const labelMap = ( new Map());
         for (let i = 0; i < Math.min(30, completionItems.length); i++) {
             const label = completionItems[i].textLabel;
-            if (( (labelMap.has(label)))) {
+            if (( labelMap.has(label))) {
                 labelMap.get(label).push(i);
             }
             else {
@@ -405,7 +420,7 @@ let SuggestController = class SuggestController {
             extensionId: item.extensionId?.value ?? 'unknown',
             providerId: item.provider._debugDisplayName ?? 'unknown',
             kind: item.completion.kind,
-            basenameHash: ( (hash(basename(model.uri)).toString(16))),
+            basenameHash: ( hash(basename(model.uri)).toString(16)),
             languageId: model.getLanguageId(),
             fileExtension: extname(model.uri),
             resolveInfo: !item.provider.resolveCompletionItem ? -1 : itemResolved ? 1 : 0,
@@ -418,7 +433,7 @@ let SuggestController = class SuggestController {
     }
     getOverwriteInfo(item, toggleMode) {
         assertType(this.editor.hasModel());
-        let replace = this.editor.getOption(121 ).insertMode === 'replace';
+        let replace = this.editor.getOption(EditorOption.suggest).insertMode === 'replace';
         if (toggleMode) {
             replace = !replace;
         }
@@ -434,7 +449,7 @@ let SuggestController = class SuggestController {
     _alertCompletionItem(item) {
         if (isNonEmptyArray(item.completion.additionalTextEdits)) {
             const msg = ( localize(
-                1579,
+                1432,
                 "Accepting '{0}' made {1} additional edits",
                 item.textLabel,
                 item.completion.additionalTextEdits.length
@@ -446,9 +461,9 @@ let SuggestController = class SuggestController {
         if (this.editor.hasModel()) {
             this.model.trigger({
                 auto: auto ?? false,
-                completionOptions: { providerFilter: onlyFrom, kindFilter: noFilter ? ( (new Set())) : undefined }
+                completionOptions: { providerFilter: onlyFrom, kindFilter: noFilter ? ( new Set()) : undefined }
             });
-            this.editor.revealPosition(this.editor.getPosition(), 0 );
+            this.editor.revealPosition(this.editor.getPosition(), ScrollType.Smooth);
             this.editor.focus();
         }
     }
@@ -463,7 +478,7 @@ let SuggestController = class SuggestController {
             }
         };
         const makesTextEdit = (item) => {
-            if (item.completion.insertTextRules & 4  || item.completion.additionalTextEdits) {
+            if (item.completion.insertTextRules & CompletionItemInsertTextRule.InsertAsSnippet || item.completion.additionalTextEdits) {
                 return true;
             }
             const position = this.editor.getPosition();
@@ -499,21 +514,21 @@ let SuggestController = class SuggestController {
                     return;
                 }
                 this.editor.pushUndoStop();
-                this._insertSuggestion({ index, item, model: completionModel }, 4  | 1  | 2 );
+                this._insertSuggestion({ index, item, model: completionModel }, InsertFlags.KeepAlternativeSuggestions | InsertFlags.NoBeforeUndoStop | InsertFlags.NoAfterUndoStop);
             }, undefined, listener);
         });
         this.model.trigger({ auto: false, shy: true });
-        this.editor.revealPosition(positionNow, 0 );
+        this.editor.revealPosition(positionNow, ScrollType.Smooth);
         this.editor.focus();
     }
     acceptSelectedSuggestion(keepAlternativeSuggestions, alternativeOverwriteConfig) {
         const item = this.widget.value.getFocusedItem();
         let flags = 0;
         if (keepAlternativeSuggestions) {
-            flags |= 4 ;
+            flags |= InsertFlags.KeepAlternativeSuggestions;
         }
         if (alternativeOverwriteConfig) {
-            flags |= 8 ;
+            flags |= InsertFlags.AlternativeOverwriteConfig;
         }
         this._insertSuggestion(item, flags);
     }
@@ -574,22 +589,22 @@ let SuggestController = class SuggestController {
         return this._selectors.register(selector);
     }
 };
-SuggestController = SuggestController_1 = ( (__decorate([
-    ( (__param(1, ISuggestMemoryService))),
-    ( (__param(2, ICommandService))),
-    ( (__param(3, IContextKeyService))),
-    ( (__param(4, IInstantiationService))),
-    ( (__param(5, ILogService))),
-    ( (__param(6, ITelemetryService)))
-], SuggestController)));
+SuggestController = SuggestController_1 = ( __decorate([
+    ( __param(1, ISuggestMemoryService)),
+    ( __param(2, ICommandService)),
+    ( __param(3, IContextKeyService)),
+    ( __param(4, IInstantiationService)),
+    ( __param(5, ILogService)),
+    ( __param(6, ITelemetryService))
+], SuggestController));
 class PriorityRegistry {
     constructor(prioritySelector) {
         this.prioritySelector = prioritySelector;
-        this._items = ( (new Array()));
+        this._items = ( new Array());
     }
     register(value) {
         if (this._items.indexOf(value) !== -1) {
-            throw ( (new Error('Value is already registered')));
+            throw ( new Error('Value is already registered'));
         }
         this._items.push(value);
         this._items.sort((s1, s2) => this.prioritySelector(s2) - this.prioritySelector(s1));
@@ -611,19 +626,18 @@ class TriggerSuggestAction extends EditorAction {
     constructor() {
         super({
             id: TriggerSuggestAction.id,
-            label: ( localize(1580, "Trigger Suggest")),
-            alias: 'Trigger Suggest',
-            precondition: ( (ContextKeyExpr.and(
+            label: ( localize2(1433, "Trigger Suggest")),
+            precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 EditorContextKeys.hasCompletionItemProvider,
-                 (Context.Visible.toNegated())
-            ))),
+                ( Context.Visible.toNegated())
+            )),
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
-                primary: 2048  | 10 ,
-                secondary: [2048  | 39 ],
-                mac: { primary: 256  | 10 , secondary: [512  | 9 , 2048  | 39 ] },
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyCode.Space,
+                secondary: [KeyMod$1.CtrlCmd | KeyCode.KeyI],
+                mac: { primary: KeyMod$1.WinCtrl | KeyCode.Space, secondary: [KeyMod$1.Alt | KeyCode.Escape, KeyMod$1.CtrlCmd | KeyCode.KeyI] },
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -641,68 +655,62 @@ class TriggerSuggestAction extends EditorAction {
         controller.triggerSuggest(undefined, auto, undefined);
     }
 }
-registerEditorContribution(SuggestController.ID, SuggestController, 2 );
+registerEditorContribution(SuggestController.ID, SuggestController, EditorContributionInstantiation.BeforeFirstInteraction);
 registerEditorAction(TriggerSuggestAction);
-const weight = 100  + 90;
+const weight = KeybindingWeight.EditorContrib + 90;
 const SuggestCommand = EditorCommand.bindToContribution(SuggestController.get);
-registerEditorCommand(( (new SuggestCommand({
+registerEditorCommand(( new SuggestCommand({
     id: 'acceptSelectedSuggestion',
-    precondition: ( (ContextKeyExpr.and(Context.Visible, Context.HasFocusedSuggestion))),
+    precondition: ( ContextKeyExpr.and(Context.Visible, Context.HasFocusedSuggestion)),
     handler(x) {
         x.acceptSelectedSuggestion(true, false);
     },
     kbOpts: [{
-            primary: 2 ,
-            kbExpr: ( (ContextKeyExpr.and(Context.Visible, EditorContextKeys.textInputFocus))),
+            primary: KeyCode.Tab,
+            kbExpr: ( ContextKeyExpr.and(Context.Visible, EditorContextKeys.textInputFocus)),
             weight,
         }, {
-            primary: 3 ,
-            kbExpr: ( (ContextKeyExpr.and(
+            primary: KeyCode.Enter,
+            kbExpr: ( ContextKeyExpr.and(
                 Context.Visible,
                 EditorContextKeys.textInputFocus,
                 Context.AcceptSuggestionsOnEnter,
                 Context.MakesTextEdit
-            ))),
+            )),
             weight,
         }],
     menuOpts: [{
             menuId: suggestWidgetStatusbarMenu,
-            title: ( localize(1581, "Insert")),
+            title: ( localize(1434, "Insert")),
             group: 'left',
             order: 1,
-            when: ( (Context.HasInsertAndReplaceRange.toNegated()))
+            when: ( Context.HasInsertAndReplaceRange.toNegated())
         }, {
             menuId: suggestWidgetStatusbarMenu,
-            title: ( localize(1581, "Insert")),
+            title: ( localize(1434, "Insert")),
             group: 'left',
             order: 1,
-            when: ( (ContextKeyExpr.and(
-                Context.HasInsertAndReplaceRange,
-                 (Context.InsertMode.isEqualTo('insert'))
-            )))
+            when: ( ContextKeyExpr.and(Context.HasInsertAndReplaceRange, ( Context.InsertMode.isEqualTo('insert'))))
         }, {
             menuId: suggestWidgetStatusbarMenu,
-            title: ( localize(1582, "Replace")),
+            title: ( localize(1435, "Replace")),
             group: 'left',
             order: 1,
-            when: ( (ContextKeyExpr.and(
-                Context.HasInsertAndReplaceRange,
-                 (Context.InsertMode.isEqualTo('replace'))
-            )))
+            when: ( ContextKeyExpr.and(Context.HasInsertAndReplaceRange, ( Context.InsertMode.isEqualTo('replace'))))
         }]
-}))));
-registerEditorCommand(( (new SuggestCommand({
+})));
+registerEditorCommand(( new SuggestCommand({
     id: 'acceptAlternativeSelectedSuggestion',
-    precondition: ( (ContextKeyExpr.and(
+    precondition: ( ContextKeyExpr.and(
         Context.Visible,
         EditorContextKeys.textInputFocus,
         Context.HasFocusedSuggestion
-    ))),
+    )),
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 1024  | 3 ,
-        secondary: [1024  | 2 ],
+        primary: KeyMod$1.Shift | KeyCode.Enter,
+        secondary: [KeyMod$1.Shift | KeyCode.Tab],
     },
     handler(x) {
         x.acceptSelectedSuggestion(false, true);
@@ -711,229 +719,185 @@ registerEditorCommand(( (new SuggestCommand({
             menuId: suggestWidgetStatusbarMenu,
             group: 'left',
             order: 2,
-            when: ( (ContextKeyExpr.and(
-                Context.HasInsertAndReplaceRange,
-                 (Context.InsertMode.isEqualTo('insert'))
-            ))),
-            title: ( localize(1582, "Replace"))
+            when: ( ContextKeyExpr.and(Context.HasInsertAndReplaceRange, ( Context.InsertMode.isEqualTo('insert')))),
+            title: ( localize(1435, "Replace"))
         }, {
             menuId: suggestWidgetStatusbarMenu,
             group: 'left',
             order: 2,
-            when: ( (ContextKeyExpr.and(
-                Context.HasInsertAndReplaceRange,
-                 (Context.InsertMode.isEqualTo('replace'))
-            ))),
-            title: ( localize(1581, "Insert"))
+            when: ( ContextKeyExpr.and(Context.HasInsertAndReplaceRange, ( Context.InsertMode.isEqualTo('replace')))),
+            title: ( localize(1434, "Insert"))
         }]
-}))));
+})));
 CommandsRegistry.registerCommandAlias('acceptSelectedSuggestionOnEnter', 'acceptSelectedSuggestion');
-registerEditorCommand(( (new SuggestCommand({
+registerEditorCommand(( new SuggestCommand({
     id: 'hideSuggestWidget',
     precondition: Context.Visible,
     handler: x => x.cancelSuggestWidget(),
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 9 ,
-        secondary: [1024  | 9 ]
+        primary: KeyCode.Escape,
+        secondary: [KeyMod$1.Shift | KeyCode.Escape]
     }
-}))));
-registerEditorCommand(( (new SuggestCommand({
+})));
+registerEditorCommand(( new SuggestCommand({
     id: 'selectNextSuggestion',
-    precondition: ( (ContextKeyExpr.and(Context.Visible,  (ContextKeyExpr.or(
-        Context.MultipleSuggestions,
-         (Context.HasFocusedSuggestion.negate())
-    ))))),
+    precondition: ( ContextKeyExpr.and(Context.Visible, ( ContextKeyExpr.or(Context.MultipleSuggestions, ( Context.HasFocusedSuggestion.negate()))))),
     handler: c => c.selectNextSuggestion(),
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 18 ,
-        secondary: [2048  | 18 ],
-        mac: { primary: 18 , secondary: [2048  | 18 , 256  | 44 ] }
+        primary: KeyCode.DownArrow,
+        secondary: [KeyMod$1.CtrlCmd | KeyCode.DownArrow],
+        mac: { primary: KeyCode.DownArrow, secondary: [KeyMod$1.CtrlCmd | KeyCode.DownArrow, KeyMod$1.WinCtrl | KeyCode.KeyN] }
     }
-}))));
-registerEditorCommand(( (new SuggestCommand({
+})));
+registerEditorCommand(( new SuggestCommand({
     id: 'selectNextPageSuggestion',
-    precondition: ( (ContextKeyExpr.and(Context.Visible,  (ContextKeyExpr.or(
-        Context.MultipleSuggestions,
-         (Context.HasFocusedSuggestion.negate())
-    ))))),
+    precondition: ( ContextKeyExpr.and(Context.Visible, ( ContextKeyExpr.or(Context.MultipleSuggestions, ( Context.HasFocusedSuggestion.negate()))))),
     handler: c => c.selectNextPageSuggestion(),
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 12 ,
-        secondary: [2048  | 12 ]
+        primary: KeyCode.PageDown,
+        secondary: [KeyMod$1.CtrlCmd | KeyCode.PageDown]
     }
-}))));
-registerEditorCommand(( (new SuggestCommand({
+})));
+registerEditorCommand(( new SuggestCommand({
     id: 'selectLastSuggestion',
-    precondition: ( (ContextKeyExpr.and(Context.Visible,  (ContextKeyExpr.or(
-        Context.MultipleSuggestions,
-         (Context.HasFocusedSuggestion.negate())
-    ))))),
+    precondition: ( ContextKeyExpr.and(Context.Visible, ( ContextKeyExpr.or(Context.MultipleSuggestions, ( Context.HasFocusedSuggestion.negate()))))),
     handler: c => c.selectLastSuggestion()
-}))));
-registerEditorCommand(( (new SuggestCommand({
+})));
+registerEditorCommand(( new SuggestCommand({
     id: 'selectPrevSuggestion',
-    precondition: ( (ContextKeyExpr.and(Context.Visible,  (ContextKeyExpr.or(
-        Context.MultipleSuggestions,
-         (Context.HasFocusedSuggestion.negate())
-    ))))),
+    precondition: ( ContextKeyExpr.and(Context.Visible, ( ContextKeyExpr.or(Context.MultipleSuggestions, ( Context.HasFocusedSuggestion.negate()))))),
     handler: c => c.selectPrevSuggestion(),
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 16 ,
-        secondary: [2048  | 16 ],
-        mac: { primary: 16 , secondary: [2048  | 16 , 256  | 46 ] }
+        primary: KeyCode.UpArrow,
+        secondary: [KeyMod$1.CtrlCmd | KeyCode.UpArrow],
+        mac: { primary: KeyCode.UpArrow, secondary: [KeyMod$1.CtrlCmd | KeyCode.UpArrow, KeyMod$1.WinCtrl | KeyCode.KeyP] }
     }
-}))));
-registerEditorCommand(( (new SuggestCommand({
+})));
+registerEditorCommand(( new SuggestCommand({
     id: 'selectPrevPageSuggestion',
-    precondition: ( (ContextKeyExpr.and(Context.Visible,  (ContextKeyExpr.or(
-        Context.MultipleSuggestions,
-         (Context.HasFocusedSuggestion.negate())
-    ))))),
+    precondition: ( ContextKeyExpr.and(Context.Visible, ( ContextKeyExpr.or(Context.MultipleSuggestions, ( Context.HasFocusedSuggestion.negate()))))),
     handler: c => c.selectPrevPageSuggestion(),
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 11 ,
-        secondary: [2048  | 11 ]
+        primary: KeyCode.PageUp,
+        secondary: [KeyMod$1.CtrlCmd | KeyCode.PageUp]
     }
-}))));
-registerEditorCommand(( (new SuggestCommand({
+})));
+registerEditorCommand(( new SuggestCommand({
     id: 'selectFirstSuggestion',
-    precondition: ( (ContextKeyExpr.and(Context.Visible,  (ContextKeyExpr.or(
-        Context.MultipleSuggestions,
-         (Context.HasFocusedSuggestion.negate())
-    ))))),
+    precondition: ( ContextKeyExpr.and(Context.Visible, ( ContextKeyExpr.or(Context.MultipleSuggestions, ( Context.HasFocusedSuggestion.negate()))))),
     handler: c => c.selectFirstSuggestion()
-}))));
-registerEditorCommand(( (new SuggestCommand({
+})));
+registerEditorCommand(( new SuggestCommand({
     id: 'focusSuggestion',
-    precondition: ( (ContextKeyExpr.and(Context.Visible,  (Context.HasFocusedSuggestion.negate())))),
+    precondition: ( ContextKeyExpr.and(Context.Visible, ( Context.HasFocusedSuggestion.negate()))),
     handler: x => x.focusSuggestion(),
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 2048  | 10 ,
-        secondary: [2048  | 39 ],
-        mac: { primary: 256  | 10 , secondary: [2048  | 39 ] }
+        primary: KeyMod$1.CtrlCmd | KeyCode.Space,
+        secondary: [KeyMod$1.CtrlCmd | KeyCode.KeyI],
+        mac: { primary: KeyMod$1.WinCtrl | KeyCode.Space, secondary: [KeyMod$1.CtrlCmd | KeyCode.KeyI] }
     },
-}))));
-registerEditorCommand(( (new SuggestCommand({
+})));
+registerEditorCommand(( new SuggestCommand({
     id: 'focusAndAcceptSuggestion',
-    precondition: ( (ContextKeyExpr.and(Context.Visible,  (Context.HasFocusedSuggestion.negate())))),
+    precondition: ( ContextKeyExpr.and(Context.Visible, ( Context.HasFocusedSuggestion.negate()))),
     handler: c => {
         c.focusSuggestion();
         c.acceptSelectedSuggestion(true, false);
     }
-}))));
-registerEditorCommand(( (new SuggestCommand({
+})));
+registerEditorCommand(( new SuggestCommand({
     id: 'toggleSuggestionDetails',
-    precondition: ( (ContextKeyExpr.and(Context.Visible, Context.HasFocusedSuggestion))),
+    precondition: ( ContextKeyExpr.and(Context.Visible, Context.HasFocusedSuggestion)),
     handler: x => x.toggleSuggestionDetails(),
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 2048  | 10 ,
-        secondary: [2048  | 39 ],
-        mac: { primary: 256  | 10 , secondary: [2048  | 39 ] }
+        primary: KeyMod$1.CtrlCmd | KeyCode.Space,
+        secondary: [KeyMod$1.CtrlCmd | KeyCode.KeyI],
+        mac: { primary: KeyMod$1.WinCtrl | KeyCode.Space, secondary: [KeyMod$1.CtrlCmd | KeyCode.KeyI] }
     },
     menuOpts: [{
             menuId: suggestWidgetStatusbarMenu,
             group: 'right',
             order: 1,
-            when: ( (ContextKeyExpr.and(Context.DetailsVisible, Context.CanResolve))),
-            title: ( localize(1583, "Show Less"))
+            when: ( ContextKeyExpr.and(Context.DetailsVisible, Context.CanResolve)),
+            title: ( localize(1436, "Show Less"))
         }, {
             menuId: suggestWidgetStatusbarMenu,
             group: 'right',
             order: 1,
-            when: ( (ContextKeyExpr.and( (Context.DetailsVisible.toNegated()), Context.CanResolve))),
-            title: ( localize(1584, "Show More"))
+            when: ( ContextKeyExpr.and(( Context.DetailsVisible.toNegated()), Context.CanResolve)),
+            title: ( localize(1437, "Show More"))
         }]
-}))));
-registerEditorCommand(( (new SuggestCommand({
+})));
+registerEditorCommand(( new SuggestCommand({
     id: 'toggleExplainMode',
     precondition: Context.Visible,
     handler: x => x.toggleExplainMode(),
     kbOpts: {
-        weight: 100 ,
-        primary: 2048  | 90 ,
+        weight: KeybindingWeight.EditorContrib,
+        primary: KeyMod$1.CtrlCmd | KeyCode.Slash,
     }
-}))));
-registerEditorCommand(( (new SuggestCommand({
+})));
+registerEditorCommand(( new SuggestCommand({
     id: 'toggleSuggestionFocus',
     precondition: Context.Visible,
     handler: x => x.toggleSuggestionFocus(),
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 2048  | 512  | 10 ,
-        mac: { primary: 256  | 512  | 10  }
+        primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.Space,
+        mac: { primary: KeyMod$1.WinCtrl | KeyMod$1.Alt | KeyCode.Space }
     }
-}))));
-registerEditorCommand(( (new SuggestCommand({
+})));
+registerEditorCommand(( new SuggestCommand({
     id: 'insertBestCompletion',
-    precondition: ( (ContextKeyExpr.and(
-        EditorContextKeys.textInputFocus,
-         (ContextKeyExpr.equals('config.editor.tabCompletion', 'on')),
-        WordContextKey.AtEnd,
-         (Context.Visible.toNegated()),
-         (SuggestAlternatives.OtherSuggestions.toNegated()),
-         (SnippetController2.InSnippetMode.toNegated())
-    ))),
+    precondition: ( ContextKeyExpr.and(EditorContextKeys.textInputFocus, ( ContextKeyExpr.equals('config.editor.tabCompletion', 'on')), WordContextKey.AtEnd, ( Context.Visible.toNegated()), ( SuggestAlternatives.OtherSuggestions.toNegated()), ( SnippetController2.InSnippetMode.toNegated()))),
     handler: (x, arg) => {
         x.triggerSuggestAndAcceptBest(isObject(arg) ? { fallback: 'tab', ...arg } : { fallback: 'tab' });
     },
     kbOpts: {
         weight,
-        primary: 2
+        primary: KeyCode.Tab
     }
-}))));
-registerEditorCommand(( (new SuggestCommand({
+})));
+registerEditorCommand(( new SuggestCommand({
     id: 'insertNextSuggestion',
-    precondition: ( (ContextKeyExpr.and(
-        EditorContextKeys.textInputFocus,
-         (ContextKeyExpr.equals('config.editor.tabCompletion', 'on')),
-        SuggestAlternatives.OtherSuggestions,
-         (Context.Visible.toNegated()),
-         (SnippetController2.InSnippetMode.toNegated())
-    ))),
+    precondition: ( ContextKeyExpr.and(EditorContextKeys.textInputFocus, ( ContextKeyExpr.equals('config.editor.tabCompletion', 'on')), SuggestAlternatives.OtherSuggestions, ( Context.Visible.toNegated()), ( SnippetController2.InSnippetMode.toNegated()))),
     handler: x => x.acceptNextSuggestion(),
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 2
+        primary: KeyCode.Tab
     }
-}))));
-registerEditorCommand(( (new SuggestCommand({
+})));
+registerEditorCommand(( new SuggestCommand({
     id: 'insertPrevSuggestion',
-    precondition: ( (ContextKeyExpr.and(
-        EditorContextKeys.textInputFocus,
-         (ContextKeyExpr.equals('config.editor.tabCompletion', 'on')),
-        SuggestAlternatives.OtherSuggestions,
-         (Context.Visible.toNegated()),
-         (SnippetController2.InSnippetMode.toNegated())
-    ))),
+    precondition: ( ContextKeyExpr.and(EditorContextKeys.textInputFocus, ( ContextKeyExpr.equals('config.editor.tabCompletion', 'on')), SuggestAlternatives.OtherSuggestions, ( Context.Visible.toNegated()), ( SnippetController2.InSnippetMode.toNegated()))),
     handler: x => x.acceptPrevSuggestion(),
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 1024  | 2
+        primary: KeyMod$1.Shift | KeyCode.Tab
     }
-}))));
+})));
 registerEditorAction(class extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.resetSuggestSize',
-            label: ( localize(1585, "Reset Suggest Widget Size")),
-            alias: 'Reset Suggest Widget Size',
+            label: ( localize2(1438, "Reset Suggest Widget Size")),
             precondition: undefined
         });
     }