@codingame/monaco-vscode-api 5.3.0 → 6.0.1

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

@@ -10,12 +10,15 @@ import { MutableDisposable, DisposableStore } from '../../../../base/common/life
 import { clamp } from '../../../../base/common/numbers.js';
 import { format } from '../../../../base/common/strings.js';
 import './media/suggest.css.js';
+import { ContentWidgetPositionPreference } from '../../../browser/editorBrowser.js';
 import { EmbeddedCodeEditorWidget } from '../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { SuggestWidgetStatus } from './suggestWidgetStatus.js';
 import '../../symbolIcons/browser/symbolIcons.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { registerColor, transparent } from '../../../../platform/theme/common/colorUtils.js';
 import { activeContrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
@@ -63,13 +66,22 @@ registerColor('editorSuggestWidget.focusHighlightForeground', { dark: listFocusH
     'Color of the match highlights in the suggest widget when an item is focused.'
 )));
 registerColor('editorSuggestWidgetStatus.foreground', { dark: ( (transparent(editorSuggestWidgetForeground, .5))), light: ( (transparent(editorSuggestWidgetForeground, .5))), hcDark: ( (transparent(editorSuggestWidgetForeground, .5))), hcLight: ( (transparent(editorSuggestWidgetForeground, .5))) }, ( localizeWithPath(_moduleId, 8, 'Foreground color of the suggest widget status.')));
