@codingame/monaco-vscode-api 5.3.0 → 6.0.1

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.js

@@ -7,15 +7,18 @@ import { equals } from '../../../../base/common/arrays.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
+import { derived, derivedWithStore } from '../../../../base/common/observableInternal/derived.js';
 import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import { observableFromEvent, derivedObservableWithCache } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
 import { OS } from '../../../../base/common/platform.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import './inlineCompletionsHintsWidget.css.js';
+import { ContentWidgetPositionPreference } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
 import { InlineCompletionTriggerKind } from '../../../common/languages.js';
+import { PositionAffinity } from '../../../common/model.js';
 import { showPreviousInlineSuggestionActionId, showNextInlineSuggestionActionId } from './commandIds.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { MenuEntryActionViewItem, createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
@@ -37,7 +40,7 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
         this.editor = editor;
         this.model = model;
         this.instantiationService = instantiationService;
-        this.alwaysShowToolbar = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(62 ).showToolbar === 'always');
+        this.alwaysShowToolbar = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).showToolbar === 'always');
         this.sessionPosition = undefined;
         this.position = derived(this, reader => {
             const ghostText = this.model.read(reader)?.primaryGhostText.read(reader);
@@ -61,16 +64,25 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
             if (!model || !this.alwaysShowToolbar.read(reader)) {
                 return;
             }
-            const contentWidget = store.add(this.instantiationService.createInstance(InlineSuggestionHintsContentWidget, this.editor, true, this.position, model.selectedInlineCompletionIndex, model.inlineCompletionsCount, model.activeCommands));
-            editor.addContentWidget(contentWidget);
-            store.add(toDisposable(() => editor.removeContentWidget(contentWidget)));
+            const contentWidgetValue = derivedWithStore((reader, store) => {
+                const contentWidget = store.add(this.instantiationService.createInstance(InlineSuggestionHintsContentWidget, this.editor, true, this.position, model.selectedInlineCompletionIndex, model.inlineCompletionsCount, model.activeCommands));
+                editor.addContentWidget(contentWidget);
+                store.add(toDisposable(() => editor.removeContentWidget(contentWidget)));
+                store.add(autorun(reader => {
+                    const position = this.position.read(reader);
+                    if (!position) {
+                        return;
+                    }
+                    if (model.lastTriggerKind.read(reader) !== InlineCompletionTriggerKind.Explicit) {
+                        model.triggerExplicitly();
+                    }
+                }));
+                return contentWidget;
+            });
+            const hadPosition = derivedObservableWithCache(this, (reader, lastValue) => !!this.position.read(reader) || !!lastValue);
             store.add(autorun(reader => {
-                const position = this.position.read(reader);
-                if (!position) {
-                    return;
-                }
-                if (model.lastTriggerKind.read(reader) !== InlineCompletionTriggerKind.Explicit) {
-                    model.triggerExplicitly();
+                if (hadPosition.read(reader)) {
+                    contentWidgetValue.read(reader);
                 }
             }));
         }));
@@ -208,8 +220,8 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
     getPosition() {
         return {
             position: this._position.get(),
-            preference: [1 , 2 ],
-            positionAffinity: 3 ,
+            preference: [ContentWidgetPositionPreference.ABOVE, ContentWidgetPositionPreference.BELOW],
+            positionAffinity: PositionAffinity.LeftOfInjectedText,
         };
     }
 };

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.js

@@ -17,8 +17,10 @@ import { Range } from '../../../common/core/range.js';
 import { Selection } from '../../../common/core/selection.js';
 import { SingleTextEdit, TextEdit } from '../../../common/core/textEdit.js';
 import { TextLength } from '../../../common/core/textLength.js';
-import { InlineCompletionTriggerKind } from '../../../common/languages.js';
+import { ScrollType } from '../../../common/editorCommon.js';
+import { InlineCompletionTriggerKind, PartialAcceptTriggerKind } from '../../../common/languages.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { EndOfLinePreference } from '../../../common/model.js';
 import { GhostText, ghostTextsOrReplacementsEqual, ghostTextOrReplacementEquals } from './ghostText.js';
 import { InlineCompletionsSource } from './inlineCompletionsSource.js';
 import { singleTextRemoveCommonPrefix, computeGhostText, singleTextEditAugments } from './singleTextEdit.js';
