@codingame/monaco-vscode-api 5.2.0 → 6.0.0

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

@@ -4,17 +4,22 @@ 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, registerEditorCommand, EditorCommand } from '../../../browser/editorExtensions.js';
+import { EditorAction, registerEditorContribution, registerEditorAction, registerEditorCommand, EditorContributionInstantiation, EditorCommand } 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';
@@ -25,11 +30,12 @@ import { ICommandService } from '../../../../platform/commands/common/commands.s
 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 +51,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 +87,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'; }
@@ -106,17 +120,17 @@ let SuggestController = class SuggestController {
             select: (model, pos, items) => this._memoryService.select(model, pos, items)
         });
         const ctxInsertMode = Context.InsertMode.bindTo(_contextKeyService);
-        ctxInsertMode.set(editor.getOption(118 ).insertMode);
-        this._toDispose.add(this.model.onDidTrigger(() => ctxInsertMode.set(editor.getOption(118 ).insertMode)));
+        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));
+            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);
@@ -132,10 +146,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 +164,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;
                 }
@@ -186,20 +200,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(118 );
+                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 +231,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()));
@@ -251,10 +265,10 @@ let SuggestController = class SuggestController {
         const { item } = event;
         const tasks = [];
         const cts = ( (new CancellationTokenSource()));
-        if (!((flags & 1) )) {
+        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;
@@ -296,12 +310,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();
                 }
             });
@@ -318,7 +332,7 @@ let SuggestController = class SuggestController {
                 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)))));
                 scrollState.restoreRelativeVerticalPositionOfCursor(this.editor);
-                if (didType || !((oldFlags & 2) )) {
+                if (didType || !(oldFlags & InsertFlags.NoAfterUndoStop)) {
                     this.editor.pushUndoStop();
                 }
                 return true;
@@ -331,7 +345,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 +354,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) {
@@ -365,14 +379,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;
                 }
             });
@@ -403,7 +417,7 @@ let SuggestController = class SuggestController {
     }
     getOverwriteInfo(item, toggleMode) {
         assertType(this.editor.hasModel());
-        let replace = this.editor.getOption(118 ).insertMode === 'replace';
+        let replace = this.editor.getOption(EditorOption.suggest).insertMode === 'replace';
         if (toggleMode) {
             replace = !replace;
         }
@@ -434,7 +448,7 @@ let SuggestController = class SuggestController {
                 auto: auto ?? false,
                 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();
         }
     }
@@ -449,7 +463,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();
@@ -485,21 +499,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);
     }
@@ -606,10 +620,10 @@ class TriggerSuggestAction extends EditorAction {
             ))),
             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
             }
         });
     }
