@codingame/monaco-vscode-api 17.2.1 → 18.0.0

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsCustomView.js

@@ -18,21 +18,21 @@ import '../../../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../../../platform/theme/common/colors/searchColors.js';
 import { IThemeService } from '../../../../../../../platform/theme/common/themeService.service.js';
 import { observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
-import { Rect } from '../../../../../../browser/rect.js';
+import { Rect } from '../../../../../../common/core/2d/rect.js';
 import { renderLines, LineSource, RenderOptions } from '../../../../../../browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
-import { LineRange } from '../../../../../../common/core/lineRange.js';
+import { LineRange } from '../../../../../../common/core/ranges/lineRange.js';
 import { ILanguageService } from '../../../../../../common/languages/language.service.js';
 import { LineTokens } from '../../../../../../common/tokens/lineTokens.js';
 import { TokenArray } from '../../../../../../common/tokens/tokenArray.js';
 import { InlineEditTabAction } from '../inlineEditsViewInterface.js';
 import { inlineEditIndicatorsuccessfulBackground, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorSecondaryBackground, getEditorBlendedColor } from '../theme.js';
 import { maxContentWidthInRange, rectToProps } from '../utils/utils.js';
-import { observableValue } from '../../../../../../../base/common/observableInternal/base.js';
+import { observableValue } from '../../../../../../../base/common/observableInternal/observables/observableValue.js';
 import { n } from '../../../../../../../base/browser/domImpl/n.js';
-import { constObservable } from '../../../../../../../base/common/observableInternal/utils.js';
-import { autorun } from '../../../../../../../base/common/observableInternal/autorun.js';
-import { derived } from '../../../../../../../base/common/observableInternal/derived.js';
+import { constObservable } from '../../../../../../../base/common/observableInternal/observables/constObservable.js';
+import { autorun } from '../../../../../../../base/common/observableInternal/reactions/autorun.js';
+import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
 
 let InlineEditsCustomView = class InlineEditsCustomView extends Disposable {
     constructor(_editor, displayLocation, tabAction, themeService, _languageService) {

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.d.ts

@@ -2,7 +2,7 @@ import { IMouseEvent } from "../../../../../../../base/browser/mouseEvent.js";
 import { Disposable } from "../../../../../../../base/common/lifecycle.js";
 import { IObservable } from "../../../../../../../base/common/observable.js";
 import { ICodeEditor } from "../../../../../../browser/editorBrowser.js";
-import { LineRange } from "../../../../../../common/core/lineRange.js";
+import { LineRange } from "../../../../../../common/core/ranges/lineRange.js";
 import { Range } from "../../../../../../common/core/range.js";
 import { IInlineEditsView, InlineEditTabAction } from "../inlineEditsViewInterface.js";
 import { InlineEditWithChanges } from "../inlineEditWithChanges.js";

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.js

@@ -15,14 +15,15 @@ import '../../../../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../../../platform/theme/common/colors/searchColors.js';
 import { observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
-import { Rect } from '../../../../../../browser/rect.js';
+import { Rect } from '../../../../../../common/core/2d/rect.js';
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
-import { OffsetRange } from '../../../../../../common/core/offsetRange.js';
+import { OffsetRange } from '../../../../../../common/core/ranges/offsetRange.js';
 import { Position } from '../../../../../../common/core/position.js';
 import { originalBackgroundColor, getOriginalBorderColor } from '../theme.js';
 import { maxContentWidthInRange, getPrefixTrim, mapOutFalsy } from '../utils/utils.js';
-import { derived } from '../../../../../../../base/common/observableInternal/derived.js';
-import { constObservable, derivedObservableWithCache } from '../../../../../../../base/common/observableInternal/utils.js';
+import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
+import { constObservable } from '../../../../../../../base/common/observableInternal/observables/constObservable.js';
+import { derivedObservableWithCache } from '../../../../../../../base/common/observableInternal/utils/utils.js';
 import { n } from '../../../../../../../base/browser/domImpl/n.js';
 
 const HORIZONTAL_PADDING = 0;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.d.ts

@@ -3,7 +3,7 @@ import { Disposable } from "../../../../../../../base/common/lifecycle.js";
 import { IObservable } from "../../../../../../../base/common/observable.js";
 import { IInstantiationService } from "../../../../../../../platform/instantiation/common/instantiation.js";
 import { ICodeEditor } from "../../../../../../browser/editorBrowser.js";
-import { LineRange } from "../../../../../../common/core/lineRange.js";
+import { LineRange } from "../../../../../../common/core/ranges/lineRange.js";
 import { ILanguageService } from "../../../../../../common/languages/language.service.js";
 import { GhostTextView } from "../../ghostText/ghostTextView.js";
 import { IInlineEditsView, InlineEditTabAction } from "../inlineEditsViewInterface.js";

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.js

@@ -17,11 +17,11 @@ import '../../../../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../../../platform/theme/common/colors/searchColors.js';
 import { observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
-import { Rect } from '../../../../../../browser/rect.js';
+import { Rect } from '../../../../../../common/core/2d/rect.js';
 import { RenderOptions, renderLines, LineSource } from '../../../../../../browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
-import { LineRange } from '../../../../../../common/core/lineRange.js';
-import { OffsetRange } from '../../../../../../common/core/offsetRange.js';
+import { LineRange } from '../../../../../../common/core/ranges/lineRange.js';
+import { OffsetRange } from '../../../../../../common/core/ranges/offsetRange.js';
 import { Position } from '../../../../../../common/core/position.js';
 import { Range } from '../../../../../../common/core/range.js';
 import { ILanguageService } from '../../../../../../common/languages/language.service.js';
@@ -32,10 +32,10 @@ import { GhostText, GhostTextPart } from '../../../model/ghostText.js';
 import { GhostTextView } from '../../ghostText/ghostTextView.js';
 import { modifiedBackgroundColor, getModifiedBorderColor } from '../theme.js';
 import { getPrefixTrim, mapOutFalsy } from '../utils/utils.js';
-import { derived, derivedWithStore } from '../../../../../../../base/common/observableInternal/derived.js';
+import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
+import { observableValue } from '../../../../../../../base/common/observableInternal/observables/observableValue.js';
 import { n } from '../../../../../../../base/browser/domImpl/n.js';
-import { constObservable } from '../../../../../../../base/common/observableInternal/utils.js';
-import { observableValue } from '../../../../../../../base/common/observableInternal/base.js';
+import { constObservable } from '../../../../../../../base/common/observableInternal/observables/constObservable.js';
 
 const BORDER_WIDTH = 1;
 const WIDGET_SEPARATOR_WIDTH = 1;
@@ -146,13 +146,13 @@ let InlineEditsInsertionView = class InlineEditsInsertionView extends Disposable
                 s.lineNumber,
                 Math.min(s.lineNumber + 2, this._editor.getModel().getLineCount() + 1)
             )) : undefined));
-        this._overlayLayout = derivedWithStore(this, (reader, store) => {
+        this._overlayLayout = derived(this, (reader) => {
             this._ghostText.read(reader);
             const state = this._state.read(reader);
             if (!state) {
                 return null;
             }
-            this._editorObs.observePosition(observableValue(this, ( new Position(state.lineNumber, state.column))), store).read(reader);
+            this._editorObs.observePosition(observableValue(this, ( new Position(state.lineNumber, state.column))), reader.store).read(reader);
             const editorLayout = this._editorObs.layoutInfo.read(reader);
             const horizontalScrollOffset = this._editorObs.scrollLeft.read(reader);
             const verticalScrollbarWidth = this._editorObs.layoutInfoVerticalScrollbarWidth.read(reader);

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.d.ts

@@ -3,7 +3,7 @@ import { Disposable } from "../../../../../../../base/common/lifecycle.js";
 import { IObservable } from "../../../../../../../base/common/observable.js";
 import { IThemeService } from "../../../../../../../platform/theme/common/themeService.service.js";
 import { ObservableCodeEditor } from "../../../../../../browser/observableCodeEditor.js";
-import { LineRange } from "../../../../../../common/core/lineRange.js";
+import { LineRange } from "../../../../../../common/core/ranges/lineRange.js";
 import { Range } from "../../../../../../common/core/range.js";
 import { ILanguageService } from "../../../../../../common/languages/language.service.js";
 import { IInlineEditsView, InlineEditTabAction } from "../inlineEditsViewInterface.js";

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.js

@@ -18,11 +18,11 @@ import '../../../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../../../platform/theme/common/colors/searchColors.js';
 import { IThemeService } from '../../../../../../../platform/theme/common/themeService.service.js';
 import { EditorMouseEvent } from '../../../../../../browser/editorDom.js';
-import { Point } from '../../../../../../browser/point.js';
-import { Rect } from '../../../../../../browser/rect.js';
+import { Point } from '../../../../../../common/core/2d/point.js';
+import { Rect } from '../../../../../../common/core/2d/rect.js';
 import { renderLines, LineSource, RenderOptions } from '../../../../../../browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
-import { OffsetRange } from '../../../../../../common/core/offsetRange.js';
+import { OffsetRange } from '../../../../../../common/core/ranges/offsetRange.js';
 import { Range } from '../../../../../../common/core/range.js';
 import { ILanguageService } from '../../../../../../common/languages/language.service.js';
 import { TrackedRangeStickiness } from '../../../../../../common/model.js';
@@ -30,11 +30,11 @@ import { LineTokens } from '../../../../../../common/tokens/lineTokens.js';
 import { TokenArray } from '../../../../../../common/tokens/tokenArray.js';
 import { InlineDecoration, InlineDecorationType } from '../../../../../../common/viewModel.js';
 import { getModifiedBorderColor, getOriginalBorderColor, originalBackgroundColor, getEditorBlendedColor, modifiedChangedLineBackgroundColor } from '../theme.js';
-import { getPrefixTrim, mapOutFalsy, rectToProps } from '../utils/utils.js';
-import { autorunDelta, autorun } from '../../../../../../../base/common/observableInternal/autorun.js';
-import { derived } from '../../../../../../../base/common/observableInternal/derived.js';
+import { getPrefixTrim, mapOutFalsy, rectToProps, getEditorValidOverlayRect } from '../utils/utils.js';
+import { autorunDelta, autorun } from '../../../../../../../base/common/observableInternal/reactions/autorun.js';
+import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
 import { n } from '../../../../../../../base/browser/domImpl/n.js';
-import { constObservable } from '../../../../../../../base/common/observableInternal/utils.js';
+import { constObservable } from '../../../../../../../base/common/observableInternal/observables/constObservable.js';
 
 let InlineEditsLineReplacementView = class InlineEditsLineReplacementView extends Disposable {
     constructor(_editor, _edit, _tabAction, _languageService, _themeService) {
@@ -164,8 +164,6 @@ let InlineEditsLineReplacementView = class InlineEditsLineReplacementView extend
                 }
                 const layoutProps = layout.read(reader);
                 const contentLeft = this._editor.layoutInfoContentLeft.read(reader);
-                const contentWidth = this._editor.contentWidth.read(reader);
-                const contentHeight = this._editor.editor.getContentHeight();
                 const lineHeight = this._editor.getOption(EditorOption.lineHeight).read(reader);
                 modifiedLineElements.lines.forEach(l => {
                     l.style.width = `${layoutProps.lowerText.width}px`;
@@ -178,10 +176,7 @@ let InlineEditsLineReplacementView = class InlineEditsLineReplacementView extend
                     n.div({
                         style: {
                             position: 'absolute',
-                            top: 0,
-                            left: contentLeft,
-                            width: contentWidth,
-                            height: contentHeight,
+                            ...rectToProps((r) => getEditorValidOverlayRect(this._editor).read(r)),
                             overflow: 'hidden',
                             pointerEvents: 'none',
                         }

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsSideBySideView.js

@@ -20,20 +20,22 @@ import '../../../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../../../platform/theme/common/colors/searchColors.js';
 import { IThemeService } from '../../../../../../../platform/theme/common/themeService.service.js';
 import { observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
-import { Rect } from '../../../../../../browser/rect.js';
+import { Rect } from '../../../../../../common/core/2d/rect.js';
 import { EmbeddedCodeEditorWidget } from '../../../../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
-import { OffsetRange } from '../../../../../../common/core/offsetRange.js';
+import { OffsetRange } from '../../../../../../common/core/ranges/offsetRange.js';
 import { Position } from '../../../../../../common/core/position.js';
 import { Range } from '../../../../../../common/core/range.js';
 import { StickyScrollController } from '../../../../../stickyScroll/browser/stickyScrollController.js';
 import { InlineCompletionContextKeys } from '../../../controller/inlineCompletionContextKeys.js';
 import { originalBackgroundColor, getOriginalBorderColor, getEditorBlendedColor, getModifiedBorderColor, modifiedBackgroundColor } from '../theme.js';
 import { maxContentWidthInRange, getContentRenderWidth, getOffsetForPos, PathBuilder, mapOutFalsy } from '../utils/utils.js';
-import { derived } from '../../../../../../../base/common/observableInternal/derived.js';
+import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
 import { n } from '../../../../../../../base/browser/domImpl/n.js';
-import { constObservable, derivedObservableWithCache, observableFromEvent } from '../../../../../../../base/common/observableInternal/utils.js';
-import { autorun } from '../../../../../../../base/common/observableInternal/autorun.js';
+import { constObservable } from '../../../../../../../base/common/observableInternal/observables/constObservable.js';
+import { derivedObservableWithCache } from '../../../../../../../base/common/observableInternal/utils/utils.js';
+import { observableFromEvent } from '../../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { autorun } from '../../../../../../../base/common/observableInternal/reactions/autorun.js';
 
 const HORIZONTAL_PADDING = 0;
 const VERTICAL_PADDING = 0;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.d.ts

@@ -2,7 +2,7 @@ import { IMouseEvent } from "../../../../../../../base/browser/mouseEvent.js";
 import { Disposable } from "../../../../../../../base/common/lifecycle.js";
 import { IObservable } from "../../../../../../../base/common/observable.js";
 import { ObservableCodeEditor } from "../../../../../../browser/observableCodeEditor.js";
-import { SingleTextEdit } from "../../../../../../common/core/textEdit.js";
+import { TextReplacement } from "../../../../../../common/core/edits/textEdit.js";
 import { ILanguageService } from "../../../../../../common/languages/language.service.js";
 import { IInlineEditsView, InlineEditTabAction } from "../inlineEditsViewInterface.js";
 export declare class InlineEditsWordReplacementView extends Disposable implements IInlineEditsView {
@@ -18,7 +18,7 @@ export declare class InlineEditsWordReplacementView extends Disposable implement
     private readonly _line;
     private readonly _hoverableElement;
     readonly isHovered: IObservable<boolean>;
-    constructor(_editor: ObservableCodeEditor, _edit: SingleTextEdit, _tabAction: IObservable<InlineEditTabAction>, _languageService: ILanguageService);
+    constructor(_editor: ObservableCodeEditor, _edit: TextReplacement, _tabAction: IObservable<InlineEditTabAction>, _languageService: ILanguageService);
     private readonly _renderTextEffect;
     private readonly _layout;
     private readonly _root;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.js

@@ -16,20 +16,20 @@ import '../../../../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../../../platform/theme/common/colors/searchColors.js';
-import { Point } from '../../../../../../browser/point.js';
-import { Rect } from '../../../../../../browser/rect.js';
+import { Point } from '../../../../../../common/core/2d/point.js';
+import { Rect } from '../../../../../../common/core/2d/rect.js';
 import { renderLines, LineSource, RenderOptions } from '../../../../../../browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
-import { SingleOffsetEdit } from '../../../../../../common/core/offsetEdit.js';
-import { OffsetRange } from '../../../../../../common/core/offsetRange.js';
+import { StringReplacement } from '../../../../../../common/core/edits/stringEdit.js';
+import { OffsetRange } from '../../../../../../common/core/ranges/offsetRange.js';
 import { ILanguageService } from '../../../../../../common/languages/language.service.js';
 import { LineTokens } from '../../../../../../common/tokens/lineTokens.js';
 import { TokenArray } from '../../../../../../common/tokens/tokenArray.js';
 import { getOriginalBorderColor, getModifiedBorderColor, modifiedChangedTextOverlayColor, originalChangedTextOverlayColor } from '../theme.js';
-import { mapOutFalsy, rectToProps } from '../utils/utils.js';
-import { constObservable } from '../../../../../../../base/common/observableInternal/utils.js';
-import { observableValue } from '../../../../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../../../../base/common/observableInternal/derived.js';
+import { mapOutFalsy, rectToProps, getEditorValidOverlayRect } from '../utils/utils.js';
+import { constObservable } from '../../../../../../../base/common/observableInternal/observables/constObservable.js';
+import { observableValue } from '../../../../../../../base/common/observableInternal/observables/observableValue.js';
+import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
 import { n } from '../../../../../../../base/browser/domImpl/n.js';
 
 let InlineEditsWordReplacementView = class InlineEditsWordReplacementView extends Disposable {
@@ -51,12 +51,12 @@ let InlineEditsWordReplacementView = class InlineEditsWordReplacementView extend
         this._renderTextEffect = derived(_reader => {
             const tm = this._editor.model.get();
             const origLine = tm.getLineContent(this._edit.range.startLineNumber);
-            const edit = SingleOffsetEdit.replace(( new OffsetRange(this._edit.range.startColumn - 1, this._edit.range.endColumn - 1)), this._edit.text);
-            const lineToTokenize = edit.apply(origLine);
+            const edit = StringReplacement.replace(( new OffsetRange(this._edit.range.startColumn - 1, this._edit.range.endColumn - 1)), this._edit.text);
+            const lineToTokenize = edit.replace(origLine);
             const t = tm.tokenization.tokenizeLinesAt(this._edit.range.startLineNumber, [lineToTokenize])?.[0];
             let tokens;
             if (t) {
-                tokens = TokenArray.fromLineTokens(t).slice(edit.getRangeAfterApply()).toLineTokens(this._edit.text, this._languageService.languageIdCodec);
+                tokens = TokenArray.fromLineTokens(t).slice(edit.getRangeAfterReplace()).toLineTokens(this._edit.text, this._languageService.languageIdCodec);
             }
             else {
                 tokens = LineTokens.createEmpty(this._edit.text, this._languageService.languageIdCodec);
@@ -95,7 +95,6 @@ let InlineEditsWordReplacementView = class InlineEditsWordReplacementView extend
                 if (!layout) {
                     return [];
                 }
-                const contentLeft = this._editor.layoutInfoContentLeft.read(reader);
                 const borderWidth = 1;
                 const originalBorderColor = ( getOriginalBorderColor(this._tabAction).map(c => asCssVariable(c))).read(reader);
                 const modifiedBorderColor = ( getModifiedBorderColor(this._tabAction).map(c => asCssVariable(c))).read(reader);
@@ -103,10 +102,7 @@ let InlineEditsWordReplacementView = class InlineEditsWordReplacementView extend
                     n.div({
                         style: {
                             position: 'absolute',
-                            top: 0,
-                            left: contentLeft,
-                            width: this._editor.contentWidth,
-                            height: this._editor.editor.getContentHeight(),
+                            ...rectToProps((r) => getEditorValidOverlayRect(this._editor).read(r)),
                             overflow: 'hidden',
                             pointerEvents: 'none',
                         }

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/originalEditorInlineDiffView.d.ts

@@ -2,7 +2,7 @@ import { IMouseEvent } from "../../../../../../../base/browser/mouseEvent.js";
 import { Disposable } from "../../../../../../../base/common/lifecycle.js";
 import { IObservable } from "../../../../../../../base/common/observable.js";
 import { ICodeEditor } from "../../../../../../browser/editorBrowser.js";
-import { AbstractText } from "../../../../../../common/core/textEdit.js";
+import { AbstractText } from "../../../../../../common/core/text/abstractText.js";
 import { DetailedLineRangeMapping } from "../../../../../../common/diff/rangeMapping.js";
 import { ITextModel } from "../../../../../../common/model.js";
 import { IInlineEditsView } from "../inlineEditsViewInterface.js";

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/originalEditorInlineDiffView.js

@@ -5,14 +5,14 @@ import '../../../../../../../base/common/observableInternal/index.js';
 import { MouseTargetType } from '../../../../../../browser/editorBrowser.js';
 import { observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
 import { rangeIsSingleLine } from '../../../../../../browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.js';
-import { OffsetRange } from '../../../../../../common/core/offsetRange.js';
+import { OffsetRange } from '../../../../../../common/core/ranges/offsetRange.js';
 import { Range } from '../../../../../../common/core/range.js';
 import { EndOfLinePreference, InjectedTextCursorStops } from '../../../../../../common/model.js';
 import { ModelDecorationOptions } from '../../../../../../common/model/textModel.js';
 import { classNames } from '../utils/utils.js';
-import { derived } from '../../../../../../../base/common/observableInternal/derived.js';
-import { autorunWithStore } from '../../../../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent } from '../../../../../../../base/common/observableInternal/utils.js';
+import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
+import { autorunWithStore } from '../../../../../../../base/common/observableInternal/reactions/autorun.js';
+import { observableFromEvent } from '../../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 
 class OriginalEditorInlineDiffView extends Disposable {
     static supportsInlineDiffRendering(mapping) {

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/theme.js

@@ -14,16 +14,16 @@ import '../../../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../../platform/theme/common/colors/searchColors.js';
 import { InlineEditTabAction } from './inlineEditsViewInterface.js';
-import { observableFromEventOpts } from '../../../../../../base/common/observableInternal/utils.js';
+import { observableFromEventOpts } from '../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 
-const originalBackgroundColor = registerColor('inlineEdit.originalBackground', ( transparent(diffRemoved, 0.2)), ( localize(1278, 'Background color for the original text in inline edits.')), true);
-const modifiedBackgroundColor = registerColor('inlineEdit.modifiedBackground', ( transparent(diffInserted, 0.3)), ( localize(1279, 'Background color for the modified text in inline edits.')), true);
+const originalBackgroundColor = registerColor('inlineEdit.originalBackground', ( transparent(diffRemoved, 0.2)), ( localize(1281, 'Background color for the original text in inline edits.')), true);
+const modifiedBackgroundColor = registerColor('inlineEdit.modifiedBackground', ( transparent(diffInserted, 0.3)), ( localize(1282, 'Background color for the modified text in inline edits.')), true);
 registerColor('inlineEdit.originalChangedLineBackground', ( transparent(diffRemoved, 0.8)), ( localize(
-    1280,
+    1283,
     'Background color for the changed lines in the original text of inline edits.'
 )), true);
 const originalChangedTextOverlayColor = registerColor('inlineEdit.originalChangedTextBackground', ( transparent(diffRemoved, 0.8)), ( localize(
-    1281,
+    1284,
     'Overlay color for the changed text in the original text of inline edits.'
 )), true);
 const modifiedChangedLineBackgroundColor = registerColor('inlineEdit.modifiedChangedLineBackground', {
@@ -32,52 +32,52 @@ const modifiedChangedLineBackgroundColor = registerColor('inlineEdit.modifiedCha
     hcDark: diffInsertedLine,
     hcLight: diffInsertedLine
 }, ( localize(
-    1282,
+    1285,
     'Background color for the changed lines in the modified text of inline edits.'
 )), true);
 const modifiedChangedTextOverlayColor = registerColor('inlineEdit.modifiedChangedTextBackground', ( transparent(diffInserted, 0.7)), ( localize(
-    1283,
+    1286,
     'Overlay color for the changed text in the modified text of inline edits.'
 )), true);
-const inlineEditIndicatorPrimaryForeground = registerColor('inlineEdit.gutterIndicator.primaryForeground', buttonForeground, ( localize(1284, 'Foreground color for the primary inline edit gutter indicator.')));
-const inlineEditIndicatorPrimaryBorder = registerColor('inlineEdit.gutterIndicator.primaryBorder', buttonBackground, ( localize(1285, 'Border color for the primary inline edit gutter indicator.')));
+const inlineEditIndicatorPrimaryForeground = registerColor('inlineEdit.gutterIndicator.primaryForeground', buttonForeground, ( localize(1287, 'Foreground color for the primary inline edit gutter indicator.')));
+const inlineEditIndicatorPrimaryBorder = registerColor('inlineEdit.gutterIndicator.primaryBorder', buttonBackground, ( localize(1288, 'Border color for the primary inline edit gutter indicator.')));
 const inlineEditIndicatorPrimaryBackground = registerColor('inlineEdit.gutterIndicator.primaryBackground', {
     light: ( transparent(inlineEditIndicatorPrimaryBorder, 0.5)),
     dark: ( transparent(inlineEditIndicatorPrimaryBorder, 0.4)),
     hcDark: ( transparent(inlineEditIndicatorPrimaryBorder, 0.4)),
     hcLight: ( transparent(inlineEditIndicatorPrimaryBorder, 0.5)),
-}, ( localize(1286, 'Background color for the primary inline edit gutter indicator.')));
-const inlineEditIndicatorSecondaryForeground = registerColor('inlineEdit.gutterIndicator.secondaryForeground', buttonSecondaryForeground, ( localize(1287, 'Foreground color for the secondary inline edit gutter indicator.')));
-const inlineEditIndicatorSecondaryBorder = registerColor('inlineEdit.gutterIndicator.secondaryBorder', buttonSecondaryBackground, ( localize(1288, 'Border color for the secondary inline edit gutter indicator.')));
-const inlineEditIndicatorSecondaryBackground = registerColor('inlineEdit.gutterIndicator.secondaryBackground', inlineEditIndicatorSecondaryBorder, ( localize(1289, 'Background color for the secondary inline edit gutter indicator.')));
-const inlineEditIndicatorsuccessfulForeground = registerColor('inlineEdit.gutterIndicator.successfulForeground', buttonForeground, ( localize(1290, 'Foreground color for the successful inline edit gutter indicator.')));
-const inlineEditIndicatorsuccessfulBorder = registerColor('inlineEdit.gutterIndicator.successfulBorder', buttonBackground, ( localize(1291, 'Border color for the successful inline edit gutter indicator.')));
-const inlineEditIndicatorsuccessfulBackground = registerColor('inlineEdit.gutterIndicator.successfulBackground', inlineEditIndicatorsuccessfulBorder, ( localize(1292, 'Background color for the successful inline edit gutter indicator.')));
+}, ( localize(1289, 'Background color for the primary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryForeground = registerColor('inlineEdit.gutterIndicator.secondaryForeground', buttonSecondaryForeground, ( localize(1290, 'Foreground color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryBorder = registerColor('inlineEdit.gutterIndicator.secondaryBorder', buttonSecondaryBackground, ( localize(1291, 'Border color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryBackground = registerColor('inlineEdit.gutterIndicator.secondaryBackground', inlineEditIndicatorSecondaryBorder, ( localize(1292, 'Background color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulForeground = registerColor('inlineEdit.gutterIndicator.successfulForeground', buttonForeground, ( localize(1293, 'Foreground color for the successful inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulBorder = registerColor('inlineEdit.gutterIndicator.successfulBorder', buttonBackground, ( localize(1294, 'Border color for the successful inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulBackground = registerColor('inlineEdit.gutterIndicator.successfulBackground', inlineEditIndicatorsuccessfulBorder, ( localize(1295, 'Background color for the successful inline edit gutter indicator.')));
 const inlineEditIndicatorBackground = registerColor('inlineEdit.gutterIndicator.background', {
     hcDark: ( transparent('tab.inactiveBackground', 0.5)),
     hcLight: ( transparent('tab.inactiveBackground', 0.5)),
     dark: ( transparent('tab.inactiveBackground', 0.5)),
     light: '#5f5f5f18',
-}, ( localize(1293, 'Background color for the inline edit gutter indicator.')));
+}, ( localize(1296, 'Background color for the inline edit gutter indicator.')));
 const originalBorder = registerColor('inlineEdit.originalBorder', {
     light: diffRemoved,
     dark: diffRemoved,
     hcDark: diffRemoved,
     hcLight: diffRemoved
-}, ( localize(1294, 'Border color for the original text in inline edits.')));
+}, ( localize(1297, 'Border color for the original text in inline edits.')));
 const modifiedBorder = registerColor('inlineEdit.modifiedBorder', {
     light: ( darken(diffInserted, 0.6)),
     dark: diffInserted,
     hcDark: diffInserted,
     hcLight: diffInserted
-}, ( localize(1295, 'Border color for the modified text in inline edits.')));
+}, ( localize(1298, 'Border color for the modified text in inline edits.')));
 const tabWillAcceptModifiedBorder = registerColor('inlineEdit.tabWillAcceptModifiedBorder', {
     light: ( darken(modifiedBorder, 0)),
     dark: ( darken(modifiedBorder, 0)),
     hcDark: ( darken(modifiedBorder, 0)),
     hcLight: ( darken(modifiedBorder, 0))
 }, ( localize(
-    1296,
+    1299,
     'Modified border color for the inline edits widget when tab will accept it.'
 )));
 const tabWillAcceptOriginalBorder = registerColor('inlineEdit.tabWillAcceptOriginalBorder', {
@@ -86,7 +86,7 @@ const tabWillAcceptOriginalBorder = registerColor('inlineEdit.tabWillAcceptOrigi
     hcDark: ( darken(originalBorder, 0)),
     hcLight: ( darken(originalBorder, 0))
 }, ( localize(
-    1297,
+    1300,
     'Original border color for the inline edits widget over the original text when tab will accept it.'
 )));
 function getModifiedBorderColor(tabAction) {

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/utils.d.ts

@@ -4,12 +4,12 @@ import { URI } from "../../../../../../../base/common/uri.js";
 import { MenuEntryActionViewItem } from "../../../../../../../platform/actions/browser/menuEntryActionViewItem.js";
 import { ICodeEditor } from "../../../../../../browser/editorBrowser.js";
 import { ObservableCodeEditor } from "../../../../../../browser/observableCodeEditor.js";
-import { Point } from "../../../../../../browser/point.js";
-import { Rect } from "../../../../../../browser/rect.js";
-import { LineRange } from "../../../../../../common/core/lineRange.js";
+import { Point } from "../../../../../../common/core/2d/point.js";
+import { Rect } from "../../../../../../common/core/2d/rect.js";
+import { LineRange } from "../../../../../../common/core/ranges/lineRange.js";
 import { Position } from "../../../../../../common/core/position.js";
 import { Range } from "../../../../../../common/core/range.js";
-import { TextEdit } from "../../../../../../common/core/textEdit.js";
+import { TextEdit } from "../../../../../../common/core/edits/textEdit.js";
 import { RangeMapping } from "../../../../../../common/diff/rangeMapping.js";
 import { ITextModel } from "../../../../../../common/model.js";
 export declare function maxContentWidthInRange(editor: ObservableCodeEditor, range: LineRange, reader: IReader | undefined): number;
@@ -19,6 +19,7 @@ export declare function getPrefixTrim(diffRanges: Range[], originalLinesRange: L
     prefixLeftOffset: number;
 };
 export declare function getContentRenderWidth(content: string, editor: ICodeEditor, textModel: ITextModel): number;
+export declare function getEditorValidOverlayRect(editor: ObservableCodeEditor): IObservable<Rect>;
 export declare class StatusBarViewItem extends MenuEntryActionViewItem {
     protected readonly _updateLabelListener: import("../../../../../../../base/common/lifecycle.js").IDisposable;
     protected updateLabel(): void;
@@ -69,10 +70,10 @@ export declare function observeElementPosition(element: HTMLElement, store: Disp
     left: import("../../../../../../../base/common/observable.js").ISettableObservable<number, void>;
 };
 export declare function rectToProps(fn: (reader: IReader) => Rect): {
-    left: IObservable<number>;
-    top: IObservable<number>;
-    width: IObservable<number>;
-    height: IObservable<number>;
+    left: import("../../../../../../../base/common/observable.js").IObservableWithChange<number, void>;
+    top: import("../../../../../../../base/common/observable.js").IObservableWithChange<number, void>;
+    width: import("../../../../../../../base/common/observable.js").IObservableWithChange<number, void>;
+    height: import("../../../../../../../base/common/observable.js").IObservableWithChange<number, void>;
 };
 export type FirstFnArg<T> = T extends (arg: infer U) => any ? U : never;
 export {};

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/utils.js

@@ -7,19 +7,18 @@ import '../../../../../../../base/common/lifecycle.js';
 import '../../../../../../../base/common/observableInternal/index.js';
 import '../../../../../../../base/common/platform.js';
 import { splitLines, getIndentationLength } from '../../../../../../../base/common/strings.js';
-import '../../../../../../../base/common/charCode.js';
-import '../../../../../../../base/common/marshallingIds.js';
-import '../../../../../../../base/common/path.js';
+import { URI } from '../../../../../../../base/common/uri.js';
 import '../../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { Rect } from '../../../../../../common/core/2d/rect.js';
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
-import { OffsetRange } from '../../../../../../common/core/offsetRange.js';
+import { OffsetRange } from '../../../../../../common/core/ranges/offsetRange.js';
 import { Position } from '../../../../../../common/core/position.js';
 import { Range } from '../../../../../../common/core/range.js';
-import { SingleTextEdit, TextEdit } from '../../../../../../common/core/textEdit.js';
+import { TextReplacement, TextEdit } from '../../../../../../common/core/edits/textEdit.js';
 import { RangeMapping } from '../../../../../../common/diff/rangeMapping.js';
 import { indentOfLine } from '../../../../../../common/model/textModel.js';
-import { derivedOpts, derived } from '../../../../../../../base/common/observableInternal/derived.js';
-import { derivedObservableWithCache } from '../../../../../../../base/common/observableInternal/utils.js';
+import { derived, derivedOpts } from '../../../../../../../base/common/observableInternal/observables/derived.js';
+import { derivedObservableWithCache } from '../../../../../../../base/common/observableInternal/utils/utils.js';
 
 function maxContentWidthInRange(editor, range, reader) {
     editor.layoutInfo.read(reader);
@@ -86,6 +85,29 @@ function getContentRenderWidth(content, editor, textModel) {
     const numNoneTabs = content.length - numTabs;
     return numNoneTabs * w + numTabs * tabSize;
 }
+function getEditorValidOverlayRect(editor) {
+    const contentLeft = editor.layoutInfoContentLeft;
+    const width = derived(r => {
+        const hasMinimapOnTheRight = editor.layoutInfoMinimap.read(r).minimapLeft !== 0;
+        const editorWidth = editor.layoutInfoWidth.read(r) - contentLeft.read(r);
+        if (hasMinimapOnTheRight) {
+            const minimapAndScrollbarWidth = editor.layoutInfoMinimap.read(r).minimapWidth + editor.layoutInfoVerticalScrollbarWidth.read(r);
+            return editorWidth - minimapAndScrollbarWidth;
+        }
+        return editorWidth;
+    });
+    const height = derived(r => editor.layoutInfoHeight.read(r) + editor.contentHeight.read(r));
+    return derived(r => Rect.fromLeftTopWidthHeight(contentLeft.read(r), 0, width.read(r), height.read(r)));
+}
+class UniqueUriGenerator {
+    static { this._modelId = 0; }
+    constructor(scheme) {
+        this.scheme = scheme;
+    }
+    getUniqueUri() {
+        return ( URI.from({ scheme: this.scheme, path: ( ( new Date()).toString()) + String(UniqueUriGenerator._modelId++) }));
+    }
+}
 function applyEditToModifiedRangeMappings(rangeMapping, edit) {
     const updatedMappings = [];
     for (const m of rangeMapping) {
@@ -110,7 +132,7 @@ function createReindentEdit(text, range) {
     const edits = [];
     const minIndent = findFirstMin(range.mapToLineArray(l => getIndentationLength(newLines[l - 1])), numberComparator);
     range.forEach(lineNumber => {
-        edits.push(( new SingleTextEdit(offsetRangeToRange(( new OffsetRange(0, minIndent)), ( new Position(lineNumber, 1))), '')));
+        edits.push(( new TextReplacement(offsetRangeToRange(( new OffsetRange(0, minIndent)), ( new Position(lineNumber, 1))), '')));
     });
     return ( new TextEdit(edits));
 }
@@ -160,4 +182,4 @@ function rectToProps(fn) {
     };
 }
 
-export { PathBuilder, applyEditToModifiedRangeMappings, classNames, createReindentEdit, getContentRenderWidth, getOffsetForPos, getPrefixTrim, mapOutFalsy, maxContentWidthInRange, rectToProps };
+export { PathBuilder, UniqueUriGenerator, applyEditToModifiedRangeMappings, classNames, createReindentEdit, getContentRenderWidth, getEditorValidOverlayRect, getOffsetForPos, getPrefixTrim, mapOutFalsy, maxContentWidthInRange, rectToProps };

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

@@ -9,7 +9,7 @@ class InsertFinalNewLineAction extends EditorAction {
     constructor() {
         super({
             id: InsertFinalNewLineAction.ID,
-            label: ( localize2(1298, "Insert Final New Line")),
+            label: ( localize2(1301, "Insert Final New Line")),
             precondition: EditorContextKeys.writable
         });
     }

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

@@ -11,7 +11,7 @@ class ExpandLineSelectionAction extends EditorAction {
     constructor() {
         super({
             id: 'expandLineSelection',
-            label: ( localize2(1299, "Expand Line Selection")),
+            label: ( localize2(1302, "Expand Line Selection")),
             precondition: undefined,
             kbOpts: {
                 weight: KeybindingWeight.EditorCore,