@@ -342,7 +344,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 }
             }
             return acceptUntilIndexExclusive;
-        }, 0 );
+        }, PartialAcceptTriggerKind.Word);
     }
     async acceptNextLine(editor) {
         await this._acceptNext(editor, (pos, text) => {
@@ -351,7 +353,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 return m.index + 1;
             }
             return text.length;
-        }, 1 );
+        }, PartialAcceptTriggerKind.Line);
     }
     async _acceptNext(editor, getAcceptUntilIndex, kind) {
         if (editor.getModel() !== this.textModel) {
@@ -390,13 +392,14 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 const selections = ( getEndPositionsAfterApplying(edits).map(p => Selection.fromPositions(p)));
                 editor.executeEdits('inlineSuggestion.accept', ( edits.map(edit => EditOperation.replace(edit.range, edit.text))));
                 editor.setSelections(selections, 'inlineCompletionPartialAccept');
+                editor.revealPositionInCenterIfOutsideViewport(editor.getPosition(), ScrollType.Immediate);
             }
             finally {
                 this._isAcceptingPartially = false;
             }
             if (completion.source.provider.handlePartialAccept) {
                 const acceptedRange = Range.fromPositions(completion.range.getStartPosition(), TextLength.ofText(partialGhostTextVal).addToPosition(ghostTextPos));
-                const text = editor.getModel().getValueInRange(acceptedRange, 1 );
+                const text = editor.getModel().getValueInRange(acceptedRange, EndOfLinePreference.LF);
                 completion.source.provider.handlePartialAccept(completion.source.inlineCompletions, completion.sourceInlineCompletion, text.length, {
                     kind,
                 });
@@ -414,7 +417,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         }
         const inlineCompletion = augmentedCompletion.completion.inlineCompletion;
         inlineCompletion.source.provider.handlePartialAccept?.(inlineCompletion.source.inlineCompletions, inlineCompletion.sourceInlineCompletion, itemEdit.text.length, {
-            kind: 2 ,
+            kind: PartialAcceptTriggerKind.Suggest,
         });
     }
 };

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsSource.js

@@ -12,6 +12,7 @@ import { SingleTextEdit } from '../../../common/core/textEdit.js';
 import { TextLength } from '../../../common/core/textLength.js';
 import { InlineCompletionTriggerKind } from '../../../common/languages.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { EndOfLinePreference } from '../../../common/model.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { provideInlineCompletions } from './provideInlineCompletions.js';
 import { singleTextRemoveCommonPrefix } from './singleTextEdit.js';
@@ -222,7 +223,7 @@ class InlineCompletionWithUpdatedRange {
             || cursorPosition.lineNumber !== minimizedReplacement.range.startLineNumber) {
             return false;
         }
-        const originalValue = model.getValueInRange(minimizedReplacement.range, 1 );
+        const originalValue = model.getValueInRange(minimizedReplacement.range, EndOfLinePreference.LF);
         const filterText = minimizedReplacement.text;
         const cursorPosIndex = Math.max(0, cursorPosition.column - minimizedReplacement.range.startColumn);
         let filterTextBefore = filterText.substring(0, cursorPosIndex);

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/singleTextEdit.js

@@ -3,13 +3,14 @@ import { commonPrefixLength, getLeadingWhitespace } from '../../../../base/commo
 import { Range } from '../../../common/core/range.js';
 import { TextLength } from '../../../common/core/textLength.js';
 import { SingleTextEdit } from '../../../common/core/textEdit.js';
