@codingame/monaco-vscode-api 17.2.0 → 18.0.0

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.js

@@ -17,7 +17,7 @@ import { Context } from '../../../suggest/browser/suggest.js';
 import { showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId, inlineSuggestCommitId, jumpToNextInlineEditId, hideInlineCompletionId, toggleShowCollapsedId } from './commandIds.js';
 import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
 import { InlineCompletionsController } from './inlineCompletionsController.js';
-import { asyncTransaction, transaction } from '../../../../../base/common/observableInternal/base.js';
+import { asyncTransaction, transaction } from '../../../../../base/common/observableInternal/transaction.js';
 import Severity$1 from '../../../../../base/common/severity.js';
 
 class ShowNextInlineSuggestionAction extends EditorAction {
@@ -25,7 +25,7 @@ class ShowNextInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowNextInlineSuggestionAction.ID,
-            label: ( localize2(1234, "Show Next Inline Suggestion")),
+            label: ( localize2(1237, "Show Next Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -46,7 +46,7 @@ class ShowPreviousInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowPreviousInlineSuggestionAction.ID,
-            label: ( localize2(1235, "Show Previous Inline Suggestion")),
+            label: ( localize2(1238, "Show Previous Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -66,7 +66,7 @@ class TriggerInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.trigger',
-            label: ( localize2(1236, "Trigger Inline Suggestion")),
+            label: ( localize2(1239, "Trigger Inline Suggestion")),
             precondition: EditorContextKeys.writable
         });
     }
@@ -82,7 +82,7 @@ class ExplicitTriggerInlineEditAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.triggerInlineEditExplicit',
-            label: ( localize2(1237, "Trigger Next Edit Suggestion")),
+            label: ( localize2(1240, "Trigger Next Edit Suggestion")),
             precondition: EditorContextKeys.writable,
         });
     }
@@ -93,7 +93,7 @@ class ExplicitTriggerInlineEditAction extends EditorAction {
         if (!controller?.model.get()?.inlineEditAvailable.get()) {
             notificationService.notify({
                 severity: Severity$1.Info,
-                message: ( localize(1238, "No inline edit is available."))
+                message: ( localize(1241, "No inline edit is available."))
             });
         }
     }
@@ -114,7 +114,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextWord',
-            label: ( localize2(1239, "Accept Next Word Of Inline Suggestion")),
+            label: ( localize2(1242, "Accept Next Word Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -130,7 +130,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1240, 'Accept Word')),
+                    title: ( localize(1243, 'Accept Word')),
                     group: 'primary',
                     order: 2,
                 }],
@@ -145,7 +145,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextLine',
-            label: ( localize2(1241, "Accept Next Line Of Inline Suggestion")),
+            label: ( localize2(1244, "Accept Next Line Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -155,7 +155,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1242, 'Accept Line')),
+                    title: ( localize(1245, 'Accept Line')),
                     group: 'secondary',
                     order: 2,
                 }],
@@ -170,19 +170,19 @@ class AcceptInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: inlineSuggestCommitId,
-            label: ( localize2(1243, "Accept Inline Suggestion")),
+            label: ( localize2(1246, "Accept Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
             )),
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1244, "Accept")),
+                    title: ( localize(1247, "Accept")),
                     group: 'primary',
                     order: 2,
                 }, {
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1244, "Accept")),
+                    title: ( localize(1247, "Accept")),
                     group: 'primary',
                     order: 2,
                 }],