@@ -627,9 +641,9 @@ 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({
     id: 'acceptSelectedSuggestion',
@@ -638,11 +652,11 @@ registerEditorCommand(( (new SuggestCommand({
         x.acceptSelectedSuggestion(true, false);
     },
     kbOpts: [{
-            primary: 2 ,
+            primary: KeyCode.Tab,
             kbExpr: ( (ContextKeyExpr.and(Context.Visible, EditorContextKeys.textInputFocus))),
             weight,
         }, {
-            primary: 3 ,
+            primary: KeyCode.Enter,
             kbExpr: ( (ContextKeyExpr.and(
                 Context.Visible,
                 EditorContextKeys.textInputFocus,
@@ -687,8 +701,8 @@ registerEditorCommand(( (new SuggestCommand({
     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);
@@ -721,8 +735,8 @@ registerEditorCommand(( (new SuggestCommand({
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 9 ,
-        secondary: [1024  | 9 ]
+        primary: KeyCode.Escape,
+        secondary: [KeyMod$1.Shift | KeyCode.Escape]
     }
 }))));
 registerEditorCommand(( (new SuggestCommand({
@@ -735,9 +749,9 @@ registerEditorCommand(( (new SuggestCommand({
     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({
@@ -750,8 +764,8 @@ registerEditorCommand(( (new SuggestCommand({
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 12 ,
-        secondary: [2048  | 12 ]
+        primary: KeyCode.PageDown,
+        secondary: [KeyMod$1.CtrlCmd | KeyCode.PageDown]
     }
 }))));
 registerEditorCommand(( (new SuggestCommand({
@@ -772,9 +786,9 @@ registerEditorCommand(( (new SuggestCommand({
     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({
@@ -787,8 +801,8 @@ registerEditorCommand(( (new SuggestCommand({
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 11 ,
-        secondary: [2048  | 11 ]
+        primary: KeyCode.PageUp,
+        secondary: [KeyMod$1.CtrlCmd | KeyCode.PageUp]
     }
 }))));
 registerEditorCommand(( (new SuggestCommand({
@@ -806,9 +820,9 @@ registerEditorCommand(( (new SuggestCommand({
     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({
@@ -826,9 +840,9 @@ registerEditorCommand(( (new SuggestCommand({
     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,
@@ -849,8 +863,8 @@ registerEditorCommand(( (new SuggestCommand({
     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({
@@ -860,8 +874,8 @@ registerEditorCommand(( (new SuggestCommand({
     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({
@@ -879,7 +893,7 @@ registerEditorCommand(( (new SuggestCommand({
     },
     kbOpts: {
         weight,
-        primary: 2
+        primary: KeyCode.Tab
     }
 }))));
 registerEditorCommand(( (new SuggestCommand({
@@ -895,7 +909,7 @@ registerEditorCommand(( (new SuggestCommand({
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 2
+        primary: KeyCode.Tab
     }
 }))));
 registerEditorCommand(( (new SuggestCommand({
@@ -911,7 +925,7 @@ registerEditorCommand(( (new SuggestCommand({
     kbOpts: {
         weight: weight,
         kbExpr: EditorContextKeys.textInputFocus,
-        primary: 1024  | 2
+        primary: KeyMod$1.Shift | KeyCode.Tab
     }
 }))));
 registerEditorAction(class extends EditorAction {

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

@@ -4,8 +4,10 @@ import { FuzzyScore } from '../../../../base/common/filters.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { Disposable, RefCountedDisposable } from '../../../../base/common/lifecycle.js';
 import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 import { registerEditorFeature } from '../../../common/editorFeatures.js';
+import { CompletionTriggerKind, CompletionItemInsertTextRule } from '../../../common/languages.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { CompletionModel, LineContext } from './completionModel.js';
 import { QuickSuggestionsOptions, provideSuggestionItems, CompletionOptions } from './suggest.js';
@@ -56,7 +58,7 @@ let InlineCompletionResults = class InlineCompletionResults extends RefCountedDi
                 item.editInsertEnd.lineNumber,
                 item.editInsertEnd.column + this.completionModel.lineContext.characterCountDelta
             ));
-            const insertText = item.completion.insertTextRules && ((item.completion.insertTextRules & 4) )
+            const insertText = item.completion.insertTextRules && (item.completion.insertTextRules & CompletionItemInsertTextRule.InsertAsSnippet)
                 ? { snippet: item.completion.insertText }
                 : item.completion.insertText;
             result.push(( new SuggestInlineCompletion(
@@ -100,7 +102,7 @@ let SuggestInlineCompletions = class SuggestInlineCompletions extends Disposable
         if (!editor) {
             return;
         }
-        const config = editor.getOption(89 );
+        const config = editor.getOption(EditorOption.quickSuggestions);
         if (QuickSuggestionsOptions.isAllOff(config)) {
             return;
         }
@@ -137,12 +139,12 @@ let SuggestInlineCompletions = class SuggestInlineCompletions extends Disposable
                 undefined,
                 SuggestModel.createSuggestFilter(editor).itemKind,
                 triggerCharacterInfo?.providers
-            )), triggerCharacterInfo && { triggerKind: 1 , triggerCharacter: triggerCharacterInfo.ch }, token);
+            )), triggerCharacterInfo && { triggerKind: CompletionTriggerKind.TriggerCharacter, triggerCharacter: triggerCharacterInfo.ch }, token);
             let clipboardText;
             if (completions.needsClipboard) {
                 clipboardText = await this._clipboardService.readText();
             }
-            const completionModel = ( new CompletionModel(completions.items, position.column, ( new LineContext(leadingLineContents, 0)), WordDistance.None, editor.getOption(118 ), editor.getOption(112 ), { boostFullMatch: false, firstMatchCanBeWeak: false }, clipboardText));
+            const completionModel = ( new CompletionModel(completions.items, position.column, ( new LineContext(leadingLineContents, 0)), WordDistance.None, editor.getOption(EditorOption.suggest), editor.getOption(EditorOption.snippetSuggestions), { boostFullMatch: false, firstMatchCanBeWeak: false }, clipboardText));
             result = ( new InlineCompletionResults(
                 model,
                 position.lineNumber,

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

@@ -5,9 +5,9 @@ import { LRUCache } from '../../../../base/common/map.js';
 import { TernarySearchTree } from '../../../../base/common/ternarySearchTree.js';
 import { CompletionItemKinds } from '../../../common/languages.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
-import { registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { WillSaveStateReason } from '../../../../platform/storage/common/storage.js';
+import { WillSaveStateReason, StorageTarget, StorageScope } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 var SuggestMemoryService_1;
 class Memory {
@@ -202,7 +202,7 @@ let SuggestMemoryService = class SuggestMemoryService {
             this._strategy = ( new ctor());
             try {
                 const share = this._configService.getValue('editor.suggest.shareSuggestSelections');
-                const scope = share ? 0  : 1 ;
+                const scope = share ? StorageScope.PROFILE : StorageScope.WORKSPACE;
                 const raw = this._storageService.get(`${SuggestMemoryService_1._storagePrefix}/${mode}`, scope);
                 if (raw) {
                     this._strategy.fromJSON(JSON.parse(raw));
@@ -216,9 +216,9 @@ let SuggestMemoryService = class SuggestMemoryService {
     _saveState() {
         if (this._strategy) {
             const share = this._configService.getValue('editor.suggest.shareSuggestSelections');
-            const scope = share ? 0  : 1 ;
+            const scope = share ? StorageScope.PROFILE : StorageScope.WORKSPACE;
             const raw = JSON.stringify(this._strategy);
-            this._storageService.store(`${SuggestMemoryService_1._storagePrefix}/${this._strategy.name}`, raw, scope, 1 );
+            this._storageService.store(`${SuggestMemoryService_1._storagePrefix}/${this._strategy.name}`, raw, scope, StorageTarget.MACHINE);
         }
     }
 };
@@ -227,5 +227,5 @@ SuggestMemoryService = SuggestMemoryService_1 = ( __decorate([
     ( __param(1, IConfigurationService))
 ], SuggestMemoryService));
 const ISuggestMemoryService = ( createDecorator('ISuggestMemories'));
-registerSingleton(ISuggestMemoryService, SuggestMemoryService, 1 );
+registerSingleton(ISuggestMemoryService, SuggestMemoryService, InstantiationType.Delayed);
 export { ISuggestMemoryService, LRUMemory, Memory, NoMemory, PrefixMemory, SuggestMemoryService };