@codingame/monaco-vscode-api 20.5.0 → 21.0.1

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

@@ -4,7 +4,7 @@ import { AsyncIterableObject } from '../../../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { onUnexpectedExternalError } from '../../../../../base/common/errors.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { generateUuid } from '../../../../../base/common/uuid.js';
+import { prefixedUuid } from '../../../../../base/common/uuid.js';
 import { StringReplacement } from '../../../../common/core/edits/stringEdit.js';
 import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
 import { Range } from '../../../../common/core/range.js';
@@ -21,7 +21,7 @@ import { isDefined } from '../../../../../base/common/types.js';
 import { inlineCompletionIsVisible } from './inlineSuggestionItem.js';
 
 function provideInlineCompletions(providers, position, model, context, requestInfo, languageConfigurationService) {
-    const requestUuid = 'icr-' + generateUuid();
+    const requestUuid = prefixedUuid('icr');
     const cancellationTokenSource = ( new CancellationTokenSource());
     let cancelReason = undefined;
     const contextWithUuid = { ...context, requestUuid: requestUuid };
@@ -58,6 +58,7 @@ function provideInlineCompletions(providers, position, model, context, requestIn
                 }
             }
             let result;
+            const providerStartTime = Date.now();
             try {
                 result = await provider.provideInlineCompletions(model, position, contextWithUuid, cancellationTokenSource.token);
             }
@@ -65,6 +66,7 @@ function provideInlineCompletions(providers, position, model, context, requestIn
                 onUnexpectedExternalError(e);
                 return undefined;
             }
+            const providerEndTime = Date.now();
             if (!result) {
                 return undefined;
             }
@@ -78,7 +80,7 @@ function provideInlineCompletions(providers, position, model, context, requestIn
                 return undefined;
             }
             for (const item of result.items) {
-                data.push(toInlineSuggestData(item, list, defaultReplaceRange, model, languageConfigurationService, contextWithUuid, requestInfo));
+                data.push(toInlineSuggestData(item, list, defaultReplaceRange, model, languageConfigurationService, contextWithUuid, requestInfo, { startTime: providerStartTime, endTime: providerEndTime }));
             }
             return list;
         }
@@ -112,7 +114,7 @@ function runWhenCancelled(token, callback) {
         return { dispose: () => listener.dispose() };
     }
 }