@@ -213,11 +213,11 @@ class JumpToNextInlineEdit extends EditorAction {
     constructor() {
         super({
             id: jumpToNextInlineEditId,
-            label: ( localize2(1245, "Jump to next inline edit")),
+            label: ( localize2(1248, "Jump to next inline edit")),
             precondition: InlineCompletionContextKeys.inlineEditVisible,
             menuOpts: [{
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1246, "Jump")),
+                    title: ( localize(1249, "Jump")),
                     group: 'primary',
                     order: 1,
                     when: ( InlineCompletionContextKeys.cursorAtInlineEdit.toNegated()),
@@ -241,7 +241,7 @@ class HideInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: HideInlineCompletion.ID,
-            label: ( localize2(1247, "Hide Inline Suggestion")),
+            label: ( localize2(1250, "Hide Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
@@ -252,7 +252,7 @@ class HideInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1248, "Reject")),
+                    title: ( localize(1251, "Reject")),
                     group: 'primary',
                     order: 3,
                 }]
@@ -271,7 +271,7 @@ class ToggleInlineCompletionShowCollapsed extends EditorAction {
     constructor() {
         super({
             id: ToggleInlineCompletionShowCollapsed.ID,
-            label: ( localize2(1249, "Toggle Inline Suggestions Show Collapsed")),
+            label: ( localize2(1252, "Toggle Inline Suggestions Show Collapsed")),
             precondition: ContextKeyExpr.true(),
         });
     }
@@ -293,7 +293,7 @@ class ToggleAlwaysShowInlineSuggestionToolbar extends Action2 {
     constructor() {
         super({
             id: ToggleAlwaysShowInlineSuggestionToolbar.ID,
-            title: ( localize(1250, "Always Show Toolbar")),
+            title: ( localize(1253, "Always Show Toolbar")),
             f1: false,
             precondition: undefined,
             menu: [{
@@ -315,7 +315,7 @@ class DevExtractReproSample extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.dev.extractRepro',
-            label: ( localize(1251, "Developer: Extract Inline Suggest State")),
+            label: ( localize(1254, "Developer: Extract Inline Suggest State")),
             alias: 'Developer: Inline Suggest Extract Repro',
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineEditVisible,

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.js

@@ -3,23 +3,23 @@ import { RawContextKey } from '../../../../../platform/contextkey/common/context
 import { localize } from '../../../../../nls.js';
 
 class InlineCompletionContextKeys {
-    static { this.inlineSuggestionVisible = ( new RawContextKey('inlineSuggestionVisible', false, ( localize(1252, "Whether an inline suggestion is visible")))); }
-    static { this.inlineSuggestionHasIndentation = ( new RawContextKey('inlineSuggestionHasIndentation', false, ( localize(1253, "Whether the inline suggestion starts with whitespace")))); }
+    static { this.inlineSuggestionVisible = ( new RawContextKey('inlineSuggestionVisible', false, ( localize(1255, "Whether an inline suggestion is visible")))); }
+    static { this.inlineSuggestionHasIndentation = ( new RawContextKey('inlineSuggestionHasIndentation', false, ( localize(1256, "Whether the inline suggestion starts with whitespace")))); }
     static { this.inlineSuggestionHasIndentationLessThanTabSize = ( new RawContextKey('inlineSuggestionHasIndentationLessThanTabSize', true, ( localize(
-     1254,
+     1257,
      "Whether the inline suggestion starts with whitespace that is less than what would be inserted by tab"
     )))); }
     static { this.suppressSuggestions = ( new RawContextKey('inlineSuggestionSuppressSuggestions', undefined, ( localize(
-     1255,
+     1258,
      "Whether suggestions should be suppressed for the current suggestion"
     )))); }
-    static { this.cursorInIndentation = ( new RawContextKey('cursorInIndentation', false, ( localize(1256, "Whether the cursor is in indentation")))); }
-    static { this.hasSelection = ( new RawContextKey('editor.hasSelection', false, ( localize(1257, "Whether the editor has a selection")))); }
-    static { this.cursorAtInlineEdit = ( new RawContextKey('cursorAtInlineEdit', false, ( localize(1258, "Whether the cursor is at an inline edit")))); }
-    static { this.inlineEditVisible = ( new RawContextKey('inlineEditIsVisible', false, ( localize(1259, "Whether an inline edit is visible")))); }
-    static { this.tabShouldJumpToInlineEdit = ( new RawContextKey('tabShouldJumpToInlineEdit', false, ( localize(1260, "Whether tab should jump to an inline edit.")))); }
-    static { this.tabShouldAcceptInlineEdit = ( new RawContextKey('tabShouldAcceptInlineEdit', false, ( localize(1261, "Whether tab should accept the inline edit.")))); }
-    static { this.inInlineEditsPreviewEditor = ( new RawContextKey('inInlineEditsPreviewEditor', true, ( localize(1262, "Whether the current code editor is showing an inline edits preview")))); }
+    static { this.cursorInIndentation = ( new RawContextKey('cursorInIndentation', false, ( localize(1259, "Whether the cursor is in indentation")))); }
+    static { this.hasSelection = ( new RawContextKey('editor.hasSelection', false, ( localize(1260, "Whether the editor has a selection")))); }
+    static { this.cursorAtInlineEdit = ( new RawContextKey('cursorAtInlineEdit', false, ( localize(1261, "Whether the cursor is at an inline edit")))); }
+    static { this.inlineEditVisible = ( new RawContextKey('inlineEditIsVisible', false, ( localize(1262, "Whether an inline edit is visible")))); }
+    static { this.tabShouldJumpToInlineEdit = ( new RawContextKey('tabShouldJumpToInlineEdit', false, ( localize(1263, "Whether tab should jump to an inline edit.")))); }
+    static { this.tabShouldAcceptInlineEdit = ( new RawContextKey('tabShouldAcceptInlineEdit', false, ( localize(1264, "Whether tab should accept the inline edit.")))); }
+    static { this.inInlineEditsPreviewEditor = ( new RawContextKey('inInlineEditsPreviewEditor', true, ( localize(1265, "Whether the current code editor is showing an inline edits preview")))); }
 }
 
 export { InlineCompletionContextKeys };

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js

@@ -33,11 +33,15 @@ import { ObservableContextKeyService } from '../utils.js';
 import { InlineCompletionsView } from '../view/inlineCompletionsView.js';
 import { inlineSuggestCommitId } from './commandIds.js';
 import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
-import { observableFromEvent, observableSignal, runOnChange, derivedObservableWithCache, runOnChangeWithStore } from '../../../../../base/common/observableInternal/utils.js';
-import { derived, derivedDisposable } from '../../../../../base/common/observableInternal/derived.js';
-import { observableValue, transaction } from '../../../../../base/common/observableInternal/base.js';
-import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
-import { waitForState } from '../../../../../base/common/observableInternal/utilsCancellation.js';
+import { runOnChange, runOnChangeWithStore } from '../../../../../base/common/observableInternal/utils/runOnChange.js';
+import { derived, derivedDisposable } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
+import { observableSignal } from '../../../../../base/common/observableInternal/observables/observableSignal.js';
+import { autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
+import { transaction } from '../../../../../base/common/observableInternal/transaction.js';
+import { waitForState } from '../../../../../base/common/observableInternal/utils/utilsCancellation.js';
+import { derivedObservableWithCache } from '../../../../../base/common/observableInternal/utils/utils.js';
 
 var InlineCompletionsController_1;
 let InlineCompletionsController = class InlineCompletionsController extends Disposable {
@@ -274,7 +278,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         let hint;
         if (!accessibleViewShowing && accessibleViewKeybinding && this.editor.getOption(EditorOption.inlineCompletionsAccessibilityVerbose)) {
             hint = ( localize(
-                1263,
+                1266,
                 "Inspect this in the accessible view ({0})",
                 accessibleViewKeybinding.getAriaLabel()
             ));

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.js

@@ -18,8 +18,8 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { IOpenerService } from '../../../../../platform/opener/common/opener.service.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
 import { GhostTextView } from '../view/ghostText/ghostTextView.js';
-import { autorunWithStore, autorun } from '../../../../../base/common/observableInternal/autorun.js';
-import { constObservable } from '../../../../../base/common/observableInternal/utils.js';
+import { autorunWithStore, autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
+import { constObservable } from '../../../../../base/common/observableInternal/observables/constObservable.js';
 
 class InlineCompletionsHover {
     constructor(owner, range, controller) {
@@ -130,7 +130,7 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(1264, 'There are inline completions here');
+        return localize(1267, 'There are inline completions here');
     }
     renderScreenReaderText(context, part) {
         const disposables = ( new DisposableStore());
@@ -139,7 +139,7 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
         const hoverContentsElement = append(markdownHoverElement, $$1('div.hover-contents', { ['aria-live']: 'assertive' }));
         const renderer = ( new MarkdownRenderer({ editor: this._editor }, this._languageService, this._openerService));
         const render = (code) => {
-            const inlineSuggestionAvailable = ( localize(1265, "Suggestion:"));
+            const inlineSuggestionAvailable = ( localize(1268, "Suggestion:"));
             const renderedContents = disposables.add(renderer.render(( new MarkdownString()).appendText(inlineSuggestionAvailable).appendCodeblock('text', code), {
                 asyncRenderCallback: () => {
                     hoverContentsElement.className = 'hover-contents code-hover-contents';

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.d.ts

@@ -41,8 +41,8 @@ export declare class InlineSuggestionHintsContentWidget extends Disposable imple
     static get dropDownVisible(): boolean;
     private static id;
     private readonly id;
-    readonly allowEditorOverflow = true;
-    readonly suppressMouseDown = false;
+    readonly allowEditorOverflow: boolean;
+    readonly suppressMouseDown: boolean;
     private readonly _warningMessageContentNode;
     private readonly _warningMessageNode;
     private readonly nodes;

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

@@ -34,9 +34,10 @@ import { PositionAffinity } from '../../../../common/model.js';
 import { showPreviousInlineSuggestionActionId, showNextInlineSuggestionActionId } from '../controller/commandIds.js';
 import * as inlineCompletionsHintsWidget from './inlineCompletionsHintsWidget.css';
 import { n } from '../../../../../base/browser/domImpl/n.js';
-import { autorunWithStore, autorun } from '../../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent, derivedObservableWithCache } from '../../../../../base/common/observableInternal/utils.js';
-import { derived, derivedWithStore } from '../../../../../base/common/observableInternal/derived.js';
+import { autorunWithStore, autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
+import { derivedObservableWithCache } from '../../../../../base/common/observableInternal/utils/utils.js';
+import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 
 var InlineSuggestionHintsContentWidget_1;
 registerCss(inlineCompletionsHintsWidget);
@@ -70,11 +71,11 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
             if (!model || !this.alwaysShowToolbar.read(reader)) {
                 return;
             }
-            const contentWidgetValue = derivedWithStore((reader, store) => {
-                const contentWidget = store.add(this.instantiationService.createInstance(InlineSuggestionHintsContentWidget.hot.read(reader), this.editor, true, this.position, model.selectedInlineCompletionIndex, model.inlineCompletionsCount, model.activeCommands, model.warning, () => { }));
+            const contentWidgetValue = derived((reader) => {
+                const contentWidget = reader.store.add(this.instantiationService.createInstance(InlineSuggestionHintsContentWidget.hot.read(reader), this.editor, true, this.position, model.selectedInlineCompletionIndex, model.inlineCompletionsCount, model.activeCommands, model.warning, () => { }));
                 editor.addContentWidget(contentWidget);
-                store.add(toDisposable(() => editor.removeContentWidget(contentWidget)));
-                store.add(autorun(reader => {
+                reader.store.add(toDisposable(() => editor.removeContentWidget(contentWidget)));
+                reader.store.add(autorun(reader => {
                     const position = this.position.read(reader);
                     if (!position) {
                         return;
@@ -97,8 +98,8 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
 InlineCompletionsHintsWidget = ( __decorate([
     ( __param(2, IInstantiationService))
 ], InlineCompletionsHintsWidget));
-const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localize(1266, 'Icon for show next parameter hint.')));
-const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localize(1267, 'Icon for show previous parameter hint.')));
+const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localize(1269, 'Icon for show next parameter hint.')));
+const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localize(1270, 'Icon for show previous parameter hint.')));
 let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidget extends Disposable {
     static { InlineSuggestionHintsContentWidget_1 = this; }
     static { this.hot = createHotClass(InlineSuggestionHintsContentWidget_1); }
@@ -116,7 +117,7 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
         const kb = this.keybindingService.lookupKeybinding(commandId, this._contextKeyService);
         let tooltip = label;
         if (kb) {
-            tooltip = ( localize(1268, '{0} ({1})', label, kb.getLabel()));
+            tooltip = ( localize(1271, '{0} ({1})', label, kb.getLabel()));
         }
         action.tooltip = tooltip;
         return action;
@@ -138,7 +139,7 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
         this.id = `InlineSuggestionHintsContentWidget${InlineSuggestionHintsContentWidget_1.id++}`;
         this.allowEditorOverflow = true;
         this.suppressMouseDown = false;
-        this._warningMessageContentNode = derivedWithStore((reader, store) => {
+        this._warningMessageContentNode = derived((reader) => {
             const warning = this._warning.read(reader);
             if (!warning) {
                 return undefined;
@@ -146,7 +147,7 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
             if (typeof warning.message === 'string') {
                 return warning.message;
             }
-            const markdownElement = store.add(renderMarkdown(warning.message));
+            const markdownElement = reader.store.add(renderMarkdown(warning.message));
             return markdownElement.element;
         });
         this._warningMessageNode = n.div({
@@ -164,9 +165,9 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
             this._warningMessageNode.element,
             h('div@toolBar'),
         ]);
-        this.previousAction = this._register(this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1269, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon)));
+        this.previousAction = this._register(this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1272, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon)));
         this.availableSuggestionCountAction = this._register(( new Action('inlineSuggestionHints.availableSuggestionCount', '', undefined, false)));
-        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1270, 'Next')), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
+        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1273, 'Next')), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
         this.inlineCompletionsActionsMenus = this._register(this._menuService.createMenu(MenuId.InlineCompletionsActions, this._contextKeyService));
         this.clearAvailableSuggestionCountLabelDebounced = this._register(( new RunOnceScheduler(() => {
             this.availableSuggestionCountAction.label = '';

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

@@ -6,8 +6,8 @@ import { InlineCompletionsController } from './controller/inlineCompletionsContr
 import { AccessibleViewType, AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { TextEdit } from '../../../common/core/textEdit.js';
-import { LineEdit } from '../../../common/core/lineEdit.js';
+import { TextEdit } from '../../../common/core/edits/textEdit.js';
+import { LineEdit } from '../../../common/core/edits/lineEdit.js';
 import { TextModelText } from '../../../common/model/textModelText.js';
 
 class InlineCompletionsAccessibleView {

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/animation.js

@@ -1,8 +1,8 @@
 
 import { getActiveWindow } from '../../../../../base/browser/dom.js';
 import '../../../../../base/common/observableInternal/index.js';
-import { observableValue } from '../../../../../base/common/observableInternal/base.js';
-import { observableSignal } from '../../../../../base/common/observableInternal/utils.js';
+import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
+import { observableSignal } from '../../../../../base/common/observableInternal/observables/observableSignal.js';
 
 class AnimatedValue {
     static const(value) {

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/changeRecorder.d.ts

@@ -10,10 +10,6 @@ export interface ITextModelChangeRecorderMetadata {
 export declare class TextModelChangeRecorder extends Disposable {
     private readonly _editor;
     private readonly _instantiationService;
-    private static _nextMetadataId;
-    private static _metaDataMap;
-    static editWithMetadata<T>(metadata: ITextModelChangeRecorderMetadata, cb: () => T): T;
-    private static _getCurrentMetadata;
     private readonly _structuredLogger;
     constructor(_editor: ICodeEditor, _instantiationService: IInstantiationService);
 }

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/changeRecorder.js

@@ -4,32 +4,11 @@ import { Disposable } from '../../../../../base/common/lifecycle.js';
 import '../../../../../base/common/observableInternal/index.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { CodeEditorWidget } from '../../../../browser/widget/codeEditor/codeEditorWidget.js';
+import { TextModelEditReason } from '../../../../common/textModelEditReason.js';
 import { StructuredLogger } from '../structuredLogger.js';
-import { autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
+import { autorunWithStore } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 
-var TextModelChangeRecorder_1;
 let TextModelChangeRecorder = class TextModelChangeRecorder extends Disposable {
-    static { TextModelChangeRecorder_1 = this; }
-    static { this._nextMetadataId = 0; }
-    static { this._metaDataMap = ( new Map()); }
-    static editWithMetadata(metadata, cb) {
-        const id = this._nextMetadataId++;
-        this._metaDataMap.set(id, metadata);
-        try {
-            const result = cb();
-            return result;
-        }
-        finally {
-            this._metaDataMap.delete(id);
-        }
-    }
-    static _getCurrentMetadata() {
-        const result = {};
-        for (const metadata of ( this._metaDataMap.values())) {
-            Object.assign(result, metadata);
-        }
-        return result;
-    }
     constructor(_editor, _instantiationService) {
         super();
         this._editor = _editor;
@@ -53,7 +32,7 @@ let TextModelChangeRecorder = class TextModelChangeRecorder extends Disposable {
                 if (!tm) {
                     return;
                 }
-                const metadata = TextModelChangeRecorder_1._getCurrentMetadata();
+                const metadata = TextModelEditReason._getCurrentMetadata();
                 if (sources.length === 0 && metadata.source) {
                     sources.push(metadata.source);
                 }
@@ -63,7 +42,7 @@ let TextModelChangeRecorder = class TextModelChangeRecorder extends Disposable {
                         sourceId: 'TextModel.setChangeReason',
                         source: source,
                         time: Date.now(),
-                        modelUri: ( tm.uri.toString()),
+                        modelUri: tm.uri,
                         modelVersion: tm.getVersionId(),
                     };
                     setTimeout(() => {
@@ -75,7 +54,7 @@ let TextModelChangeRecorder = class TextModelChangeRecorder extends Disposable {
         }));
     }
 };
-TextModelChangeRecorder = TextModelChangeRecorder_1 = ( __decorate([
+TextModelChangeRecorder = ( __decorate([
     ( __param(1, IInstantiationService))
 ], TextModelChangeRecorder));
 

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/computeGhostText.d.ts

@@ -1,7 +1,7 @@
 import { IDiffChange } from "../../../../../base/common/diff/diff.js";
 import { Position } from "../../../../common/core/position.js";
-import { SingleTextEdit } from "../../../../common/core/textEdit.js";
+import { TextReplacement } from "../../../../common/core/edits/textEdit.js";
 import { ITextModel } from "../../../../common/model.js";
 import { GhostText } from "./ghostText.js";
-export declare function computeGhostText(edit: SingleTextEdit, model: ITextModel, mode: "prefix" | "subword" | "subwordSmart", cursorPosition?: Position, previewSuffixLength?: number): GhostText | undefined;
+export declare function computeGhostText(edit: TextReplacement, model: ITextModel, mode: "prefix" | "subword" | "subwordSmart", cursorPosition?: Position, previewSuffixLength?: number): GhostText | undefined;
 export declare function smartDiff(originalValue: string, newValue: string, smartBracketMatching: boolean): (readonly IDiffChange[]) | undefined;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/computeGhostText.js

@@ -2,7 +2,7 @@
 import { LcsDiff } from '../../../../../base/common/diff/diff.js';
 import { getLeadingWhitespace } from '../../../../../base/common/strings.js';
 import { Range } from '../../../../common/core/range.js';
-import { SingleTextEdit } from '../../../../common/core/textEdit.js';
+import { TextReplacement } from '../../../../common/core/edits/textEdit.js';
 import { GhostTextPart, GhostText } from './ghostText.js';
 import { singleTextRemoveCommonPrefix } from './singleTextEditHelpers.js';
 
@@ -25,7 +25,7 @@ function computeGhostText(edit, model, mode, cursorPosition, previewSuffixLength
         const suggestionWithoutIndentationChange = e.text.startsWith(replacedIndentation)
             ? e.text.substring(replacedIndentation.length)
             : e.text.substring(suggestionAddedIndentationLength);
-        e = ( new SingleTextEdit(rangeThatDoesNotReplaceIndentation, suggestionWithoutIndentationChange));
+        e = ( new TextReplacement(rangeThatDoesNotReplaceIndentation, suggestionWithoutIndentationChange));
     }
     const valueToBeReplaced = model.getValueInRange(e.range);
     const changes = cachingDiff(valueToBeReplaced, e.text);

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/ghostText.d.ts

@@ -1,6 +1,6 @@
 import { LineDecoration } from "../../../../common/viewLayout/lineDecorations.js";
 import { InlineDecoration } from "../../../../common/viewModel.js";
-import { ColumnRange } from "../../../../common/core/columnRange.js";
+import { ColumnRange } from "../../../../common/core/ranges/columnRange.js";
 export declare class GhostText {
     readonly lineNumber: number;
     readonly parts: GhostTextPart[];

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/ghostText.js

@@ -3,7 +3,7 @@ import { equals } from '../../../../../base/common/arrays.js';
 import { splitLines } from '../../../../../base/common/strings.js';
 import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
-import { TextEdit, SingleTextEdit } from '../../../../common/core/textEdit.js';
+import { TextEdit, TextReplacement } from '../../../../common/core/edits/textEdit.js';
 import { LineDecoration } from '../../../../common/viewLayout/lineDecorations.js';
 
 class GhostText {
@@ -18,7 +18,7 @@ class GhostText {
     }
     render(documentText, debug = false) {
         return ( new TextEdit([
-            ...( this.parts.map(p => ( new SingleTextEdit(Range.fromPositions(( new Position(this.lineNumber, p.column))), debug ? `[${( p.lines.map(line => line.line)).join('\n')}]` : ( p.lines.map(line => line.line)).join('\n'))))),
+            ...( this.parts.map(p => ( new TextReplacement(Range.fromPositions(( new Position(this.lineNumber, p.column))), debug ? `[${( p.lines.map(line => line.line)).join('\n')}]` : ( p.lines.map(line => line.line)).join('\n'))))),
         ])).applyToString(documentText);
     }
     renderForScreenReader(lineText) {
@@ -28,7 +28,7 @@ class GhostText {
         const lastPart = this.parts[this.parts.length - 1];
         const cappedLineText = lineText.substr(0, lastPart.column - 1);
         const text = ( new TextEdit([
-            ...( this.parts.map(p => ( new SingleTextEdit(Range.fromPositions(( new Position(1, p.column))), ( p.lines.map(line => line.line)).join('\n'))))),
+            ...( this.parts.map(p => ( new TextReplacement(Range.fromPositions(( new Position(1, p.column))), ( p.lines.map(line => line.line)).join('\n'))))),
         ])).applyToString(cappedLineText);
         return text.substring(this.parts[0].column - 1);
     }
@@ -76,8 +76,8 @@ class GhostTextReplacement {
         const replaceRange = this.columnRange.toRange(this.lineNumber);
         if (debug) {
             return ( new TextEdit([
-                ( new SingleTextEdit(Range.fromPositions(replaceRange.getStartPosition()), '(')),
-                ( new SingleTextEdit(
+                ( new TextReplacement(Range.fromPositions(replaceRange.getStartPosition()), '(')),
+                ( new TextReplacement(
                     Range.fromPositions(replaceRange.getEndPosition()),
                     `)[${this.newLines.join('\n')}]`
                 )),
@@ -85,7 +85,7 @@ class GhostTextReplacement {
         }
         else {
             return ( new TextEdit([
-                ( new SingleTextEdit(replaceRange, this.newLines.join('\n'))),
+                ( new TextReplacement(replaceRange, this.newLines.join('\n'))),
             ])).applyToString(documentText);
         }
     }