@codingame/monaco-vscode-api 5.3.0 → 6.0.1

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .sticky-widget{overflow:hidden}.monaco-editor .sticky-widget-line-numbers{background-color:inherit;float:left}.monaco-editor .sticky-widget-lines-scrollable{background-color:inherit;display:inline-block;overflow:hidden;position:absolute;width:var(--vscode-editorStickyScroll-scrollableWidth)}.monaco-editor .sticky-widget-lines{background-color:inherit;position:absolute}.monaco-editor .sticky-line-content,.monaco-editor .sticky-line-number{background-color:inherit;color:var(--vscode-editorLineNumber-foreground);display:inline-block;position:absolute;white-space:nowrap}.monaco-editor .sticky-line-number .codicon-folding-collapsed,.monaco-editor .sticky-line-number .codicon-folding-expanded{float:right;transition:var(--vscode-editorStickyScroll-foldingOpacityTransition)}.monaco-editor .sticky-line-content{background-color:inherit;white-space:nowrap;width:var(--vscode-editorStickyScroll-scrollableWidth)}.monaco-editor .sticky-line-number-inner{display:inline-block;text-align:right}.monaco-editor .sticky-widget{border-bottom:1px solid var(--vscode-editorStickyScroll-border)}.monaco-editor .sticky-line-content:hover{background-color:var(--vscode-editorStickyScrollHover-background);cursor:pointer}.monaco-editor .sticky-widget{background-color:var(--vscode-editorStickyScroll-background);box-shadow:var(--vscode-editorStickyScroll-shadow) 0 3px 2px -2px;width:100%;z-index:4}.monaco-editor .sticky-widget.peek{background-color:var(--vscode-peekViewEditorStickyScroll-background)}";
+var css = ".monaco-editor .sticky-widget{overflow:hidden}.monaco-editor .sticky-widget-line-numbers{background-color:inherit;float:left}.monaco-editor .sticky-widget-lines-scrollable{background-color:inherit;display:inline-block;overflow:hidden;position:absolute;width:var(--vscode-editorStickyScroll-scrollableWidth)}.monaco-editor .sticky-widget-lines{background-color:inherit;position:absolute}.monaco-editor .sticky-line-content,.monaco-editor .sticky-line-number{background-color:inherit;color:var(--vscode-editorLineNumber-foreground);display:inline-block;position:absolute;white-space:nowrap}.monaco-editor .sticky-line-number .codicon-folding-collapsed,.monaco-editor .sticky-line-number .codicon-folding-expanded{float:right;transition:var(--vscode-editorStickyScroll-foldingOpacityTransition)}.monaco-editor .sticky-line-content{background-color:inherit;white-space:nowrap;width:var(--vscode-editorStickyScroll-scrollableWidth)}.monaco-editor .sticky-line-number-inner{display:inline-block;text-align:right}.monaco-editor .sticky-widget{border-bottom:1px solid var(--vscode-editorStickyScroll-border)}.monaco-editor .sticky-line-content:hover{background-color:var(--vscode-editorStickyScrollHover-background);cursor:pointer}.monaco-editor .sticky-widget{background-color:var(--vscode-editorStickyScroll-background);box-shadow:var(--vscode-editorStickyScroll-shadow) 0 3px 2px -2px;right:auto!important;width:100%;z-index:4}.monaco-editor .sticky-widget.peek{background-color:var(--vscode-peekViewEditorStickyScroll-background)}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js

@@ -1,8 +1,10 @@
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { EditorAction2 } from '../../../browser/editorExtensions.js';
 import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { Action2, MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { StickyScrollController } from './stickyScrollController.js';
@@ -41,7 +43,7 @@ class ToggleStickyScroll extends Action2 {
         return configurationService.updateValue('editor.stickyScroll.enabled', newValue);
     }
 }