+var State;
+( ((function(State) {
+    State[State["Hidden"] = 0] = "Hidden";
+    State[State["Loading"] = 1] = "Loading";
+    State[State["Empty"] = 2] = "Empty";
+    State[State["Open"] = 3] = "Open";
+    State[State["Frozen"] = 4] = "Frozen";
+    State[State["Details"] = 5] = "Details";
+})(State || (State = {}))));
 class PersistedWidgetSize {
     constructor(_service, editor) {
         this._service = _service;
         this._key = `suggestWidget.size/${editor.getEditorType()}/${editor instanceof EmbeddedCodeEditorWidget}`;
     }
     restore() {
-        const raw = this._service.get(this._key, 0 ) ?? '';
+        const raw = this._service.get(this._key, StorageScope.PROFILE) ?? '';
         try {
             const obj = JSON.parse(raw);
             if (Dimension.is(obj)) {
@@ -81,10 +93,10 @@ class PersistedWidgetSize {
         return undefined;
     }
     store(size) {
-        this._service.store(this._key, JSON.stringify(size), 0 , 1 );
+        this._service.store(this._key, JSON.stringify(size), StorageScope.PROFILE, StorageTarget.MACHINE);
     }
     reset() {
-        this._service.remove(this._key, 0 );
+        this._service.remove(this._key, StorageScope.PROFILE);
     }
 }
 let SuggestWidget = class SuggestWidget {
@@ -94,7 +106,7 @@ let SuggestWidget = class SuggestWidget {
     constructor(editor, _storageService, _contextKeyService, _themeService, instantiationService) {
         this.editor = editor;
         this._storageService = _storageService;
-        this._state = 0 ;
+        this._state = State.Hidden;
         this._isAuto = false;
         this._pendingLayout = ( (new MutableDisposable()));
         this._pendingShowDetails = ( (new MutableDisposable()));
@@ -159,7 +171,7 @@ let SuggestWidget = class SuggestWidget {
         const details = this._disposables.add(instantiationService.createInstance(SuggestDetailsWidget, this.editor));
         details.onDidClose(this.toggleDetails, this, this._disposables);
         this._details = ( (new SuggestDetailsOverlay(details, this.editor)));
-        const applyIconStyle = () => this.element.domNode.classList.toggle('no-icons', !this.editor.getOption(118 ).showIcons);
+        const applyIconStyle = () => this.element.domNode.classList.toggle('no-icons', !this.editor.getOption(EditorOption.suggest).showIcons);
         applyIconStyle();
         const renderer = instantiationService.createInstance(ItemRenderer, this.editor);
         this._disposables.add(renderer);
@@ -204,7 +216,7 @@ let SuggestWidget = class SuggestWidget {
             listInactiveFocusOutline: activeContrastBorder
         }));
         this._status = instantiationService.createInstance(SuggestWidgetStatus, this.element.domNode, suggestWidgetStatusbarMenu);
-        const applyStatusBarStyle = () => this.element.domNode.classList.toggle('with-status-bar', this.editor.getOption(118 ).showStatusBar);
+        const applyStatusBarStyle = () => this.element.domNode.classList.toggle('with-status-bar', this.editor.getOption(EditorOption.suggest).showStatusBar);
         applyStatusBarStyle();
         this._disposables.add(_themeService.onDidColorThemeChange(t => this._onThemeChange(t)));
         this._onThemeChange(_themeService.getColorTheme());
@@ -214,11 +226,11 @@ let SuggestWidget = class SuggestWidget {
         this._disposables.add(this._list.onDidChangeFocus(e => this._onListFocus(e)));
         this._disposables.add(this.editor.onDidChangeCursorSelection(() => this._onCursorSelectionChanged()));
         this._disposables.add(this.editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(118 )) {
+            if (e.hasChanged(EditorOption.suggest)) {
                 applyStatusBarStyle();
                 applyIconStyle();
             }
-            if (this._completionModel && (e.hasChanged(50 ) || e.hasChanged(119 ) || e.hasChanged(120 ))) {
+            if (this._completionModel && (e.hasChanged(EditorOption.fontInfo) || e.hasChanged(EditorOption.suggestFontSize) || e.hasChanged(EditorOption.suggestLineHeight))) {
                 this._list.splice(0, this._list.length, this._completionModel.items);
             }
         }));
@@ -255,7 +267,7 @@ let SuggestWidget = class SuggestWidget {
         }
     }
     _onCursorSelectionChanged() {
-        if (this._state !== 0 ) {
+        if (this._state !== State.Hidden) {
             this._contentWidget.layout();
         }
     }
@@ -346,10 +358,10 @@ let SuggestWidget = class SuggestWidget {
             return;
         }
         this._state = state;
-        this.element.domNode.classList.toggle('frozen', state === 4 );
+        this.element.domNode.classList.toggle('frozen', state === State.Frozen);
         this.element.domNode.classList.remove('message');
         switch (state) {
-            case 0 :
+            case State.Hidden:
                 hide(this._messageElement, this._listElement, this._status.element);
                 this._details.hide(true);
                 this._status.hide();
@@ -364,7 +376,7 @@ let SuggestWidget = class SuggestWidget {
                 this._cappedHeight = undefined;
                 this._explainMode = false;
                 break;
-            case 1 :
+            case State.Loading:
                 this.element.domNode.classList.add('message');
                 this._messageElement.textContent = SuggestWidget_1.LOADING_MESSAGE;
                 hide(this._listElement, this._status.element);
@@ -374,7 +386,7 @@ let SuggestWidget = class SuggestWidget {
                 this._focusedItem = undefined;
                 status(SuggestWidget_1.LOADING_MESSAGE);
                 break;
-            case 2 :
+            case State.Empty:
                 this.element.domNode.classList.add('message');
                 this._messageElement.textContent = SuggestWidget_1.NO_SUGGESTIONS_MESSAGE;
                 hide(this._listElement, this._status.element);
@@ -384,17 +396,17 @@ let SuggestWidget = class SuggestWidget {
                 this._focusedItem = undefined;
                 status(SuggestWidget_1.NO_SUGGESTIONS_MESSAGE);
                 break;
-            case 3 :
+            case State.Open:
                 hide(this._messageElement);
                 show(this._listElement, this._status.element);
                 this._show();
                 break;
-            case 4 :
+            case State.Frozen:
                 hide(this._messageElement);
                 show(this._listElement, this._status.element);
                 this._show();
                 break;
-            case 5 :
+            case State.Details:
                 hide(this._messageElement);
                 show(this._listElement, this._status.element);
                 this._details.show();
@@ -413,13 +425,13 @@ let SuggestWidget = class SuggestWidget {
         }, 100);
     }
     showTriggered(auto, delay) {
-        if (this._state !== 0 ) {
+        if (this._state !== State.Hidden) {
             return;
         }
         this._contentWidget.setPosition(this.editor.getPosition());
         this._isAuto = !!auto;
         if (!this._isAuto) {
-            this._loadingTimeout = disposableTimeout(() => this._setState(1 ), delay);
+            this._loadingTimeout = disposableTimeout(() => this._setState(State.Loading), delay);
         }
     }
     showSuggestions(completionModel, selectionIndex, isFrozen, isAuto, noFocus) {
@@ -430,15 +442,15 @@ let SuggestWidget = class SuggestWidget {
         if (this._completionModel !== completionModel) {
             this._completionModel = completionModel;
         }
-        if (isFrozen && this._state !== 2  && this._state !== 0 ) {
-            this._setState(4 );
+        if (isFrozen && this._state !== State.Empty && this._state !== State.Hidden) {
+            this._setState(State.Frozen);
             return;
         }
         const visibleCount = this._completionModel.items.length;
         const isEmpty = visibleCount === 0;
         this._ctxSuggestWidgetMultipleSuggestions.set(visibleCount > 1);
         if (isEmpty) {
-            this._setState(isAuto ? 0  : 2 );
+            this._setState(isAuto ? State.Hidden : State.Empty);
             this._completionModel = undefined;
             return;
         }
@@ -447,7 +459,7 @@ let SuggestWidget = class SuggestWidget {
         this._onDidSelect.pause();
         try {
             this._list.splice(0, this._list.length, this._completionModel.items);
-            this._setState(isFrozen ? 4  : 3 );
+            this._setState(isFrozen ? State.Frozen : State.Open);
             this._list.reveal(selectionIndex, 0);
             this._list.setFocus(noFocus ? [] : [selectionIndex]);
         }
@@ -468,12 +480,12 @@ let SuggestWidget = class SuggestWidget {
     }
     selectNextPage() {
         switch (this._state) {
-            case 0 :
+            case State.Hidden:
                 return false;
-            case 5 :
+            case State.Details:
                 this._details.widget.pageDown();
                 return true;
-            case 1 :
+            case State.Loading:
                 return !this._isAuto;
             default:
                 this._list.focusNextPage();
@@ -482,9 +494,9 @@ let SuggestWidget = class SuggestWidget {
     }
     selectNext() {
         switch (this._state) {
-            case 0 :
+            case State.Hidden:
                 return false;
-            case 1 :
+            case State.Loading:
                 return !this._isAuto;
             default:
                 this._list.focusNext(1, true);
@@ -493,12 +505,12 @@ let SuggestWidget = class SuggestWidget {
     }
     selectLast() {
         switch (this._state) {
-            case 0 :
+            case State.Hidden:
                 return false;
-            case 5 :
+            case State.Details:
                 this._details.widget.scrollBottom();
                 return true;
-            case 1 :
+            case State.Loading:
                 return !this._isAuto;
             default:
                 this._list.focusLast();
@@ -507,12 +519,12 @@ let SuggestWidget = class SuggestWidget {
     }
     selectPreviousPage() {
         switch (this._state) {
-            case 0 :
+            case State.Hidden:
                 return false;
-            case 5 :
+            case State.Details:
                 this._details.widget.pageUp();
                 return true;
-            case 1 :
+            case State.Loading:
                 return !this._isAuto;
             default:
                 this._list.focusPreviousPage();
@@ -521,9 +533,9 @@ let SuggestWidget = class SuggestWidget {
     }
     selectPrevious() {
         switch (this._state) {
-            case 0 :
+            case State.Hidden:
                 return false;
-            case 1 :
+            case State.Loading:
                 return !this._isAuto;
             default:
                 this._list.focusPrevious(1, true);
@@ -532,12 +544,12 @@ let SuggestWidget = class SuggestWidget {
     }
     selectFirst() {
         switch (this._state) {
-            case 0 :
+            case State.Hidden:
                 return false;
-            case 5 :
+            case State.Details:
                 this._details.widget.scrollTop();
                 return true;
-            case 1 :
+            case State.Loading:
                 return !this._isAuto;
             default:
                 this._list.focusFirst();
@@ -545,9 +557,9 @@ let SuggestWidget = class SuggestWidget {
         }
     }
     getFocusedItem() {
-        if (this._state !== 0
-            && this._state !== 2
-            && this._state !== 1
+        if (this._state !== State.Hidden
+            && this._state !== State.Empty
+            && this._state !== State.Loading
             && this._completionModel
             && this._list.getFocus().length > 0) {
             return {
@@ -559,12 +571,12 @@ let SuggestWidget = class SuggestWidget {
         return undefined;
     }
     toggleDetailsFocus() {
-        if (this._state === 5 ) {
-            this._setState(3 );
+        if (this._state === State.Details) {
+            this._setState(State.Open);
             this._details.widget.domNode.classList.remove('focused');
         }
-        else if (this._state === 3  && this._isDetailsVisible()) {
-            this._setState(5 );
+        else if (this._state === State.Open && this._isDetailsVisible()) {
+            this._setState(State.Details);
             this._details.widget.domNode.classList.add('focused');
         }
     }
@@ -576,7 +588,7 @@ let SuggestWidget = class SuggestWidget {
             this._details.hide();
             this.element.domNode.classList.remove('shows-details');
         }
-        else if ((canExpandCompletionItem(this._list.getFocusedElements()[0]) || this._explainMode) && ((this._state === 3  || this._state === 5  || this._state === 4) )) {
+        else if ((canExpandCompletionItem(this._list.getFocusedElements()[0]) || this._explainMode) && (this._state === State.Open || this._state === State.Details || this._state === State.Frozen)) {
             this._ctxSuggestWidgetDetailsVisible.set(true);
             this._setDetailsVisible(true);
             this.showDetails(false);
@@ -620,7 +632,7 @@ let SuggestWidget = class SuggestWidget {
         this._pendingLayout.clear();
         this._pendingShowDetails.clear();
         this._loadingTimeout?.dispose();
-        this._setState(0 );
+        this._setState(State.Hidden);
         this._onDidHide.fire(this);
         this.element.clearSashHoverState();
         const dim = this._persistedSize.restore();
@@ -630,7 +642,7 @@ let SuggestWidget = class SuggestWidget {
         }
     }
     isFrozen() {
-        return this._state === 4 ;
+        return this._state === State.Frozen;
     }
     _afterRender(position) {
         if (position === null) {
@@ -639,7 +651,7 @@ let SuggestWidget = class SuggestWidget {
             }
             return;
         }
-        if (this._state === 2  || this._state === 1 ) {
+        if (this._state === State.Empty || this._state === State.Loading) {
             return;
         }
         if (this._isDetailsVisible() && !this._details.widget.isEmpty) {
@@ -662,12 +674,12 @@ let SuggestWidget = class SuggestWidget {
         let height = size.height;
         let width = size.width;
         this._status.element.style.height = `${info.itemHeight}px`;
-        if (this._state === 2  || this._state === 1 ) {
+        if (this._state === State.Empty || this._state === State.Loading) {
             height = info.itemHeight + info.borderHeight;
             width = info.defaultSize.width / 2;
             this.element.enableSashes(false, false, false, false);
             this.element.minSize = this.element.maxSize = new Dimension(width, height);
-            this._contentWidget.setPreference(2 );
+            this._contentWidget.setPreference(ContentWidgetPositionPreference.BELOW);
         }
         else {
             const maxWidth = bodyBox.width - info.borderHeight - 2 * info.horizontalPadding;
@@ -695,12 +707,12 @@ let SuggestWidget = class SuggestWidget {
             }
             const forceRenderingAboveRequiredSpace = 150;
             if (height > maxHeightBelow || (this._forceRenderingAbove && availableSpaceAbove > forceRenderingAboveRequiredSpace)) {
-                this._contentWidget.setPreference(1 );
+                this._contentWidget.setPreference(ContentWidgetPositionPreference.ABOVE);
                 this.element.enableSashes(true, true, false, false);
                 maxHeight = maxHeightAbove;
             }
             else {
-                this._contentWidget.setPreference(2 );
+                this._contentWidget.setPreference(ContentWidgetPositionPreference.BELOW);
                 this.element.enableSashes(false, true, true, false);
                 maxHeight = maxHeightBelow;
             }
@@ -726,13 +738,13 @@ let SuggestWidget = class SuggestWidget {
     }
     _positionDetails() {
         if (this._isDetailsVisible()) {
-            this._details.placeAtAnchor(this.element.domNode, this._contentWidget.getPosition()?.preference[0] === 2 );
+            this._details.placeAtAnchor(this.element.domNode, this._contentWidget.getPosition()?.preference[0] === ContentWidgetPositionPreference.BELOW);
         }
     }
     getLayoutInfo() {
-        const fontInfo = this.editor.getOption(50 );
-        const itemHeight = clamp(this.editor.getOption(120 ) || fontInfo.lineHeight, 8, 1000);
-        const statusBarHeight = !this.editor.getOption(118 ).showStatusBar || this._state === 2  || this._state === 1  ? 0 : itemHeight;
+        const fontInfo = this.editor.getOption(EditorOption.fontInfo);
+        const itemHeight = clamp(this.editor.getOption(EditorOption.suggestLineHeight) || fontInfo.lineHeight, 8, 1000);
+        const statusBarHeight = !this.editor.getOption(EditorOption.suggest).showStatusBar || this._state === State.Empty || this._state === State.Loading ? 0 : itemHeight;
         const borderWidth = this._details.widget.borderWidth;
         const borderHeight = 2 * borderWidth;
         return {
@@ -747,10 +759,10 @@ let SuggestWidget = class SuggestWidget {
         };
     }
     _isDetailsVisible() {
-        return this._storageService.getBoolean('expandSuggestionDocs', 0 , false);
+        return this._storageService.getBoolean('expandSuggestionDocs', StorageScope.PROFILE, false);
     }
     _setDetailsVisible(value) {
-        this._storageService.store('expandSuggestionDocs', value, 0 , 0 );
+        this._storageService.store('expandSuggestionDocs', value, StorageScope.PROFILE, StorageTarget.USER);
     }
     forceRenderingAbove() {
         if (!this._forceRenderingAbove) {

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

@@ -7,6 +7,7 @@ import { Emitter } from '../../../../base/common/event.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { MarkdownRenderer } from '../../../browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { ResizableHTMLElement } from '../../../../base/browser/ui/resizable/resizable.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -41,7 +42,7 @@ let SuggestDetailsWidget = class SuggestDetailsWidget {
         this._docs = append(this._body, $('p.docs'));
         this._configureFont();
         this._disposables.add(this._editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(50 )) {
+            if (e.hasChanged(EditorOption.fontInfo)) {
                 this._configureFont();
             }
         }));
@@ -52,10 +53,10 @@ let SuggestDetailsWidget = class SuggestDetailsWidget {
     }
     _configureFont() {
         const options = this._editor.getOptions();
-        const fontInfo = options.get(50 );
+        const fontInfo = options.get(EditorOption.fontInfo);
         const fontFamily = fontInfo.getMassagedFontFamily();
-        const fontSize = options.get(119 ) || fontInfo.fontSize;
-        const lineHeight = options.get(120 ) || fontInfo.lineHeight;
+        const fontSize = options.get(EditorOption.suggestFontSize) || fontInfo.fontSize;
+        const lineHeight = options.get(EditorOption.suggestLineHeight) || fontInfo.lineHeight;
         const fontWeight = fontInfo.fontWeight;
         const fontSizePx = `${fontSize}px`;
         const lineHeightPx = `${lineHeight}px`;
@@ -68,7 +69,7 @@ let SuggestDetailsWidget = class SuggestDetailsWidget {
         this._close.style.width = lineHeightPx;
     }
     getLayoutInfo() {
-        const lineHeight = this._editor.getOption(120 ) || this._editor.getOption(50 ).lineHeight;
+        const lineHeight = this._editor.getOption(EditorOption.suggestLineHeight) || this._editor.getOption(EditorOption.fontInfo).lineHeight;
         const borderWidth = this._borderWidth;
         const borderHeight = borderWidth * 2;
         return {

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

@@ -7,7 +7,8 @@ import { Emitter } from '../../../../base/common/event.js';
 import { createMatches } from '../../../../base/common/filters.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { URI } from '../../../../base/common/uri.js';
-import { CompletionItemKinds } from '../../../common/languages.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { CompletionItemKind, CompletionItemKinds, CompletionItemTag } from '../../../common/languages.js';
 import { getIconClasses } from '../../../common/services/getIconClasses.js';
 import { IModelService } from '../../../common/services/model.js';
 import { ILanguageService } from '../../../common/languages/language.js';
@@ -79,11 +80,11 @@ let ItemRenderer = class ItemRenderer {
         readMore.title = ( localizeWithPath(_moduleId, 1, "Read More"));
         const configureFont = () => {
             const options = this._editor.getOptions();
-            const fontInfo = options.get(50 );
+            const fontInfo = options.get(EditorOption.fontInfo);
             const fontFamily = fontInfo.getMassagedFontFamily();
             const fontFeatureSettings = fontInfo.fontFeatureSettings;
-            const fontSize = options.get(119 ) || fontInfo.fontSize;
-            const lineHeight = options.get(120 ) || fontInfo.lineHeight;
+            const fontSize = options.get(EditorOption.suggestFontSize) || fontInfo.fontSize;
+            const lineHeight = options.get(EditorOption.suggestLineHeight) || fontInfo.lineHeight;
             const fontWeight = fontInfo.fontWeight;
             const letterSpacing = fontInfo.letterSpacing;
             const fontSizePx = `${fontSize}px`;
@@ -112,19 +113,19 @@ let ItemRenderer = class ItemRenderer {
             matches: createMatches(element.score)
         };
         const color = [];
-        if (completion.kind === 19  && _completionItemColor.extract(element, color)) {
+        if (completion.kind === CompletionItemKind.Color && _completionItemColor.extract(element, color)) {
             data.icon.className = 'icon customcolor';
             data.iconContainer.className = 'icon hide';
             data.colorspan.style.backgroundColor = color[0];
         }
-        else if (completion.kind === 20  && this._themeService.getFileIconTheme().hasFileIcons) {
+        else if (completion.kind === CompletionItemKind.File && this._themeService.getFileIconTheme().hasFileIcons) {
             data.icon.className = 'icon hide';
             data.iconContainer.className = 'icon hide';
             const labelClasses = getIconClasses(this._modelService, this._languageService, ( (URI.from({ scheme: 'fake', path: element.textLabel }))), FileKind.FILE);
             const detailClasses = getIconClasses(this._modelService, this._languageService, ( (URI.from({ scheme: 'fake', path: completion.detail }))), FileKind.FILE);
             labelOptions.extraClasses = labelClasses.length > detailClasses.length ? labelClasses : detailClasses;
         }
-        else if (completion.kind === 23  && this._themeService.getFileIconTheme().hasFolderIcons) {
+        else if (completion.kind === CompletionItemKind.Folder && this._themeService.getFileIconTheme().hasFolderIcons) {
             data.icon.className = 'icon hide';
             data.iconContainer.className = 'icon hide';
             labelOptions.extraClasses = [
@@ -137,7 +138,7 @@ let ItemRenderer = class ItemRenderer {
             data.iconContainer.className = '';
             data.iconContainer.classList.add('suggest-icon', ...ThemeIcon.asClassNameArray(CompletionItemKinds.toIcon(completion.kind)));
         }
-        if (completion.tags && completion.tags.indexOf(1 ) >= 0) {
+        if (completion.tags && completion.tags.indexOf(CompletionItemTag.Deprecated) >= 0) {
             labelOptions.extraClasses = (labelOptions.extraClasses || []).concat(['deprecated']);
             labelOptions.matches = [];
         }
@@ -152,7 +153,7 @@ let ItemRenderer = class ItemRenderer {
             data.detailsLabel.textContent = stripNewLines(completion.label.description || '');
             data.root.classList.remove('string-label');
         }
-        if (this._editor.getOption(118 ).showInlineDetails) {
+        if (this._editor.getOption(EditorOption.suggest).showInlineDetails) {
             show(data.detailsLabel);
         }
         else {

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

@@ -1,4 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 var WordContextKey_1;
@@ -9,7 +10,7 @@ let WordContextKey = class WordContextKey {
         this._editor = _editor;
         this._enabled = false;
         this._ckAtEnd = WordContextKey_1.AtEnd.bindTo(contextKeyService);
-        this._configListener = this._editor.onDidChangeConfiguration(e => e.hasChanged(123 ) && this._update());
+        this._configListener = this._editor.onDidChangeConfiguration(e => e.hasChanged(EditorOption.tabCompletion) && this._update());
         this._update();
     }
     dispose() {
@@ -18,7 +19,7 @@ let WordContextKey = class WordContextKey {
         this._ckAtEnd.reset();
     }
     _update() {
-        const enabled = this._editor.getOption(123 ) === 'on';
+        const enabled = this._editor.getOption(EditorOption.tabCompletion) === 'on';
         if (this._enabled === enabled) {
             return;
         }

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

@@ -1,12 +1,14 @@
 import { isFalsyOrEmpty, binarySearch } from '../../../../base/common/arrays.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
+import { CompletionItemKind } from '../../../common/languages.js';
 import { BracketSelectionRangeProvider } from '../../smartSelect/browser/bracketSelections.js';
 class WordDistance {
     static { this.None = new class extends WordDistance {
         distance() { return 0; }
     }; }
     static async create(service, editor) {
-        if (!editor.getOption(118 ).localityBonus) {
+        if (!editor.getOption(EditorOption.suggest).localityBonus) {
             return WordDistance.None;
         }
         if (!editor.hasModel()) {
@@ -32,7 +34,7 @@ class WordDistance {
                 if (!position.equals(editor.getPosition())) {
                     return 0;
                 }
-                if (item.kind === 17 ) {
+                if (item.kind === CompletionItemKind.Keyword) {
                     return 2 << 20;
                 }
                 const word = typeof item.label === 'string' ? item.label : item.label.label;

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

@@ -1,7 +1,9 @@
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { TabFocus } from '../../../browser/config/tabFocus.js';
 import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
-import { registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 const _moduleId = "vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode";
 class ToggleTabFocusModeAction extends Action2 {
     static { this.ID = 'editor.action.toggleTabFocusMode'; }
@@ -11,9 +13,9 @@ class ToggleTabFocusModeAction extends Action2 {
             title: ( localize2WithPath(_moduleId, 0, 'Toggle Tab Key Moves Focus')),
             precondition: undefined,
             keybinding: {
-                primary: 2048  | 43 ,
-                mac: { primary: 256  | 1024  | 43  },
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyCode.KeyM,
+                mac: { primary: KeyMod$1.WinCtrl | KeyMod$1.Shift | KeyCode.KeyM },
+                weight: KeybindingWeight.EditorContrib
             },
             metadata: {
                 description: ( localize2WithPath(