+import { EndOfLinePreference } from '../../../common/model.js';
 import { GhostTextPart, GhostText } from './ghostText.js';
 function singleTextRemoveCommonPrefix(edit, model, validModelRange) {
     const modelRange = validModelRange ? edit.range.intersectRanges(validModelRange) : edit.range;
     if (!modelRange) {
         return edit;
     }
-    const valueToReplace = model.getValueInRange(modelRange, 1 );
+    const valueToReplace = model.getValueInRange(modelRange, EndOfLinePreference.LF);
     const commonPrefixLen = commonPrefixLength(valueToReplace, edit.text);
     const start = TextLength.ofText(valueToReplace.substring(0, commonPrefixLen)).addToPosition(edit.range.getStartPosition());
     const text = edit.text.substring(commonPrefixLen);

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.js

@@ -2,7 +2,7 @@ import { Event } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
-import { SelectedSuggestionInfo } from '../../../common/languages.js';
+import { CompletionItemInsertTextRule, SelectedSuggestionInfo } from '../../../common/languages.js';
 import { SnippetParser } from '../../snippet/browser/snippetParser.js';
 import { SnippetSession } from '../../snippet/browser/snippetSession.js';
 import { SuggestController } from '../../suggest/browser/suggestController.js';
@@ -141,7 +141,7 @@ class SuggestItemInfo {
     static fromSuggestion(suggestController, model, position, item, toggleMode) {
         let { insertText } = item.completion;
         let isSnippetText = false;
-        if (item.completion.insertTextRules & 4 ) {
+        if (item.completion.insertTextRules & CompletionItemInsertTextRule.InsertAsSnippet) {
             const snippet = ( new SnippetParser()).parse(insertText);
             if (snippet.children.length < 100) {
                 SnippetSession.adjustWhitespace(model, position, true, snippet);

package/vscode/src/vs/editor/contrib/inlineEdit/browser/commands.js

@@ -1,9 +1,11 @@
+import { KeyCode, KeyMod as KeyMod$1 } from '../../../../base/common/keyCodes.js';
 import { EditorAction } from '../../../browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { inlineEditAcceptId, inlineEditJumpToId, inlineEditJumpBackId, inlineEditRejectId } from './commandIds.js';
 import { InlineEditController } from './inlineEditController.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 class AcceptInlineEdit extends EditorAction {
     constructor() {
         super({
@@ -13,8 +15,8 @@ class AcceptInlineEdit extends EditorAction {
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, InlineEditController.inlineEditVisibleContext)),
             kbOpts: [
                 {
-                    weight: 100  + 1,
-                    primary: 2 ,
+                    weight: KeybindingWeight.EditorContrib + 1,
+                    primary: KeyCode.Tab,
                     kbExpr: ( ContextKeyExpr.and(
                         EditorContextKeys.writable,
                         InlineEditController.inlineEditVisibleContext,
@@ -47,8 +49,8 @@ class TriggerInlineEdit extends EditorAction {
             alias: 'Trigger Inline Edit',
             precondition: activeExpr,
             kbOpts: {
-                weight: 100  + 1,
-                primary: 2048  | 512  | 86 ,
+                weight: KeybindingWeight.EditorContrib + 1,
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.Equal,
                 kbExpr: activeExpr
             },
         });
@@ -71,8 +73,8 @@ class JumpToInlineEdit extends EditorAction {
             alias: 'Jump to Inline Edit',
             precondition: activeExpr,
             kbOpts: {
-                weight: 100  + 1,
-                primary: 2048  | 512  | 86 ,
+                weight: KeybindingWeight.EditorContrib + 1,
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.Equal,
                 kbExpr: activeExpr
             },
             menuOpts: [{
@@ -98,8 +100,8 @@ class JumpBackInlineEdit extends EditorAction {
             alias: 'Jump Back from Inline Edit',
             precondition: activeExpr,
             kbOpts: {
-                weight: 100  + 10,
-                primary: 2048  | 512  | 86 ,
+                weight: KeybindingWeight.EditorContrib + 10,
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.Equal,
                 kbExpr: activeExpr
             },
             menuOpts: [{
@@ -125,8 +127,8 @@ class RejectInlineEdit extends EditorAction {
             alias: 'Reject Inline Edit',
             precondition: activeExpr,
             kbOpts: {
-                weight: 100 ,
-                primary: 9 ,
+                weight: KeybindingWeight.EditorContrib,
+                primary: KeyCode.Escape,
                 kbExpr: activeExpr
             },
             menuOpts: [{

package/vscode/src/vs/editor/contrib/inlineEdit/browser/ghostTextWidget.js

@@ -12,6 +12,7 @@ import { Range } from '../../../common/core/range.js';
 import { ILanguageService } from '../../../common/languages/language.js';
 import { InjectedTextCursorStops } from '../../../common/model.js';
 import { LineDecoration } from '../../../common/viewLayout/lineDecorations.js';
+import { InlineDecorationType } from '../../../common/viewModel.js';
 import { AdditionalLinesWidget } from '../../inlineCompletions/browser/ghostTextWidget.js';
 import { ColumnRange, applyObservableDecorations } from '../../inlineCompletions/browser/utils.js';
 const INLINE_EDIT_DESCRIPTION = 'inline-edit';
@@ -51,7 +52,7 @@ let GhostTextWidget = class GhostTextWidget extends Disposable {
                             lastLine.content.length + 1,
                             lastLine.content.length + 1 + lines[0].length,
                             className,
-                            0
+                            InlineDecorationType.Regular
                         )));
                     }
                     lastLine.content += lines[0];
@@ -60,7 +61,7 @@ let GhostTextWidget = class GhostTextWidget extends Disposable {
                 for (const line of lines) {
                     additionalLines.push({
                         content: line,
-                        decorations: className ? [( new LineDecoration(1, line.length + 1, className, 0 ))] : []
+                        decorations: className ? [( new LineDecoration(1, line.length + 1, className, InlineDecorationType.Regular))] : []
                     });
                 }
             }

package/vscode/src/vs/editor/contrib/inlineEdit/browser/hoverParticipant.js

@@ -5,7 +5,9 @@ import '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
 import { constObservable } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
-import { HoverForeignElementAnchor } from '../../hover/browser/hoverTypes.js';
+import { MouseTargetType } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { HoverForeignElementAnchor, HoverAnchorType } from '../../hover/browser/hoverTypes.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { InlineEditController } from './inlineEditController.js';
@@ -17,7 +19,7 @@ class InlineEditHover {
         this.controller = controller;
     }
     isValidForHoverAnchor(anchor) {
-        return (anchor.type === 1
+        return (anchor.type === HoverAnchorType.Range
             && this.range.startColumn <= anchor.range.startColumn
             && this.range.endColumn >= anchor.range.endColumn);
     }
@@ -35,14 +37,14 @@ let InlineEditHoverParticipant = class InlineEditHoverParticipant {
             return null;
         }
         const target = mouseEvent.target;
-        if (target.type === 8 ) {
+        if (target.type === MouseTargetType.CONTENT_VIEW_ZONE) {
             const viewZoneData = target.detail;
             if (controller.shouldShowHoverAtViewZone(viewZoneData.viewZoneId)) {
                 const range = target.range;
                 return ( new HoverForeignElementAnchor(1000, this, range, mouseEvent.event.posx, mouseEvent.event.posy, false));
             }
         }
-        if (target.type === 7 ) {
+        if (target.type === MouseTargetType.CONTENT_EMPTY) {
             if (controller.shouldShowHoverAt(target.range)) {
                 return ( new HoverForeignElementAnchor(
                     1000,
@@ -54,7 +56,7 @@ let InlineEditHoverParticipant = class InlineEditHoverParticipant {
                 ));
             }
         }
-        if (target.type === 6 ) {
+        if (target.type === MouseTargetType.CONTENT_TEXT) {
             const mightBeForeignElement = target.detail.mightBeForeignElement;
             if (mightBeForeignElement && controller.shouldShowHoverAt(target.range)) {
                 return ( new HoverForeignElementAnchor(
@@ -70,7 +72,7 @@ let InlineEditHoverParticipant = class InlineEditHoverParticipant {
         return null;
     }
     computeSync(anchor, lineDecorations) {
-        if (this._editor.getOption(63 ).showToolbar !== 'onHover') {
+        if (this._editor.getOption(EditorOption.inlineEdit).showToolbar !== 'onHover') {
             return [];
         }
         const controller = InlineEditController.get(this._editor);

package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEdit.contribution.js

@@ -1,4 +1,4 @@
-import { registerEditorAction, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { registerEditorAction, registerEditorContribution, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
 import { HoverParticipantRegistry } from '../../hover/browser/hoverTypes.js';
 import { AcceptInlineEdit, RejectInlineEdit, JumpToInlineEdit, JumpBackInlineEdit, TriggerInlineEdit } from './commands.js';
 import { InlineEditHoverParticipant } from './hoverParticipant.js';
@@ -8,5 +8,5 @@ registerEditorAction(RejectInlineEdit);
 registerEditorAction(JumpToInlineEdit);
 registerEditorAction(JumpBackInlineEdit);
 registerEditorAction(TriggerInlineEdit);
-registerEditorContribution(InlineEditController.ID, InlineEditController, 3 );
+registerEditorContribution(InlineEditController.ID, InlineEditController, EditorContributionInstantiation.Eventually);
 HoverParticipantRegistry.register(InlineEditHoverParticipant);

package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditController.js

@@ -19,6 +19,7 @@ import { ILanguageFeaturesService } from '../../../common/services/languageFeatu
 import { GhostText, GhostTextPart } from '../../inlineCompletions/browser/ghostText.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { InlineEditHintsWidget } from './inlineEditHintsWidget.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { createStyleSheet2 } from '../../../../base/browser/dom.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 var InlineEditController_1;
@@ -53,9 +54,9 @@ let InlineEditController = class InlineEditController extends Disposable {
         this._isCursorAtInlineEditContext = InlineEditController_1.cursorAtInlineEditContext.bindTo(this.contextKeyService);
         this._currentEdit = this._register(disposableObservableValue(this, undefined));
         this._isAccepting = observableValue(this, false);
-        this._enabled = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(63 ).enabled);
-        this._fontFamily = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(63 ).fontFamily);
-        this._backgroundColoring = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(63 ).backgroundColoring);
+        this._enabled = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineEdit).enabled);
+        this._fontFamily = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineEdit).fontFamily);
+        this._backgroundColoring = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineEdit).backgroundColoring);
         const modelChangedSignal = observableSignalFromEvent('InlineEditController.modelContentChangedSignal', editor.onDidChangeModelContent);
         this._register(autorun(reader => {
             if (!this._enabled.read(reader)) {
@@ -96,7 +97,7 @@ let InlineEditController = class InlineEditController extends Disposable {
                 return;
             }
             editorBlurSingal.read(reader);
-            if (this._configurationService.getValue('editor.experimentalInlineEdit.keepOnBlur') || editor.getOption(63 ).keepOnBlur) {
+            if (this._configurationService.getValue('editor.experimentalInlineEdit.keepOnBlur') || editor.getOption(EditorOption.inlineEdit).keepOnBlur) {
                 return;
             }
             this._currentRequestCts?.dispose(true);

package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditHintsWidget.js

@@ -10,7 +10,10 @@ import { observableFromEvent } from '../../../../base/common/observableInternal/
 import '../../../../base/common/cancellation.js';
 import { OS } from '../../../../base/common/platform.js';
 import './inlineEditHintsWidget.css.js';
+import { ContentWidgetPositionPreference } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
+import { PositionAffinity } from '../../../common/model.js';
 import { MenuEntryActionViewItem, createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
 import { MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
@@ -28,7 +31,7 @@ let InlineEditHintsWidget = class InlineEditHintsWidget extends Disposable {
         this.editor = editor;
         this.model = model;
         this.instantiationService = instantiationService;
-        this.alwaysShowToolbar = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(63 ).showToolbar === 'always');
+        this.alwaysShowToolbar = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineEdit).showToolbar === 'always');
         this.sessionPosition = undefined;
         this.position = derived(this, reader => {
             const ghostText = this.model.read(reader)?.widget.model.ghostText.read(reader);
@@ -120,8 +123,8 @@ let InlineEditHintsContentWidget = class InlineEditHintsContentWidget extends Di
     getPosition() {
         return {
             position: this._position.get(),
-            preference: [1 , 2 ],
-            positionAffinity: 3 ,
+            preference: [ContentWidgetPositionPreference.ABOVE, ContentWidgetPositionPreference.BELOW],
+            positionAffinity: PositionAffinity.LeftOfInjectedText,
         };
     }
 };

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

@@ -6,12 +6,15 @@ import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle
 import { noBreakWhitespace } from '../../../../base/common/strings.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import './inlineProgressWidget.css.js';
+import { ContentWidgetPositionPreference } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
+import { TrackedRangeStickiness } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 const inlineProgressDecoration = ModelDecorationOptions.register({
     description: 'inline-progress-widget',
-    stickiness: 1 ,
+    stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
     showIfCollapsed: true,
     after: {
         content: noBreakWhitespace,
@@ -41,13 +44,13 @@ class InlineProgressWidget extends Disposable {
         this.domNode.append(iconElement);
         iconElement.classList.add(...ThemeIcon.asClassNameArray(Codicon.loading), 'codicon-modifier-spin');
         const updateSize = () => {
-            const lineHeight = this.editor.getOption(67 );
+            const lineHeight = this.editor.getOption(EditorOption.lineHeight);
             this.domNode.style.height = `${lineHeight}px`;
             this.domNode.style.width = `${Math.ceil(0.8 * lineHeight)}px`;
         };
         updateSize();
         this._register(this.editor.onDidChangeConfiguration(c => {
-            if (c.hasChanged(52 ) || c.hasChanged(67 )) {
+            if (c.hasChanged(EditorOption.fontSize) || c.hasChanged(EditorOption.lineHeight)) {
                 updateSize();
             }
         }));
@@ -64,7 +67,7 @@ class InlineProgressWidget extends Disposable {
     getPosition() {
         return {
             position: { lineNumber: this.range.startLineNumber, column: this.range.startColumn },
-            preference: [0 ]
+            preference: [ContentWidgetPositionPreference.EXACT]
         };
     }
     dispose() {

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

@@ -1,7 +1,10 @@
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { registerEditorAction, EditorAction } from '../../../browser/editorExtensions.js';
+import { CursorChangeReason } from '../../../common/cursorEvents.js';
 import { CursorMoveCommands } from '../../../common/cursor/cursorMoveCommands.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 const _moduleId = "vs/editor/contrib/lineSelection/browser/lineSelection";
 class ExpandLineSelectionAction extends EditorAction {
     constructor() {
@@ -11,9 +14,9 @@ class ExpandLineSelectionAction extends EditorAction {
             alias: 'Expand Line Selection',
             precondition: undefined,
             kbOpts: {
-                weight: 0 ,
+                weight: KeybindingWeight.EditorCore,
                 kbExpr: EditorContextKeys.textInputFocus,
-                primary: 2048  | 42
+                primary: KeyMod$1.CtrlCmd | KeyCode.KeyL
             },
         });
     }
@@ -24,7 +27,7 @@ class ExpandLineSelectionAction extends EditorAction {
         }
         const viewModel = editor._getViewModel();
         viewModel.model.pushStackElement();
-        viewModel.setCursorStates(args.source, 3 , CursorMoveCommands.expandLineSelection(viewModel, viewModel.getCursorStates()));
+        viewModel.setCursorStates(args.source, CursorChangeReason.Explicit, CursorMoveCommands.expandLineSelection(viewModel, viewModel.getCursorStates()));
         viewModel.revealAllCursors(args.source, true);
     }
 }

package/vscode/src/vs/editor/contrib/linesOperations/browser/copyLinesCommand.js

@@ -1,11 +1,11 @@
 import { Range } from '../../../common/core/range.js';
-import { Selection } from '../../../common/core/selection.js';
+import { SelectionDirection, Selection } from '../../../common/core/selection.js';
 class CopyLinesCommand {
     constructor(selection, isCopyingDown, noop) {
         this._selection = selection;
         this._isCopyingDown = isCopyingDown;
         this._noop = noop || false;
-        this._selectionDirection = 0 ;
+        this._selectionDirection = SelectionDirection.LTR;
         this._selectionId = null;
         this._startLineNumberDelta = 0;
         this._endLineNumberDelta = 0;