-const weight = 100 ;
+const weight = KeybindingWeight.EditorContrib;
 class FocusStickyScroll extends EditorAction2 {
     constructor() {
         super({
@@ -71,7 +73,7 @@ class SelectNextStickyScrollLine extends EditorAction2 {
             precondition: ( (EditorContextKeys.stickyScrollFocused.isEqualTo(true))),
             keybinding: {
                 weight,
-                primary: 18
+                primary: KeyCode.DownArrow
             }
         });
     }
@@ -87,7 +89,7 @@ class SelectPreviousStickyScrollLine extends EditorAction2 {
             precondition: ( (EditorContextKeys.stickyScrollFocused.isEqualTo(true))),
             keybinding: {
                 weight,
-                primary: 16
+                primary: KeyCode.UpArrow
             }
         });
     }
@@ -103,7 +105,7 @@ class GoToStickyScrollLine extends EditorAction2 {
             precondition: ( (EditorContextKeys.stickyScrollFocused.isEqualTo(true))),
             keybinding: {
                 weight,
-                primary: 3
+                primary: KeyCode.Enter
             }
         });
     }
@@ -119,7 +121,7 @@ class SelectEditor extends EditorAction2 {
             precondition: ( (EditorContextKeys.stickyScrollFocused.isEqualTo(true))),
             keybinding: {
                 weight,
-                primary: 9
+                primary: KeyCode.Escape
             }
         });
     }

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollContribution.js