-function toInlineSuggestData(inlineCompletion, source, defaultReplaceRange, textModel, languageConfigurationService, context, requestInfo) {
+function toInlineSuggestData(inlineCompletion, source, defaultReplaceRange, textModel, languageConfigurationService, context, requestInfo, providerRequestInfo) {
     let insertText;
     let snippetInfo;
     let range = inlineCompletion.range ? Range.lift(inlineCompletion.range) : defaultReplaceRange;
@@ -164,7 +166,8 @@ function toInlineSuggestData(inlineCompletion, source, defaultReplaceRange, text
     }
     const displayLocation = inlineCompletion.displayLocation ? {
         range: Range.lift(inlineCompletion.displayLocation.range),
-        label: inlineCompletion.displayLocation.label
+        label: inlineCompletion.displayLocation.label,
+        kind: inlineCompletion.displayLocation.kind
     } : undefined;
     return ( new InlineSuggestData(
         range,
@@ -176,11 +179,13 @@ function toInlineSuggestData(inlineCompletion, source, defaultReplaceRange, text
         source,
         context,
         inlineCompletion.isInlineEdit ?? false,
-        requestInfo
+        requestInfo,
+        providerRequestInfo,
+        inlineCompletion.correlationId
     ));
 }
 class InlineSuggestData {
-    constructor(range, insertText, snippetInfo, displayLocation, additionalTextEdits, sourceInlineCompletion, source, context, isInlineEdit, _requestInfo) {
+    constructor(range, insertText, snippetInfo, displayLocation, additionalTextEdits, sourceInlineCompletion, source, context, isInlineEdit, _requestInfo, _providerRequestInfo, _correlationId) {
         this.range = range;
         this.insertText = insertText;
         this.snippetInfo = snippetInfo;
@@ -191,6 +196,8 @@ class InlineSuggestData {
         this.context = context;
         this.isInlineEdit = isInlineEdit;
         this._requestInfo = _requestInfo;
+        this._providerRequestInfo = _providerRequestInfo;
+        this._correlationId = _correlationId;
         this._didShow = false;
         this._timeUntilShown = undefined;
         this._showStartTime = undefined;
@@ -201,9 +208,11 @@ class InlineSuggestData {
         this._lastSetEndOfLifeReason = undefined;
         this._isPreceeded = false;
         this._partiallyAcceptedCount = 0;
+        this._partiallyAcceptedSinceOriginal = { characters: 0, ratio: 0, count: 0 };
         this._viewData = { editorType: _requestInfo.editorType };
     }
     get showInlineEditMenu() { return this.sourceInlineCompletion.showInlineEditMenu ?? false; }
+    get partialAccepts() { return this._partiallyAcceptedSinceOriginal; }
     getSingleTextEdit() {
         return ( new TextReplacement(this.range, this.insertText));
     }
@@ -221,8 +230,11 @@ class InlineSuggestData {
             await commandService.executeCommand(this.sourceInlineCompletion.shownCommand.id, ...(this.sourceInlineCompletion.shownCommand.arguments || []));
         }
     }
-    reportPartialAccept(acceptedCharacters, info) {
+    reportPartialAccept(acceptedCharacters, info, partialAcceptance) {
         this._partiallyAcceptedCount++;
+        this._partiallyAcceptedSinceOriginal.characters += partialAcceptance.characters;
+        this._partiallyAcceptedSinceOriginal.ratio = Math.min(this._partiallyAcceptedSinceOriginal.ratio + (1 - this._partiallyAcceptedSinceOriginal.ratio) * partialAcceptance.ratio, 1);
+        this._partiallyAcceptedSinceOriginal.count += partialAcceptance.count;
         this.source.provider.handlePartialAccept?.(this.source.inlineSuggestions, this.sourceInlineCompletion, acceptedCharacters, info);
     }
     reportEndOfLife(reason) {
@@ -240,12 +252,18 @@ class InlineSuggestData {
         if (this.source.provider.handleEndOfLifetime) {
             const summary = {
                 requestUuid: this.context.requestUuid,
+                correlationId: this._correlationId,
                 partiallyAccepted: this._partiallyAcceptedCount,
+                partiallyAcceptedCountSinceOriginal: this._partiallyAcceptedSinceOriginal.count,
+                partiallyAcceptedRatioSinceOriginal: this._partiallyAcceptedSinceOriginal.ratio,
+                partiallyAcceptedCharactersSinceOriginal: this._partiallyAcceptedSinceOriginal.characters,
                 shown: this._didShow,
                 shownDuration: this._shownDuration,
                 shownDurationUncollapsed: this._showUncollapsedDuration,
                 preceeded: this._isPreceeded,
                 timeUntilShown: this._timeUntilShown,
+                timeUntilProviderRequest: this._providerRequestInfo.startTime - this._requestInfo.startTime,
+                timeUntilProviderResponse: this._providerRequestInfo.endTime - this._requestInfo.startTime,
                 editorType: this._viewData.editorType,
                 languageId: this._requestInfo.languageId,
                 requestReason: this._requestInfo.reason,
@@ -266,8 +284,12 @@ class InlineSuggestData {
             this._viewData.error = message;
         }
     }
-    setIsPreceeded() {
+    setIsPreceeded(partialAccepts) {
         this._isPreceeded = true;
+        if (this._partiallyAcceptedSinceOriginal.characters !== 0 || this._partiallyAcceptedSinceOriginal.ratio !== 0 || this._partiallyAcceptedSinceOriginal.count !== 0) {
+            console.warn('Expected partiallyAcceptedCountSinceOriginal to be { characters: 0, rate: 0, partialAcceptances: 0 } before setIsPreceeded.');
+        }
+        this._partiallyAcceptedSinceOriginal = partialAccepts;
     }
     setEndOfLifeReason(reason) {
         this.reportInlineEditHidden();

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

@@ -31,6 +31,7 @@ export declare class SuggestItemInfo {
     readonly insertText: string;
     readonly completionItemKind: CompletionItemKind;
     readonly isSnippetText: boolean;
+    readonly listIncomplete: boolean;
     static fromSuggestion(suggestController: SuggestController, model: ITextModel, position: Position, item: CompletionItem, toggleMode: boolean): SuggestItemInfo;
     private constructor();
     equals(other: SuggestItemInfo): boolean;

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

@@ -149,14 +149,16 @@ class SuggestItemInfo {
             Range.fromPositions(position.delta(0, -info.overwriteBefore), position.delta(0, Math.max(info.overwriteAfter, 0))),
             insertText,
             item.completion.kind,
-            isSnippetText
+            isSnippetText,
+            item.container.incomplete ?? false
         ));
     }
-    constructor(range, insertText, completionItemKind, isSnippetText) {
+    constructor(range, insertText, completionItemKind, isSnippetText, listIncomplete) {
         this.range = range;
         this.insertText = insertText;
         this.completionItemKind = completionItemKind;
         this.isSnippetText = isSnippetText;
+        this.listIncomplete = listIncomplete;
     }
     equals(other) {
         return this.range.equalsRange(other.range)

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

@@ -29,7 +29,6 @@ export declare class TypingInterval extends Disposable {
     getTypingInterval(): TypingIntervalResult;
     constructor(_textModel: ITextModel);
     private _updateTypingSpeed;
-    private _calculateEffectiveCharacterCount;
     private _getActualCharacterCount;
     private _isUserTyping;
     private _isUserTypingReason;

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

@@ -27,7 +27,10 @@ class TypingInterval extends Disposable {
     }
     _updateTypingSpeed(change) {
         const now = Date.now();
-        const characterCount = this._calculateEffectiveCharacterCount(change);
+        if (!this._isUserTyping(change)) {
+            this._finalizeCurrentSession();
+            return;
+        }
         if (this._currentSession && (now - this._lastChangeTime) > TypingInterval.MAX_SESSION_GAP_MS) {
             this._finalizeCurrentSession();
         }
@@ -39,17 +42,10 @@ class TypingInterval extends Disposable {
             };
         }
         this._currentSession.endTime = now;
-        this._currentSession.characterCount += characterCount;
+        this._currentSession.characterCount += this._getActualCharacterCount(change);
         this._lastChangeTime = now;
         this._cacheInvalidated = true;
     }
-    _calculateEffectiveCharacterCount(change) {
-        const actualCharCount = this._getActualCharacterCount(change);
-        if (this._isUserTyping(change)) {
-            return actualCharCount;
-        }
-        return actualCharCount > 0 ? 1 : 0;
-    }
     _getActualCharacterCount(change) {
         let totalChars = 0;
         for (const c of change.changes) {
@@ -59,7 +55,7 @@ class TypingInterval extends Disposable {
     }
     _isUserTyping(change) {
         if (!change.detailedReasons || change.detailedReasons.length === 0) {
-            return true;
+            return false;
         }
         for (const reason of change.detailedReasons) {
             if (this._isUserTypingReason(reason)) {

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

@@ -1,8 +1,8 @@
 import { Disposable } from "../../../../base/common/lifecycle.js";
 import { IObservable } from "../../../../base/common/observable.js";
 import { URI } from "../../../../base/common/uri.js";
-import { ICommandService } from "../../../../platform/commands/common/commands.service.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
+import { IDataChannelService } from "../../../../platform/dataChannel/common/dataChannel.service.js";
 export interface IRecordableLogEntry {
     sourceId: string;
     time: number;
@@ -40,13 +40,13 @@ interface IFetchResult {
 */
 export declare function formatRecordableLogEntry<T extends IRecordableLogEntry>(entry: T): string;
 export declare class StructuredLogger<T extends IRecordableLogEntry> extends Disposable {
-    private readonly _contextKey;
+    private readonly _key;
     private readonly _contextKeyService;
-    private readonly _commandService;
+    private readonly _dataChannelService;
     static cast<T extends IRecordableLogEntry>(): typeof StructuredLogger<T>;
     readonly isEnabled: IObservable<boolean>;
-    private readonly _contextKeyValue;
-    constructor(_contextKey: string, _contextKeyService: IContextKeyService, _commandService: ICommandService);
+    private readonly _isEnabledContextKeyValue;
+    constructor(_key: string, _contextKeyService: IContextKeyService, _dataChannelService: IDataChannelService);
     log(data: T): boolean;
 }
 export {};

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

@@ -2,41 +2,37 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import '../../../../base/common/observableInternal/index.js';
-import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { IDataChannelService } from '../../../../platform/dataChannel/common/dataChannel.service.js';
 import { observableFromEvent } from '../../../../base/common/observableInternal/observables/observableFromEvent.js';
 
 function formatRecordableLogEntry(entry) {
-    return entry.sourceId + ' @@ ' + JSON.stringify({ ...entry, sourceId: undefined });
+    return entry.sourceId + ' @@ ' + JSON.stringify({ ...entry, modelUri: entry.modelUri?.toString(), sourceId: undefined });
 }
 let StructuredLogger = class StructuredLogger extends Disposable {
     static cast() {
         return this;
     }
-    constructor(_contextKey, _contextKeyService, _commandService) {
+    constructor(_key, _contextKeyService, _dataChannelService) {
         super();
-        this._contextKey = _contextKey;
+        this._key = _key;
         this._contextKeyService = _contextKeyService;
-        this._commandService = _commandService;
-        this._contextKeyValue = observableContextKey(this._contextKey, this._contextKeyService).recomputeInitiallyAndOnChange(this._store);
-        this.isEnabled = ( this._contextKeyValue.map(v => v !== undefined));
+        this._dataChannelService = _dataChannelService;
+        this._isEnabledContextKeyValue = observableContextKey('structuredLogger.enabled:' + this._key, this._contextKeyService).recomputeInitiallyAndOnChange(this._store);
+        this.isEnabled = ( this._isEnabledContextKeyValue.map(v => v !== undefined));
     }
     log(data) {
-        const commandId = this._contextKeyValue.get();
-        if (!commandId) {
+        const enabled = this._isEnabledContextKeyValue.get();
+        if (!enabled) {
             return false;
         }
-        try {
-            this._commandService.executeCommand(commandId, data).catch(() => { });
-        }
-        catch (e) {
-        }
+        this._dataChannelService.getDataChannel('structuredLogger:' + this._key).sendData(data);
         return true;
     }
 };
 StructuredLogger = ( __decorate([
     ( __param(1, IContextKeyService)),
-    ( __param(2, ICommandService))
+    ( __param(2, IDataChannelService))
 ], StructuredLogger));
 function observableContextKey(key, contextKeyService) {
     return observableFromEvent(contextKeyService.onDidChangeContext, () => contextKeyService.getContextKeyValue(key));

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

@@ -52,7 +52,7 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
             return {
                 title: options.title,
                 icon: options.icon,
-                keybinding: typeof options.commandId === 'string' ? this._getKeybinding(options.commandArgs ? undefined : options.commandId) : derived(reader => typeof options.commandId === 'string' ? undefined : this._getKeybinding(options.commandArgs ? undefined : options.commandId.read(reader)).read(reader)),
+                keybinding: typeof options.commandId === 'string' ? this._getKeybinding(options.commandArgs ? undefined : options.commandId) : derived(this, reader => typeof options.commandId === 'string' ? undefined : this._getKeybinding(options.commandArgs ? undefined : options.commandId.read(reader)).read(reader)),
                 isActive: ( activeElement.map(v => v === options.id)),
                 onHoverChange: v => activeElement.set(v ? options.id : undefined, undefined),
                 onAction: () => {
@@ -64,13 +64,13 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const title = header(this._model.displayName);
         const gotoAndAccept = option(createOptionArgs({
             id: 'gotoAndAccept',
-            title: `${( localize(1296, "Go To"))} / ${( localize(1297, "Accept"))}`,
+            title: `${( localize(1298, "Go To"))} / ${( localize(1299, "Accept"))}`,
             icon: Codicon.check,
             commandId: inlineSuggestCommitId
         }));
         const reject = option(createOptionArgs({
             id: 'reject',
-            title: ( localize(1298, "Reject")),
+            title: ( localize(1300, "Reject")),
             icon: Codicon.close,
             commandId: hideInlineCompletionId
         }));
@@ -84,19 +84,19 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const toggleCollapsedMode = ( this._inlineEditsShowCollapsed.map(showCollapsed => showCollapsed ?
             option(createOptionArgs({
                 id: 'showExpanded',
-                title: ( localize(1299, "Show Expanded")),
+                title: ( localize(1301, "Show Expanded")),
                 icon: Codicon.expandAll,
                 commandId: toggleShowCollapsedId
             }))
             : option(createOptionArgs({
                 id: 'showCollapsed',
-                title: ( localize(1300, "Show Collapsed")),
+                title: ( localize(1302, "Show Collapsed")),
                 icon: Codicon.collapseAll,
                 commandId: toggleShowCollapsedId
             }))));
         const settings = option(createOptionArgs({
             id: 'settings',
-            title: ( localize(1301, "Settings")),
+            title: ( localize(1303, "Settings")),
             icon: Codicon.gear,
             commandId: 'workbench.action.openSettings',
             commandArgs: ['@tag:nextEditSuggestions']
@@ -156,7 +156,7 @@ function header(title) {
     }, [title]);
 }
 function option(props) {
-    return derived((_reader) => n.div({
+    return derived({ name: 'inlineEdits.option' }, (_reader) => n.div({
         class: ['monaco-menu-option', props.isActive?.map(v => v && 'active')],
         onmouseenter: () => props.onHoverChange?.(true),
         onmouseleave: () => props.onHoverChange?.(false),
@@ -197,7 +197,7 @@ function option(props) {
     ]));
 }
 function actionBar(actions, options) {
-    return derived((_reader) => n.div({
+    return derived({ name: 'inlineEdits.actionBar' }, (_reader) => n.div({
         class: ['action-widget-action-bar'],
         style: {
             padding: '0 10px',

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

@@ -80,7 +80,7 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
             }
         }));
         this._originalRangeObs = mapOutFalsy(this._originalRange);
-        this._state = derived(reader => {
+        this._state = derived(this, reader => {
             const range = this._originalRangeObs.read(reader);
             if (!range) {
                 return undefined;
@@ -173,7 +173,7 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
             }
             const layout = this._editorObs.layoutInfo.read(reader);
             const lineHeight = this._editorObs.observeLineHeightForLine(( s.range.map(r => r.startLineNumber))).read(reader);
-            const gutterViewPortPadding = 1;
+            const gutterViewPortPadding = 2;
             const gutterWidthWithoutPadding = layout.decorationsLeft + layout.decorationsWidth - layout.glyphMarginLeft - 2 * gutterViewPortPadding;
             const gutterHeightWithoutPadding = layout.height - 2 * gutterViewPortPadding;
             const gutterViewPortWithStickyScroll = Rect.fromLeftTopWidthHeight(gutterViewPortPadding, gutterViewPortPadding, gutterWidthWithoutPadding, gutterHeightWithoutPadding);
@@ -188,7 +188,7 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
             const iconNoneDocked = ( this._tabAction.map(
                 action => action === InlineEditTabAction.Accept ? Codicon.keyboardTab : Codicon.arrowRight
             ));
-            const iconDocked = derived(reader => {
+            const iconDocked = derived(this, reader => {
                 if (this._isHoveredOverIconDebounced.read(reader) || this._isHoveredOverInlineEditDebounced.read(reader)) {
                     return Codicon.check;
                 }

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

@@ -14,7 +14,7 @@ class InlineEditModel {
         this.inlineEdit = inlineEdit;
         this.tabAction = tabAction;
         this.action = this.inlineEdit.inlineCompletion.action;
-        this.displayName = this.inlineEdit.inlineCompletion.source.provider.displayName ?? ( localize(1302, "Inline Edit"));
+        this.displayName = this.inlineEdit.inlineCompletion.source.provider.displayName ?? ( localize(1304, "Inline Edit"));
         this.extensionCommands = this.inlineEdit.inlineCompletion.source.inlineSuggestions.commands ?? [];
         this.isInDiffEditor = this._model.isInDiffEditor;
         this.displayLocation = this.inlineEdit.inlineCompletion.displayLocation;

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

@@ -29,10 +29,11 @@ import { InlineEditsWordReplacementView } from './inlineEditsViews/inlineEditsWo
 import { OriginalEditorInlineDiffView } from './inlineEditsViews/originalEditorInlineDiffView.js';
 import { createReindentEdit, applyEditToModifiedRangeMappings } from './utils/utils.js';
 import * as view from './view.css';
+import { $ } from '../../../../../../base/browser/dom.js';
 import { derived, derivedOpts } from '../../../../../../base/common/observableInternal/observables/derived.js';
 import { observableValue } from '../../../../../../base/common/observableInternal/observables/observableValue.js';
 import { mapObservableArrayCached } from '../../../../../../base/common/observableInternal/utils/utils.js';
-import { autorunWithStore } from '../../../../../../base/common/observableInternal/reactions/autorun.js';
+import { autorunWithStore, autorun } from '../../../../../../base/common/observableInternal/reactions/autorun.js';
 
 registerCss(view);
 let InlineEditsView = class InlineEditsView extends Disposable {
@@ -62,7 +63,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
                 return undefined;
             }
             if (state.kind === InlineCompletionViewKind.SideBySide) {
-                const indentationAdjustmentEdit = createReindentEdit(newText, inlineEdit.modifiedLineRange);
+                const indentationAdjustmentEdit = createReindentEdit(newText, inlineEdit.modifiedLineRange, textModel.getOptions().tabSize);
                 newText = indentationAdjustmentEdit.applyToString(newText);
                 mappings = applyEditToModifiedRangeMappings(mappings, indentationAdjustmentEdit);
                 diff = lineRangeMappingFromRangeMappings(mappings, inlineEdit.originalText, ( new StringText(newText)));
@@ -211,6 +212,30 @@ let InlineEditsView = class InlineEditsView extends Disposable {
         this._wordReplacementViews.recomputeInitiallyAndOnChange(this._store);
         this._indicatorCyclicDependencyCircuitBreaker.set(true, undefined);
         this._register(this._instantiationService.createInstance(InlineEditsOnboardingExperience, this._host, this._model, this._indicator, this._inlineCollapsedView));
+        const minEditorScrollHeight = derived(this, reader => {
+            return Math.max(...( this._wordReplacementViews.read(reader).map(v => v.minEditorScrollHeight.read(reader))), this._lineReplacementView.minEditorScrollHeight.read(reader), this._customView.minEditorScrollHeight.read(reader));
+        }).recomputeInitiallyAndOnChange(this._store);
+        const textModel = this._editor.getModel();
+        let viewZoneId;
+        this._register(autorun(reader => {
+            const minScrollHeight = minEditorScrollHeight.read(reader);
+            this._editor.changeViewZones(accessor => {
+                const scrollHeight = this._editor.getScrollHeight();
+                const viewZoneHeight = minScrollHeight - scrollHeight + 1 ;
+                if (viewZoneHeight !== 0 && viewZoneId) {
+                    accessor.removeZone(viewZoneId);
+                    viewZoneId = undefined;
+                }
+                if (viewZoneHeight <= 0) {
+                    return;
+                }
+                viewZoneId = accessor.addZone({
+                    afterLineNumber: textModel.getLineCount(),
+                    heightInPx: viewZoneHeight,
+                    domNode: $('div.minScrollHeightViewZone'),
+                });
+            });
+        }));
         this._constructorDone.set(true, undefined);
     }
     getCacheId(model) {
@@ -249,11 +274,15 @@ let InlineEditsView = class InlineEditsView extends Disposable {
             }
             const allInnerChangesNotTooLong = inner.every(m => TextLength.ofRange(m.originalRange).columnCount < InlineEditsWordReplacementView.MAX_LENGTH && TextLength.ofRange(m.modifiedRange).columnCount < InlineEditsWordReplacementView.MAX_LENGTH);
             if (allInnerChangesNotTooLong && isSingleInnerEdit && numOriginalLines === 1 && numModifiedLines === 1) {
-                if (!( inner.some(m => m.originalRange.isEmpty())) ||
-                    !( growEditsUntilWhitespace(( inner.map(m => ( new TextReplacement(m.originalRange, '')))), inlineEdit.originalText).some(
-                        e => e.range.isEmpty() && TextLength.ofRange(e.range).columnCount < InlineEditsWordReplacementView.MAX_LENGTH
-                    ))) {
-                    return InlineCompletionViewKind.WordReplacements;
+                const modifiedText = ( inner.map(m => newText.getValueOfRange(m.modifiedRange)));
+                const originalText = ( inner.map(m => model.inlineEdit.originalText.getValueOfRange(m.originalRange)));
+                if (!( modifiedText.some(v => v.includes('\t'))) && !( originalText.some(v => v.includes('\t')))) {
+                    if (!( inner.some(m => m.originalRange.isEmpty())) ||
+                        !( growEditsUntilWhitespace(( inner.map(m => ( new TextReplacement(m.originalRange, '')))), inlineEdit.originalText).some(
+                            e => e.range.isEmpty() && TextLength.ofRange(e.range).columnCount < InlineEditsWordReplacementView.MAX_LENGTH
+                        ))) {
+                        return InlineCompletionViewKind.WordReplacements;
+                    }
                 }
             }
         }

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

@@ -10,6 +10,7 @@ export declare enum InlineEditTabAction {
 }
 export interface IInlineEditsView {
     isHovered: IObservable<boolean>;
+    minEditorScrollHeight?: IObservable<number>;
     onDidClick: Event<IMouseEvent>;
 }
 export interface IInlineEditHost {

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

@@ -15,6 +15,7 @@ export declare class InlineEditsCustomView extends Disposable implements IInline
     readonly isHovered: IObservable<boolean>;
     private readonly _viewRef;
     private readonly _editorObs;
+    readonly minEditorScrollHeight: IObservable<number>;
     constructor(_editor: ICodeEditor, displayLocation: IObservable<InlineCompletionDisplayLocation | undefined>, tabAction: IObservable<InlineEditTabAction>, themeService: IThemeService, _languageService: ILanguageService);
     private fitsInsideViewport;
     private getState;

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

@@ -22,16 +22,17 @@ import { renderLines, LineSource, RenderOptions } from '../../../../../../browse
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
 import { Rect } from '../../../../../../common/core/2d/rect.js';
 import { LineRange } from '../../../../../../common/core/ranges/lineRange.js';
+import { InlineCompletionDisplayLocationKind } from '../../../../../../common/languages.js';
 import { ILanguageService } from '../../../../../../common/languages/language.service.js';
 import { TokenArray, LineTokens } from '../../../../../../common/tokens/lineTokens.js';
 import { InlineEditTabAction } from '../inlineEditsViewInterface.js';
 import { inlineEditIndicatorsuccessfulBackground, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorSecondaryBackground, getEditorBlendedColor } from '../theme.js';
 import { maxContentWidthInRange, getContentRenderWidth, rectToProps } from '../utils/utils.js';
 import { observableValue } from '../../../../../../../base/common/observableInternal/observables/observableValue.js';
+import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
 import { derivedObservableWithCache } from '../../../../../../../base/common/observableInternal/utils/utils.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';
 
 const MIN_END_OF_LINE_PADDING = 14;
 const PADDING_VERTICALLY = 0;
@@ -69,6 +70,13 @@ let InlineEditsCustomView = class InlineEditsCustomView extends Disposable {
         }));
         const state = ( displayLocation.map(dl => dl ? this.getState(dl) : undefined));
         const view = ( state.map(s => s ? this.getRendering(s, styles) : undefined));
+        this.minEditorScrollHeight = derived(this, reader => {
+            const s = state.read(reader);
+            if (!s) {
+                return 0;
+            }
+            return s.rect.read(reader).bottom + this._editor.getScrollTop();
+        });
         const overlay = n.div({
             class: 'inline-edits-custom-view',
             style: {
@@ -115,7 +123,7 @@ let InlineEditsCustomView = class InlineEditsCustomView extends Disposable {
         return maxOriginalContent + maxModifiedContent + padding < editorWidth - editorContentLeft - editorVerticalScrollbar - minimapWidth;
     }
     getState(displayLocation) {
-        const contentState = derived((reader) => {
+        const contentState = derived(this, (reader) => {
             const startLineNumber = displayLocation.range.startLineNumber;
             const endLineNumber = displayLocation.range.endLineNumber;
             const startColumn = displayLocation.range.startColumn;
@@ -137,7 +145,7 @@ let InlineEditsCustomView = class InlineEditsCustomView extends Disposable {
         const startLineNumber = displayLocation.range.startLineNumber;
         const endLineNumber = displayLocation.range.endLineNumber;
         const fitsInsideViewport = this.fitsInsideViewport(( new LineRange(startLineNumber, endLineNumber + 1)), displayLocation.label, undefined);
-        const rect = derived((reader) => {
+        const rect = derived(this, reader => {
             const w = this._editorObs.getOption(EditorOption.fontInfo).read(reader).typicalHalfwidthCharacterWidth;
             const { lineWidth, lineWidthBelow, lineWidthAbove, startContentLeftOffset, endContentLeftOffset } = contentState.read(reader);
             const contentLeft = this._editorObs.layoutInfoContentLeft.read(reader);
@@ -188,14 +196,15 @@ let InlineEditsCustomView = class InlineEditsCustomView extends Disposable {
         });
         return {
             rect,
-            label: displayLocation.label
+            label: displayLocation.label,
+            kind: displayLocation.kind
         };
     }
     getRendering(state, styles) {
         const line = createElement('div');
         const t = this._editor.getModel().tokenization.tokenizeLinesAt(1, [state.label])?.[0];
         let tokens;
-        if (t) {
+        if (t && state.kind === InlineCompletionDisplayLocationKind.Code) {
             tokens = TokenArray.fromLineTokens(t).toLineTokens(state.label, this._languageService.languageIdCodec);
         }
         else {
@@ -221,6 +230,9 @@ let InlineEditsCustomView = class InlineEditsCustomView extends Disposable {
                 justifyContent: 'center',
                 whiteSpace: 'nowrap',
             },
+            onmousedown: e => {
+                e.preventDefault();
+            },
             onclick: (e) => { this._onDidClick.fire(( new StandardMouseEvent(getWindow(e), e))); }
         }, [
             line

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

@@ -52,7 +52,7 @@ class InlineEditsDeletionView extends Disposable {
                 return Math.max(maxWidth, lastValue ?? 0);
             });
         }).map((v, r) => v.read(r)));
-        this._maxPrefixTrim = derived(reader => {
+        this._maxPrefixTrim = derived(this, reader => {
             const state = this._uiState.read(reader);
             if (!state) {
                 return { prefixTrim: 0, prefixLeftOffset: 0 };
@@ -87,7 +87,7 @@ class InlineEditsDeletionView extends Disposable {
         }).recomputeInitiallyAndOnChange(this._store);
         this._originalOverlay = n.div({
             style: { pointerEvents: 'none', }
-        }, derived(reader => {
+        }, derived(this, reader => {
             const layoutInfoObs = mapOutFalsy(this._editorLayoutInfo).read(reader);
             if (!layoutInfoObs) {
                 return undefined;
@@ -95,7 +95,7 @@ class InlineEditsDeletionView extends Disposable {
             const overlayhider = ( layoutInfoObs.map(
                 layoutInfo => Rect.fromLeftTopRightBottom(layoutInfo.contentLeft - BORDER_RADIUS - BORDER_WIDTH, layoutInfo.codeRect.top, layoutInfo.contentLeft, layoutInfo.codeRect.bottom)
             ));
-            const overlayRect = derived(reader => {
+            const overlayRect = derived(this, reader => {
                 const rect = layoutInfoObs.read(reader).codeRect;
                 const overlayHider = overlayhider.read(reader);
                 return rect.intersectHorizontal(( new OffsetRange(overlayHider.left, Number.MAX_SAFE_INTEGER)));
@@ -162,7 +162,7 @@ class InlineEditsDeletionView extends Disposable {
             domNode: this._nonOverflowView.element,
             position: constObservable(null),
             allowEditorOverflow: false,
-            minContentWidthInPx: derived(reader => {
+            minContentWidthInPx: derived(this, reader => {
                 const info = this._editorLayoutInfo.read(reader);
                 if (info === null) {
                     return 0;

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

@@ -79,7 +79,7 @@ let InlineEditsInsertionView = class InlineEditsInsertionView extends Disposable
             }
             return { topOffset: linesTop * lineHeight, bottomOffset: linesBottom * lineHeight, linesTop, linesBottom };
         });
-        this._maxPrefixTrim = derived(reader => {
+        this._maxPrefixTrim = derived(this, reader => {
             const state = this._state.read(reader);
             if (!state) {
                 return { prefixLeftOffset: 0, prefixTrim: 0 };
@@ -176,7 +176,7 @@ let InlineEditsInsertionView = class InlineEditsInsertionView extends Disposable
         }).recomputeInitiallyAndOnChange(this._store);
         this._modifiedOverlay = n.div({
             style: { pointerEvents: 'none', }
-        }, derived(reader => {
+        }, derived(this, reader => {
             const overlayLayoutObs = mapOutFalsy(this._overlayLayout).read(reader);
             if (!overlayLayoutObs) {
                 return undefined;
@@ -249,7 +249,7 @@ let InlineEditsInsertionView = class InlineEditsInsertionView extends Disposable
             domNode: this._view.element,
             position: constObservable(null),
             allowEditorOverflow: false,
-            minContentWidthInPx: derived(reader => {
+            minContentWidthInPx: derived(this, reader => {
                 const info = this._overlayLayout.read(reader);
                 if (info === null) {
                     return 0;