@@ -1,8 +1,8 @@
-import { registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
 import { ToggleStickyScroll, FocusStickyScroll, SelectPreviousStickyScrollLine, SelectNextStickyScrollLine, GoToStickyScrollLine, SelectEditor } from './stickyScrollActions.js';
 import { StickyScrollController } from './stickyScrollController.js';
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
-registerEditorContribution(StickyScrollController.ID, StickyScrollController, 1 );
+registerEditorContribution(StickyScrollController.ID, StickyScrollController, EditorContributionInstantiation.AfterFirstRender);
 registerAction2(ToggleStickyScroll);
 registerAction2(FocusStickyScroll);
 registerAction2(SelectPreviousStickyScrollLine);

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.js

@@ -1,6 +1,9 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { MouseTargetType } from '../../../browser/editorBrowser.js';
+import { ScrollType } from '../../../common/editorCommon.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { EditorOption, RenderLineNumbersType } from '../../../common/config/editorOptions.js';
 import { StickyScrollWidget, StickyScrollWidgetState } from './stickyScrollWidget.js';
 import { StickyLineCandidateProvider } from './stickyScrollProvider.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -135,7 +138,7 @@ let StickyScrollController = class StickyScrollController extends Disposable {
         this._reveaInEditor(position, () => this._editor.revealPosition(position));
     }
     _revealLineInCenterIfOutsideViewport(position) {
-        this._reveaInEditor(position, () => this._editor.revealLineInCenterIfOutsideViewport(position.lineNumber, 0 ));
+        this._reveaInEditor(position, () => this._editor.revealLineInCenterIfOutsideViewport(position.lineNumber, ScrollType.Smooth));
     }
     _reveaInEditor(position, revealFunction) {
         if (this._focused) {
@@ -158,7 +161,7 @@ let StickyScrollController = class StickyScrollController extends Disposable {
             if (!this._editor.hasModel()) {
                 return null;
             }
-            if (mouseEvent.target.type !== 12  || mouseEvent.target.detail !== this._stickyScrollWidget.getId()) {
+            if (mouseEvent.target.type !== MouseTargetType.OVERLAY_WIDGET || mouseEvent.target.detail !== this._stickyScrollWidget.getId()) {
                 return null;
             }
             const mouseTargetElement = mouseEvent.target.element;
@@ -286,7 +289,7 @@ let StickyScrollController = class StickyScrollController extends Disposable {
             sessionStore.clear();
         }));
         this._register(gesture.onExecute(async (e) => {
-            if (e.target.type !== 12  || e.target.detail !== this._stickyScrollWidget.getId()) {
+            if (e.target.type !== MouseTargetType.OVERLAY_WIDGET || e.target.detail !== this._stickyScrollWidget.getId()) {
                 return;
             }
             const position = this._stickyScrollWidget.getEditorPositionFromNode(e.target.element);
@@ -326,12 +329,12 @@ let StickyScrollController = class StickyScrollController extends Disposable {
         const scrollTop = (foldingIcon.isCollapsed ?
             this._editor.getTopForLineNumber(foldingIcon.foldingEndLine)
             : this._editor.getTopForLineNumber(foldingIcon.foldingStartLine))
-            - this._editor.getOption(67 ) * stickyLine.index + 1;
+            - this._editor.getOption(EditorOption.lineHeight) * stickyLine.index + 1;
         this._editor.setScrollTop(scrollTop);
         this._renderStickyScroll(line);
     }
     _readConfiguration() {
-        const options = this._editor.getOption(115 );
+        const options = this._editor.getOption(EditorOption.stickyScroll);
         if (options.enabled === false) {
             this._editor.removeOverlayWidget(this._stickyScrollWidget);
             this._sessionStore.clear();
@@ -354,8 +357,8 @@ let StickyScrollController = class StickyScrollController extends Disposable {
             }));
             this._enabled = true;
         }
-        const lineNumberOption = this._editor.getOption(68 );
-        if (lineNumberOption.renderType === 2 ) {
+        const lineNumberOption = this._editor.getOption(EditorOption.lineNumbers);
+        if (lineNumberOption.renderType === RenderLineNumbersType.Relative) {
             this._sessionStore.add(this._editor.onDidChangeCursorPosition(() => {
                 this._showEndForLine = null;
                 this._renderStickyScroll(0);
@@ -363,14 +366,14 @@ let StickyScrollController = class StickyScrollController extends Disposable {
         }
     }
     _readConfigurationChange(event) {
-        if (event.hasChanged(115 )
-            || event.hasChanged(73 )
-            || event.hasChanged(67 )
-            || event.hasChanged(110 )
-            || event.hasChanged(68 )) {
+        if (event.hasChanged(EditorOption.stickyScroll)
+            || event.hasChanged(EditorOption.minimap)
+            || event.hasChanged(EditorOption.lineHeight)
+            || event.hasChanged(EditorOption.showFoldingControls)
+            || event.hasChanged(EditorOption.lineNumbers)) {
             this._readConfiguration();
         }
-        if (event.hasChanged(68 )) {
+        if (event.hasChanged(EditorOption.lineNumbers)) {
             this._renderStickyScroll(0);
         }
     }
@@ -392,7 +395,7 @@ let StickyScrollController = class StickyScrollController extends Disposable {
     }
     _onDidResize() {
         const layoutInfo = this._editor.getLayoutInfo();
-        const theoreticalLines = layoutInfo.height / this._editor.getOption(67 );
+        const theoreticalLines = layoutInfo.height / this._editor.getOption(EditorOption.lineHeight);
         this._maxStickyLines = Math.round(theoreticalLines * .25);
     }
     async _renderStickyScroll(rebuildFromLine) {
@@ -436,8 +439,8 @@ let StickyScrollController = class StickyScrollController extends Disposable {
         }
     }
     findScrollWidgetState() {
-        const lineHeight = this._editor.getOption(67 );
-        const maxNumberStickyLines = Math.min(this._maxStickyLines, this._editor.getOption(115 ).maxLineCount);
+        const lineHeight = this._editor.getOption(EditorOption.lineHeight);
+        const maxNumberStickyLines = Math.min(this._maxStickyLines, this._editor.getOption(EditorOption.stickyScroll).maxLineCount);
         const scrollTop = this._editor.getScrollTop();
         let lastLineRelativePosition = 0;
         const startLineNumbers = [];

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.js

@@ -11,6 +11,7 @@ import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { StickyModel, StickyElement, StickyRange } from './stickyScrollElement.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 var ModelProvider;
 ( (function(ModelProvider) {
     ModelProvider["OUTLINE_MODEL"] = "outlineModel";
@@ -31,7 +32,7 @@ let StickyModelProvider = class StickyModelProvider extends Disposable {
         this._modelPromise = null;
         this._updateScheduler = this._register(( new Delayer(300)));
         this._updateOperation = this._register(( new DisposableStore()));
-        switch (this._editor.getOption(115 ).defaultModel) {
+        switch (this._editor.getOption(EditorOption.stickyScroll).defaultModel) {
             case ModelProvider.OUTLINE_MODEL:
                 this._modelProviders.push(( new StickyModelFromCandidateOutlineProvider(this._editor, _languageFeaturesService)));
             case ModelProvider.FOLDING_PROVIDER_MODEL:

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.js

@@ -2,6 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { binarySearch } from '../../../../base/common/arrays.js';
 import { Emitter } from '../../../../base/common/event.js';
@@ -29,7 +30,7 @@ let StickyLineCandidateProvider = class StickyLineCandidateProvider extends Disp
         this._sessionStore = this._register(( new DisposableStore()));
         this._updateSoon = this._register(( new RunOnceScheduler(() => this.update(), 50)));
         this._register(this._editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(115 )) {
+            if (e.hasChanged(EditorOption.stickyScroll)) {
                 this.readConfiguration();
             }
         }));
@@ -37,7 +38,7 @@ let StickyLineCandidateProvider = class StickyLineCandidateProvider extends Disp
     }
     readConfiguration() {
         this._sessionStore.clear();
-        const options = this._editor.getOption(115 );
+        const options = this._editor.getOption(EditorOption.stickyScroll);
         if (!options.enabled) {
             return;
         }

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.js

@@ -4,8 +4,10 @@ import { equals } from '../../../../base/common/arrays.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import './stickyScroll.css.js';
+import { OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js';
 import { getColumnOfNodeOffset } from '../../../browser/viewParts/lines/viewLine.js';
 import { EmbeddedCodeEditorWidget } from '../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { EditorOption, RenderLineNumbersType } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
 import { StringBuilder } from '../../../common/core/stringBuilder.js';
 import { LineDecoration } from '../../../common/viewLayout/lineDecorations.js';
@@ -40,7 +42,7 @@ class StickyScrollWidget extends Disposable {
         this._lineNumbersDomNode = document.createElement('div');
         this._linesDomNodeScrollable = document.createElement('div');
         this._linesDomNode = document.createElement('div');
-        this._lineHeight = this._editor.getOption(67 );
+        this._lineHeight = this._editor.getOption(EditorOption.lineHeight);
         this._renderedStickyLines = [];
         this._lineNumbers = [];
         this._lastLineRelativePosition = 0;
@@ -57,14 +59,14 @@ class StickyScrollWidget extends Disposable {
         this._rootDomNode.appendChild(this._lineNumbersDomNode);
         this._rootDomNode.appendChild(this._linesDomNodeScrollable);
         const updateScrollLeftPosition = () => {
-            this._linesDomNode.style.left = this._editor.getOption(115 ).scrollWithEditor ? `-${this._editor.getScrollLeft()}px` : '0px';
+            this._linesDomNode.style.left = this._editor.getOption(EditorOption.stickyScroll).scrollWithEditor ? `-${this._editor.getScrollLeft()}px` : '0px';
         };
         this._register(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(115 )) {
+            if (e.hasChanged(EditorOption.stickyScroll)) {
                 updateScrollLeftPosition();
             }
-            if (e.hasChanged(67 )) {
-                this._lineHeight = this._editor.getOption(67 );
+            if (e.hasChanged(EditorOption.lineHeight)) {
+                this._lineHeight = this._editor.getOption(EditorOption.lineHeight);
             }
         }));
         this._register(this._editor.onDidScrollChange((e) => {
@@ -201,7 +203,7 @@ class StickyScrollWidget extends Disposable {
         this._editor.layoutOverlayWidget(this);
     }
     _setFoldingHoverListeners() {
-        const showFoldingControls = this._editor.getOption(110 );
+        const showFoldingControls = this._editor.getOption(EditorOption.showFoldingControls);
         if (showFoldingControls !== 'mouseover') {
             return;
         }
@@ -222,7 +224,7 @@ class StickyScrollWidget extends Disposable {
         }
         const viewLineNumber = viewModel.coordinatesConverter.convertModelPositionToViewPosition(( new Position(line, 1))).lineNumber;
         const lineRenderingData = viewModel.getViewLineRenderingData(viewLineNumber);
-        const lineNumberOption = this._editor.getOption(68 );
+        const lineNumberOption = this._editor.getOption(EditorOption.lineNumbers);
         let actualInlineDecorations;
         try {
             actualInlineDecorations = LineDecoration.filter(lineRenderingData.inlineDecorations, viewLineNumber, lineRenderingData.minColumn, lineRenderingData.maxColumn);
@@ -277,10 +279,10 @@ class StickyScrollWidget extends Disposable {
         const lineNumbersWidth = layoutInfo.contentLeft;
         lineNumberHTMLNode.style.width = `${lineNumbersWidth}px`;
         const innerLineNumberHTML = document.createElement('span');
-        if (lineNumberOption.renderType === 1  || lineNumberOption.renderType === 3  && line % 10 === 0) {
+        if (lineNumberOption.renderType === RenderLineNumbersType.On || lineNumberOption.renderType === RenderLineNumbersType.Interval && line % 10 === 0) {
             innerLineNumberHTML.innerText = ( line.toString());
         }
-        else if (lineNumberOption.renderType === 2 ) {
+        else if (lineNumberOption.renderType === RenderLineNumbersType.Relative) {
             innerLineNumberHTML.innerText = ( Math.abs(line - this._editor.getPosition().lineNumber).toString());
         }
         innerLineNumberHTML.className = 'sticky-line-number-inner';
@@ -325,7 +327,7 @@ class StickyScrollWidget extends Disposable {
         return stickyLine;
     }
     _renderFoldingIconForLine(foldingModel, line) {
-        const showFoldingControls = this._editor.getOption(110 );
+        const showFoldingControls = this._editor.getOption(EditorOption.showFoldingControls);
         if (!foldingModel || showFoldingControls === 'never') {
             return;
         }
@@ -355,7 +357,8 @@ class StickyScrollWidget extends Disposable {
     }
     getPosition() {
         return {
-            preference: null
+            preference: OverlayWidgetPositionPreference.TOP_CENTER,
+            stackOridinal: 10,
         };
     }
     getMinContentWidthInPx() {

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

@@ -1,12 +1,20 @@
 import { quickSelect } from '../../../../base/common/arrays.js';
+import { CharCode } from '../../../../base/common/charCode.js';
 import { FuzzyScoreOptions, FuzzyScore, anyScore, fuzzyScore, fuzzyScoreGracefulAggressive } from '../../../../base/common/filters.js';
 import { compareIgnoreCase } from '../../../../base/common/strings.js';
+import { CompletionItemKind } from '../../../common/languages.js';
 class LineContext {
     constructor(leadingLineContent, characterCountDelta) {
         this.leadingLineContent = leadingLineContent;
         this.characterCountDelta = characterCountDelta;
     }
 }
+var Refilter;
+( (function(Refilter) {
+    Refilter[Refilter["Nothing"] = 0] = "Nothing";
+    Refilter[Refilter["All"] = 1] = "All";
+    Refilter[Refilter["Incr"] = 2] = "Incr";
+})(Refilter || (Refilter = {})));
 class CompletionModel {
     constructor(items, column, lineContext, wordDistance, options, snippetSuggestions, fuzzyScoreOptions = FuzzyScoreOptions.default, clipboardText = undefined) {
         this.clipboardText = clipboardText;
@@ -15,7 +23,7 @@ class CompletionModel {
         this._column = column;
         this._wordDistance = wordDistance;
         this._options = options;
-        this._refilterKind = 1 ;
+        this._refilterKind = Refilter.All;
         this._lineContext = lineContext;
         this._fuzzyScoreOptions = fuzzyScoreOptions;
         if (snippetSuggestions === 'top') {
@@ -31,7 +39,7 @@ class CompletionModel {
     set lineContext(value) {
         if (this._lineContext.leadingLineContent !== value.leadingLineContent
             || this._lineContext.characterCountDelta !== value.characterCountDelta) {
-            this._refilterKind = this._lineContext.characterCountDelta < value.characterCountDelta && this._filteredItems ? 2  : 1 ;
+            this._refilterKind = this._lineContext.characterCountDelta < value.characterCountDelta && this._filteredItems ? Refilter.Incr : Refilter.All;
             this._lineContext = value;
         }
     }
@@ -58,7 +66,7 @@ class CompletionModel {
         return this._stats;
     }
     _ensureCachedState() {
-        if (this._refilterKind !== 0 ) {
+        if (this._refilterKind !== Refilter.Nothing) {
             this._createCachedState();
         }
     }
@@ -68,7 +76,7 @@ class CompletionModel {
         const { leadingLineContent, characterCountDelta } = this._lineContext;
         let word = '';
         let wordLow = '';
-        const source = this._refilterKind === 1  ? this._items : this._filteredItems;
+        const source = this._refilterKind === Refilter.All ? this._items : this._filteredItems;
         const target = [];
         const scoreFn = (!this._options.filterGraceful || source.length > 2000) ? fuzzyScore : fuzzyScoreGracefulAggressive;
         for (let i = 0; i < source.length; i++) {
@@ -97,7 +105,7 @@ class CompletionModel {
                 let wordPos = 0;
                 while (wordPos < overwriteBefore) {
                     const ch = word.charCodeAt(wordPos);
-                    if (ch === 32  || ch === 9 ) {
+                    if (ch === CharCode.Space || ch === CharCode.Tab) {
                         wordPos += 1;
                     }
                     else {
@@ -134,7 +142,7 @@ class CompletionModel {
             labelLengths.push(item.textLabel.length);
         }
         this._filteredItems = target.sort(this._snippetCompareFn);
-        this._refilterKind = 0 ;
+        this._refilterKind = Refilter.Nothing;
         this._stats = {
             pLabelLen: labelLengths.length ?
                 quickSelect(labelLengths.length - .85, labelLengths, (a, b) => a - b)
@@ -166,10 +174,10 @@ class CompletionModel {
     }
     static _compareCompletionItemsSnippetsDown(a, b) {
         if (a.completion.kind !== b.completion.kind) {
-            if (a.completion.kind === 27 ) {
+            if (a.completion.kind === CompletionItemKind.Snippet) {
                 return 1;
             }
-            else if (b.completion.kind === 27 ) {
+            else if (b.completion.kind === CompletionItemKind.Snippet) {
                 return -1;
             }
         }
@@ -177,10 +185,10 @@ class CompletionModel {
     }
     static _compareCompletionItemsSnippetsUp(a, b) {
         if (a.completion.kind !== b.completion.kind) {
-            if (a.completion.kind === 27 ) {
+            if (a.completion.kind === CompletionItemKind.Snippet) {
                 return -1;
             }
-            else if (b.completion.kind === 27 ) {
+            else if (b.completion.kind === CompletionItemKind.Snippet) {
                 return 1;
             }
         }

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

@@ -7,6 +7,7 @@ import { assertType } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
+import { CompletionTriggerKind, CompletionItemKind, CompletionItemTag, CompletionItemInsertTextRule } from '../../../common/languages.js';
 import { ITextModelService } from '../../../common/services/resolverService.js';
 import { SnippetParser } from '../../snippet/browser/snippetParser.js';
 import { localizeWithPath } from '../../../../nls.js';
@@ -15,6 +16,7 @@ import { CommandsRegistry } from '../../../../platform/commands/common/commands.
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { historyNavigationVisible } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
+import { StandardTokenType } from '../../../common/encodedTokenAttributes.js';
 const _moduleId = "vs/editor/contrib/suggest/browser/suggest";
 const Context = {
     Visible: historyNavigationVisible,
@@ -113,9 +115,15 @@ class CompletionItem {
         return this._resolveCache;
     }
 }
+var SnippetSortOrder;
+( ((function(SnippetSortOrder) {
+    SnippetSortOrder[SnippetSortOrder["Top"] = 0] = "Top";
+    SnippetSortOrder[SnippetSortOrder["Inline"] = 1] = "Inline";
+    SnippetSortOrder[SnippetSortOrder["Bottom"] = 2] = "Bottom";
+})(SnippetSortOrder || (SnippetSortOrder = {}))));
 class CompletionOptions {
     static { this.default = ( (new CompletionOptions())); }
-    constructor(snippetSortOrder = 2 , kindFilter = ( (new Set())), providerFilter = ( (new Set())), providerItemsToReuse = ( (new Map())), showDeprecated = true) {
+    constructor(snippetSortOrder = SnippetSortOrder.Bottom, kindFilter = ( (new Set())), providerFilter = ( (new Set())), providerItemsToReuse = ( (new Map())), showDeprecated = true) {
         this.snippetSortOrder = snippetSortOrder;
         this.kindFilter = kindFilter;
         this.providerFilter = providerFilter;
@@ -140,7 +148,7 @@ class CompletionItemModel {
         this.disposable = disposable;
     }
 }
-async function provideSuggestionItems(registry, model, position, options = CompletionOptions.default, context = { triggerKind: 0  }, token = CancellationToken.None) {
+async function provideSuggestionItems(registry, model, position, options = CompletionOptions.default, context = { triggerKind: CompletionTriggerKind.Invoke }, token = CancellationToken.None) {
     const sw = ( (new StopWatch()));
     position = position.clone();
     const word = model.getWordAtPosition(position);
@@ -157,7 +165,7 @@ async function provideSuggestionItems(registry, model, position, options = Compl
         }
         for (const suggestion of container.suggestions) {
             if (!( (options.kindFilter.has(suggestion.kind)))) {
-                if (!options.showDeprecated && suggestion?.tags?.includes(1 )) {
+                if (!options.showDeprecated && suggestion?.tags?.includes(CompletionItemTag.Deprecated)) {
                     continue;
                 }
                 if (!suggestion.range) {
@@ -166,7 +174,7 @@ async function provideSuggestionItems(registry, model, position, options = Compl
                 if (!suggestion.sortText) {
                     suggestion.sortText = typeof suggestion.label === 'string' ? suggestion.label : suggestion.label.label;
                 }
-                if (!needsClipboard && suggestion.insertTextRules && suggestion.insertTextRules & 4 ) {
+                if (!needsClipboard && suggestion.insertTextRules && suggestion.insertTextRules & CompletionItemInsertTextRule.InsertAsSnippet) {
                     needsClipboard = SnippetParser.guessNeedsClipboard(suggestion.insertText);
                 }
                 result.push(( (new CompletionItem(position, suggestion, container, provider))));
@@ -182,7 +190,7 @@ async function provideSuggestionItems(registry, model, position, options = Compl
         return didAddResult;
     };
     const snippetCompletions = (async () => {
-        if (!_snippetSuggestSupport || ( (options.kindFilter.has(27 )))) {
+        if (!_snippetSuggestSupport || ( (options.kindFilter.has(CompletionItemKind.Snippet)))) {
             return;
         }
         const reuseItems = options.providerItemsToReuse.get(_snippetSuggestSupport);
@@ -255,10 +263,10 @@ function defaultComparator(a, b) {
 }
 function snippetUpComparator(a, b) {
     if (a.completion.kind !== b.completion.kind) {
-        if (a.completion.kind === 27 ) {
+        if (a.completion.kind === CompletionItemKind.Snippet) {
             return -1;
         }
-        else if (b.completion.kind === 27 ) {
+        else if (b.completion.kind === CompletionItemKind.Snippet) {
             return 1;
         }
     }
@@ -266,19 +274,19 @@ function snippetUpComparator(a, b) {
 }
 function snippetDownComparator(a, b) {
     if (a.completion.kind !== b.completion.kind) {
-        if (a.completion.kind === 27 ) {
+        if (a.completion.kind === CompletionItemKind.Snippet) {
             return 1;
         }
-        else if (b.completion.kind === 27 ) {
+        else if (b.completion.kind === CompletionItemKind.Snippet) {
             return -1;
         }
     }
     return defaultComparator(a, b);
 }
 const _snippetComparators = ( (new Map()));
-_snippetComparators.set(0 , snippetUpComparator);
-_snippetComparators.set(2 , snippetDownComparator);
-_snippetComparators.set(1 , defaultComparator);
+_snippetComparators.set(SnippetSortOrder.Top, snippetUpComparator);
+_snippetComparators.set(SnippetSortOrder.Bottom, snippetDownComparator);
+_snippetComparators.set(SnippetSortOrder.Inline, defaultComparator);
 function getSuggestionComparator(snippetConfig) {
     return _snippetComparators.get(snippetConfig);
 }
@@ -297,7 +305,7 @@ CommandsRegistry.registerCommand('_executeCompletionItemProvider', async (access
         };
         const resolving = [];
         const actualPosition = ref.object.textEditorModel.validatePosition(position);
-        const completions = await provideSuggestionItems(completionProvider, ref.object.textEditorModel, actualPosition, undefined, { triggerCharacter: triggerCharacter ?? undefined, triggerKind: triggerCharacter ? 1  : 0  });
+        const completions = await provideSuggestionItems(completionProvider, ref.object.textEditorModel, actualPosition, undefined, { triggerCharacter: triggerCharacter ?? undefined, triggerKind: triggerCharacter ? CompletionTriggerKind.TriggerCharacter : CompletionTriggerKind.Invoke });
         for (const item of completions.items) {
             if (resolving.length < (maxItemsToResolve ?? 0)) {
                 resolving.push(item.resolve(CancellationToken.None));
@@ -329,10 +337,10 @@ class QuickSuggestionsOptions {
     }
     static valueFor(config, tokenType) {
         switch (tokenType) {
-            case 1 : return config.comments;
-            case 2 : return config.strings;
+            case StandardTokenType.Comment: return config.comments;
+            case StandardTokenType.String: return config.strings;
             default: return config.other;
         }
     }
 }
-export { CompletionItem, CompletionItemModel, CompletionOptions, Context, QuickSuggestionsOptions, getSnippetSuggestSupport, getSuggestionComparator, provideSuggestionItems, setSnippetSuggestSupport, showSimpleSuggestions, suggestWidgetStatusbarMenu };
+export { CompletionItem, CompletionItemModel, CompletionOptions, Context, QuickSuggestionsOptions, SnippetSortOrder, getSnippetSuggestSupport, getSuggestionComparator, provideSuggestionItems, setSnippetSuggestSupport, showSimpleSuggestions, suggestWidgetStatusbarMenu };

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

@@ -1,6 +1,8 @@
 import { isNonEmptyArray } from '../../../../base/common/arrays.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { CharacterSet } from '../../../common/core/characterClassifier.js';
+import { State } from './suggestModel.js';
 class CommitCharacterController {
     constructor(editor, widget, model, accept) {
         this._disposables = ( new DisposableStore());
@@ -16,9 +18,9 @@ class CommitCharacterController {
         this._disposables.add(widget.onDidFocus(this._onItem, this));
         this._disposables.add(widget.onDidHide(this.reset, this));
         this._disposables.add(editor.onWillType(text => {
-            if (this._active && !widget.isFrozen() && model.state !== 0 ) {
+            if (this._active && !widget.isFrozen() && model.state !== State.Idle) {
                 const ch = text.charCodeAt(text.length - 1);
-                if (( this._active.acceptCharacters.has(ch)) && editor.getOption(0 )) {
+                if (( this._active.acceptCharacters.has(ch)) && editor.getOption(EditorOption.acceptSuggestionOnCommitCharacter)) {
                     accept(this._active.item);
                 }
             }