@codingame/monaco-vscode-api 2.0.3-improve-modularity.1 → 2.1.0-update-vscode-1.86.1

package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.js

@@ -6,7 +6,6 @@ import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import './lightBulbWidget.css.js';
-import { ShowAiIconMode } from '../../../common/config/editorOptions.js';
 import { computeIndentLevel } from '../../../common/model/utils.js';
 import { autoFixCommandId, quickFixCommandId } from './codeAction.js';
 import { localizeWithPath } from '../../../../nls.js';
@@ -56,17 +55,6 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
             if (this.state.type !== 1 ) {
                 return;
             }
-            const option = this._editor.getOption(64 ).experimental.showAiIcon;
-            if ((option === ShowAiIconMode.On || option === ShowAiIconMode.OnCode)
-                && this.state.actions.allAIFixes
-                && this.state.actions.validActions.length === 1) {
-                const action = this.state.actions.validActions[0].action;
-                if (action.command?.id) {
-                    commandService.executeCommand(action.command.id, ...(action.command.arguments || []));
-                    e.preventDefault();
-                    return;
-                }
-            }
             this._editor.focus();
             e.preventDefault();
             const { top, height } = getDomNodePagePosition(this._domNode);
@@ -88,14 +76,6 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
             }
             this.hide();
         }));
-        this._register(this._editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(64 )) {
-                if (!this._editor.getOption(64 ).enabled) {
-                    this.hide();
-                }
-                this._updateLightBulbTitleAndIcon();
-            }
-        }));
         this._register(Event.runAndSubscribe(this._keybindingService.onDidUpdateKeybindings, () => {
             this._preferredKbLabel = this._keybindingService.lookupKeybinding(autoFixCommandId)?.getLabel() ?? undefined;
             this._quickFixKbLabel = this._keybindingService.lookupKeybinding(quickFixCommandId)?.getLabel() ?? undefined;
@@ -129,7 +109,7 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         }
         const { lineNumber, column } = model.validatePosition(atPosition);
         const tabSize = model.getOptions().tabSize;
-        const fontInfo = options.get(50 );
+        const fontInfo = this._editor.getOptions().get(50 );
         const lineContent = model.getLineContent(lineNumber);
         const indent = computeIndentLevel(lineContent, tabSize);
         const lineHasSpace = fontInfo.spaceWidth * indent > 22;
@@ -137,19 +117,21 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
             return lineNumber > 2 && this._editor.getTopForLineNumber(lineNumber) === this._editor.getTopForLineNumber(lineNumber - 1);
         };
         let effectiveLineNumber = lineNumber;
+        let effectiveColumnNumber = 1;
         if (!lineHasSpace) {
             if (lineNumber > 1 && !isFolded(lineNumber - 1)) {
                 effectiveLineNumber -= 1;
             }
-            else if (!isFolded(lineNumber + 1)) {
+            else if ((lineNumber < model.getLineCount()) && !isFolded(lineNumber + 1)) {
                 effectiveLineNumber += 1;
             }
             else if (column * fontInfo.spaceWidth < 22) {
                 return this.hide();
             }
+            effectiveColumnNumber = /^\S\s*$/.test(model.getLineContent(effectiveLineNumber)) ? 2 : 1;
         }
         this.state = new LightBulbState.Showing(actions, trigger, atPosition, {
-            position: { lineNumber: effectiveLineNumber, column: !!model.getLineContent(effectiveLineNumber).match(/^\S\s*$/) ? 2 : 1 },
+            position: { lineNumber: effectiveLineNumber, column: effectiveColumnNumber },
             preference: LightBulbWidget_1._posPref
         });
         this._editor.layoutContentWidget(this);
@@ -172,95 +154,68 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         if (this.state.type !== 1 ) {
             return;
         }
-        const updateAutoFixLightbulbTitle = () => {
-            if (this._preferredKbLabel) {
-                this.title = ( localizeWithPath(
-                    'vs/editor/contrib/codeAction/browser/lightBulbWidget',
-                    'preferredcodeActionWithKb',
-                    "Show Code Actions. Preferred Quick Fix Available ({0})",
-                    this._preferredKbLabel
-                ));
-            }
-        };
-        const updateLightbulbTitle = () => {
-            if (this._quickFixKbLabel) {
-                this.title = ( localizeWithPath(
-                    'vs/editor/contrib/codeAction/browser/lightBulbWidget',
-                    'codeActionWithKb',
-                    "Show Code Actions ({0})",
-                    this._quickFixKbLabel
-                ));
-            }
-            else {
-                this.title = ( localizeWithPath(
-                    'vs/editor/contrib/codeAction/browser/lightBulbWidget',
-                    'codeAction',
-                    "Show Code Actions"
-                ));
-            }
-        };
         let icon;
-        const option = this._editor.getOption(64 ).experimental.showAiIcon;
-        if (option === ShowAiIconMode.On || option === ShowAiIconMode.OnCode) {
-            if (option === ShowAiIconMode.On && this.state.actions.allAIFixes) {
-                icon = Codicon.sparkleFilled;
-                if (this.state.actions.allAIFixes && this.state.actions.validActions.length === 1) {
-                    if (this.state.actions.validActions[0].action.command?.id === `inlineChat.start`) {
-                        const keybinding = this._keybindingService.lookupKeybinding('inlineChat.start')?.getLabel() ?? undefined;
-                        this.title = keybinding ? ( localizeWithPath(
-                            'vs/editor/contrib/codeAction/browser/lightBulbWidget',
-                            'codeActionStartInlineChatWithKb',
-                            'Start Inline Chat ({0})',
-                            keybinding
-                        )) : ( localizeWithPath(
-                            'vs/editor/contrib/codeAction/browser/lightBulbWidget',
-                            'codeActionStartInlineChat',
-                            'Start Inline Chat'
-                        ));
-                    }
-                    else {
-                        this.title = ( localizeWithPath(
-                            'vs/editor/contrib/codeAction/browser/lightBulbWidget',
-                            'codeActionTriggerAiAction',
-                            "Trigger AI Action"
-                        ));
-                    }
-                }
-                else {
-                    updateLightbulbTitle();
-                }
-            }
-            else if (this.state.actions.hasAutoFix) {
-                if (this.state.actions.hasAIFix) {
-                    icon = Codicon.lightbulbSparkleAutofix;
-                }
-                else {
-                    icon = Codicon.lightbulbAutofix;
-                }
-                updateAutoFixLightbulbTitle();
+        let autoRun = false;
+        if (this.state.actions.allAIFixes) {
+            icon = Codicon.sparkleFilled;
+            if (this.state.actions.validActions.length === 1) {
+                autoRun = true;
             }
-            else if (this.state.actions.hasAIFix) {
-                icon = Codicon.lightbulbSparkle;
-                updateLightbulbTitle();
+        }
+        else if (this.state.actions.hasAutoFix) {
+            if (this.state.actions.hasAIFix) {
+                icon = Codicon.lightbulbSparkleAutofix;
             }
             else {
-                icon = Codicon.lightBulb;
-                updateLightbulbTitle();
+                icon = Codicon.lightbulbAutofix;
             }
         }
+        else if (this.state.actions.hasAIFix) {
+            icon = Codicon.lightbulbSparkle;
+        }
         else {
-            if (this.state.actions.hasAutoFix) {
-                icon = Codicon.lightbulbAutofix;
-                updateAutoFixLightbulbTitle();
-            }
-            else {
-                icon = Codicon.lightBulb;
-                updateLightbulbTitle();
-            }
+            icon = Codicon.lightBulb;
         }
+        this._updateLightbulbTitle(this.state.actions.hasAutoFix, autoRun);
         this._iconClasses = ThemeIcon.asClassNameArray(icon);
         this._domNode.classList.add(...this._iconClasses);
     }
+    _updateLightbulbTitle(autoFix, autoRun) {
+        if (this.state.type !== 1 ) {
+            return;
+        }
+        if (autoRun) {
+            this.title = ( localizeWithPath(
+                'vs/editor/contrib/codeAction/browser/lightBulbWidget',
+                'codeActionAutoRun',
+                "Run: {0}",
+                this.state.actions.validActions[0].action.title
+            ));
+        }
+        else if (autoFix && this._preferredKbLabel) {
+            this.title = ( localizeWithPath(
+                'vs/editor/contrib/codeAction/browser/lightBulbWidget',
+                'preferredcodeActionWithKb',
+                "Show Code Actions. Preferred Quick Fix Available ({0})",
+                this._preferredKbLabel
+            ));
+        }
+        else if (!autoFix && this._quickFixKbLabel) {
+            this.title = ( localizeWithPath(
+                'vs/editor/contrib/codeAction/browser/lightBulbWidget',
+                'codeActionWithKb',
+                "Show Code Actions ({0})",
+                this._quickFixKbLabel
+            ));
+        }
+        else if (!autoFix) {
+            this.title = ( localizeWithPath(
+                'vs/editor/contrib/codeAction/browser/lightBulbWidget',
+                'codeAction',
+                "Show Code Actions"
+            ));
+        }
+    }
     set title(value) {
         this._domNode.title = value;
     }

package/vscode/src/vs/editor/contrib/codelens/browser/codelensWidget.js

@@ -52,8 +52,9 @@ class CodeLensContentWidget {
             if (lens.command) {
                 const title = renderLabelWithIcons(lens.command.title.trim());
                 if (lens.command.id) {
-                    children.push($('a', { id: String(i), title: lens.command.tooltip, role: 'button' }, ...title));
-                    this._commands.set(String(i), lens.command);
+                    const id = `c${(CodeLensContentWidget._idPool++)}`;
+                    children.push($('a', { id, title: lens.command.tooltip, role: 'button' }, ...title));
+                    this._commands.set(id, lens.command);
                 }
                 else {
                     children.push($('span', { title: lens.command.tooltip }, ...title));

package/vscode/src/vs/editor/contrib/colorPicker/browser/colorContributions.js

@@ -3,7 +3,7 @@ import { registerEditorContribution } from '../../../browser/editorExtensions.js
 import { Range } from '../../../common/core/range.js';
 import { ColorDecorationInjectedTextMarker } from './colorDetector.js';
 import { ColorHoverParticipant } from './colorHoverParticipant.js';
-import { ModesHoverController } from '../../hover/browser/hover.js';
+import { HoverController } from '../../hover/browser/hover.js';
 import { HoverParticipantRegistry } from '../../hover/browser/hoverTypes.js';
 class ColorContribution extends Disposable {
     static { this.ID = 'editor.contrib.colorContribution'; }
@@ -34,7 +34,7 @@ class ColorContribution extends Disposable {
         if (!target.range) {
             return;
         }
-        const hoverController = this._editor.getContribution(ModesHoverController.ID);
+        const hoverController = this._editor.getContribution(HoverController.ID);
         if (!hoverController) {
             return;
         }

package/vscode/src/vs/editor/contrib/colorPicker/browser/colorHoverParticipant.js

@@ -190,7 +190,7 @@ function renderHoverParts(participant, editor, themeService, hoverParts, context
         disposables.add(model.onColorFlushed(async (color) => {
             await _updateColorPresentations(editorModel, model, color, range, colorHover);
             editorUpdatedByColorPicker = true;
-            range = _updateEditorModel(editor, range, model, context);
+            range = _updateEditorModel(editor, range, model);
         }));
     }
     disposables.add(model.onDidChangeColor((color) => {
@@ -207,37 +207,18 @@ function renderHoverParts(participant, editor, themeService, hoverParts, context
     }));
     return disposables;
 }
-function _updateEditorModel(editor, range, model, context) {
-    let textEdits;
-    let newRange;
-    if (model.presentation.textEdit) {
-        textEdits = [model.presentation.textEdit];
-        newRange = ( new Range(
-            model.presentation.textEdit.range.startLineNumber,
-            model.presentation.textEdit.range.startColumn,
-            model.presentation.textEdit.range.endLineNumber,
-            model.presentation.textEdit.range.endColumn
-        ));
-        const trackedRange = editor.getModel()._setTrackedRange(null, newRange, 3 );
-        editor.pushUndoStop();
-        editor.executeEdits('colorpicker', textEdits);
-        newRange = editor.getModel()._getTrackedRange(trackedRange) || newRange;
-    }
-    else {
-        textEdits = [{ range, text: model.presentation.label, forceMoveMarkers: false }];
-        newRange = range.setEndPosition(range.endLineNumber, range.startColumn + model.presentation.label.length);
-        editor.pushUndoStop();
-        editor.executeEdits('colorpicker', textEdits);
-    }
+function _updateEditorModel(editor, range, model) {
+    const textEdits = [];
+    const edit = model.presentation.textEdit ?? { range, text: model.presentation.label, forceMoveMarkers: false };
+    textEdits.push(edit);
     if (model.presentation.additionalTextEdits) {
-        textEdits = [...model.presentation.additionalTextEdits];
-        editor.executeEdits('colorpicker', textEdits);
-        if (context) {
-            context.hide();
-        }
+        textEdits.push(...model.presentation.additionalTextEdits);
     }
+    const replaceRange = Range.lift(edit.range);
+    const trackedRange = editor.getModel()._setTrackedRange(null, replaceRange, 3 );
+    editor.executeEdits('colorpicker', textEdits);
     editor.pushUndoStop();
-    return newRange;
+    return editor.getModel()._getTrackedRange(trackedRange) ?? replaceRange;
 }
 async function _updateColorPresentations(editorModel, colorPickerModel, color, range, colorHover) {
     const colorPresentations = await getColorPresentations(editorModel, {

package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.js

@@ -89,9 +89,9 @@ class CloseButton extends Disposable {
             'Icon to close the color picker'
         ))))));
         closeButton.classList.add('close-icon');
-        this._button.onclick = () => {
+        this._register(addDisposableListener(this._button, EventType.CLICK, () => {
             this._onClicked.fire();
-        };
+        }));
     }
 }
 class ColorPickerBody extends Disposable {
@@ -327,9 +327,9 @@ class InsertButton extends Disposable {
         this._button = append(container, document.createElement('button'));
         this._button.classList.add('insert-button');
         this._button.textContent = 'Insert';
-        this._button.onclick = e => {
+        this._register(addDisposableListener(this._button, EventType.CLICK, () => {
             this._onClicked.fire();
-        };
+        }));
     }
     get button() {
         return this._button;

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

@@ -0,0 +1,51 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { reverseOrder, compareBy, numberComparator } from '../../../../base/common/arrays.js';
+import { HideUnchangedRegionsFeature } from '../../../browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js';
+import { DisposableCancellationTokenSource } from '../../../browser/widget/diffEditor/utils.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { IOutlineModelService } from '../../documentSymbols/browser/outlineModel.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Event } from '../../../../base/common/event.js';
+import { observableValue } from '../../../../base/common/observableInternal/base.js';
+import { observableSignalFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import { autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
+let DiffEditorBreadcrumbsSource = class DiffEditorBreadcrumbsSource extends Disposable {
+    constructor(_textModel, _languageFeaturesService, _outlineModelService) {
+        super();
+        this._textModel = _textModel;
+        this._languageFeaturesService = _languageFeaturesService;
+        this._outlineModelService = _outlineModelService;
+        this._currentModel = observableValue(this, undefined);
+        const documentSymbolProviderChanged = observableSignalFromEvent('documentSymbolProvider.onDidChange', this._languageFeaturesService.documentSymbolProvider.onDidChange);
+        const textModelChanged = observableSignalFromEvent('_textModel.onDidChangeContent', Event.debounce(e => this._textModel.onDidChangeContent(e), () => undefined, 100));
+        this._register(autorunWithStore(async (reader, store) => {
+            documentSymbolProviderChanged.read(reader);
+            textModelChanged.read(reader);
+            const src = store.add(( new DisposableCancellationTokenSource()));
+            const model = await this._outlineModelService.getOrCreate(this._textModel, src.token);
+            if (store.isDisposed) {
+                return;
+            }
+            this._currentModel.set(model, undefined);
+        }));
+    }
+    getBreadcrumbItems(startRange, reader) {
+        const m = this._currentModel.read(reader);
+        if (!m) {
+            return [];
+        }
+        const symbols = m.asListOfDocumentSymbols()
+            .filter(s => startRange.contains(s.range.startLineNumber) && !startRange.contains(s.range.endLineNumber));
+        symbols.sort(reverseOrder(compareBy(s => s.range.endLineNumber - s.range.startLineNumber, numberComparator)));
+        return ( symbols.map(
+            s => ({ name: s.name, kind: s.kind, startLineNumber: s.range.startLineNumber })
+        ));
+    }
+};
+DiffEditorBreadcrumbsSource = ( __decorate([
+    ( __param(1, ILanguageFeaturesService)),
+    ( __param(2, IOutlineModelService))
+], DiffEditorBreadcrumbsSource));
+HideUnchangedRegionsFeature.setBreadcrumbsSourceFactory((textModel, instantiationService) => {
+    return instantiationService.createInstance(DiffEditorBreadcrumbsSource, textModel);
+});

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution.js

@@ -1,4 +1,5 @@
 import { registerEditorContribution, registerEditorCommand, EditorCommand, registerEditorAction, EditorAction } from '../../../browser/editorExtensions.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { registerEditorFeature } from '../../../common/editorFeatures.js';
 import { changePasteTypeCommandId, pasteWidgetVisibleCtx, CopyPasteController } from './copyPasteController.js';
 import { DefaultPasteProvidersFeature } from './defaultProviders.js';
@@ -30,7 +31,7 @@ registerEditorAction(class extends EditorAction {
                 "Paste As..."
             )),
             alias: 'Paste As...',
-            precondition: undefined,
+            precondition: EditorContextKeys.writable,
             metadata: {
                 description: 'Paste as',
                 args: [{
@@ -57,3 +58,20 @@ registerEditorAction(class extends EditorAction {
         return CopyPasteController.get(editor)?.pasteAs(id);
     }
 });
+registerEditorAction(class extends EditorAction {
+    constructor() {
+        super({
+            id: 'editor.action.pasteAsText',
+            label: ( localizeWithPath(
+                'vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution',
+                'pasteAsText',
+                "Paste as Text"
+            )),
+            alias: 'Paste as Text',
+            precondition: EditorContextKeys.writable,
+        });
+    }
+    run(_accessor, editor, args) {
+        return CopyPasteController.get(editor)?.pasteAs('text');
+    }
+});

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.js

@@ -22,6 +22,7 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { IProgressService } from '../../../../platform/progress/common/progress.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
 import { PostEditWidgetManager } from './postEditWidget.js';
+import { MessageController } from '../../message/browser/messageController.js';
 var CopyPasteController_1;
 const changePasteTypeCommandId = 'editor.changePasteType';
 const pasteWidgetVisibleCtx = ( new RawContextKey('pasteWidgetVisible', false, ( localizeWithPath(
@@ -75,6 +76,9 @@ let CopyPasteController = class CopyPasteController extends Disposable {
         return this._editor.getOption(84 ).enabled
             && !this._editor.getOption(90 );
     }
+    async finishedPaste() {
+        await this._currentPasteOperation;
+    }
     handleCopy(e) {
         if (!this._editor.hasTextFocus()) {
             return;
@@ -151,6 +155,7 @@ let CopyPasteController = class CopyPasteController extends Disposable {
         if (!e.clipboardData || !this._editor.hasTextFocus()) {
             return;
         }
+        MessageController.get(this._editor)?.closeMessage();
         this._currentPasteOperation?.cancel();
         this._currentPasteOperation = undefined;
         const model = this._editor.getModel();
@@ -158,7 +163,9 @@ let CopyPasteController = class CopyPasteController extends Disposable {
         if (!selections?.length || !model) {
             return;
         }
-        if (!this.isPasteAsEnabled()) {
+        if (!this.isPasteAsEnabled()
+            && !this._pasteAsActionContext
+        ) {
             return;
         }
         const metadata = this.fetchCopyMetadata(e);
@@ -171,20 +178,38 @@ let CopyPasteController = class CopyPasteController extends Disposable {
         ];
         const allProviders = this._languageFeaturesService.documentPasteEditProvider
             .ordered(model)
-            .filter(provider => provider.pasteMimeTypes?.some(type => matchesMimeType(type, allPotentialMimeTypes)));
+            .filter(provider => {
+            if (this._pasteAsActionContext?.preferredId) {
+                if (this._pasteAsActionContext.preferredId !== provider.id) {
+                    return false;
+                }
+            }
+            return provider.pasteMimeTypes?.some(type => matchesMimeType(type, allPotentialMimeTypes));
+        });
         if (!allProviders.length) {
+            if (this._pasteAsActionContext?.preferredId) {
+                this.showPasteAsNoEditMessage(selections, this._pasteAsActionContext?.preferredId);
+            }
             return;
         }
         e.preventDefault();
         e.stopImmediatePropagation();
         if (this._pasteAsActionContext) {
-            this.showPasteAsPick(this._pasteAsActionContext.preferredId, allProviders, selections, dataTransfer, metadata);
+            this.showPasteAsPick(this._pasteAsActionContext.preferredId, allProviders, selections, dataTransfer, metadata, { trigger: 'explicit', only: this._pasteAsActionContext.preferredId });
         }
         else {
-            this.doPasteInline(allProviders, selections, dataTransfer, metadata);
+            this.doPasteInline(allProviders, selections, dataTransfer, metadata, { trigger: 'implicit' });
         }
     }
-    doPasteInline(allProviders, selections, dataTransfer, metadata) {
+    showPasteAsNoEditMessage(selections, editId) {
+        MessageController.get(this._editor)?.showMessage(( localizeWithPath(
+            'vs/editor/contrib/dropOrPasteInto/browser/copyPasteController',
+            'pasteAsError',
+            "No paste edits for '{0}' found",
+            editId
+        )), selections[0].getStartPosition());
+    }
+    doPasteInline(allProviders, selections, dataTransfer, metadata, context) {
         const p = createCancelablePromise(async (token) => {
             const editor = this._editor;
             if (!editor.hasModel()) {
@@ -209,7 +234,7 @@ let CopyPasteController = class CopyPasteController extends Disposable {
                     await this.applyDefaultPasteHandler(dataTransfer, metadata, tokenSource.token);
                     return;
                 }
-                const providerEdits = await this.getPasteEdits(supportedProviders, dataTransfer, model, selections, tokenSource.token);
+                const providerEdits = await this.getPasteEdits(supportedProviders, dataTransfer, model, selections, context, tokenSource.token);
                 if (tokenSource.token.isCancellationRequested) {
                     return;
                 }
@@ -237,7 +262,7 @@ let CopyPasteController = class CopyPasteController extends Disposable {
         )), p);
         this._currentPasteOperation = p;
     }
-    showPasteAsPick(preferredId, allProviders, selections, dataTransfer, metadata) {
+    showPasteAsPick(preferredId, allProviders, selections, dataTransfer, metadata, context) {
         const p = createCancelablePromise(async (token) => {
             const editor = this._editor;
             if (!editor.hasModel()) {
@@ -259,11 +284,14 @@ let CopyPasteController = class CopyPasteController extends Disposable {
                 if (preferredId) {
                     supportedProviders = supportedProviders.filter(edit => edit.id === preferredId);
                 }
-                const providerEdits = await this.getPasteEdits(supportedProviders, dataTransfer, model, selections, tokenSource.token);
+                const providerEdits = await this.getPasteEdits(supportedProviders, dataTransfer, model, selections, context, tokenSource.token);
                 if (tokenSource.token.isCancellationRequested) {
                     return;
                 }
                 if (!providerEdits.length) {
+                    if (context.only) {
+                        this.showPasteAsNoEditMessage(selections, context.only);
+                    }
                     return;
                 }
                 let pickedEdit;
@@ -355,10 +383,10 @@ let CopyPasteController = class CopyPasteController extends Disposable {
             }
         }
     }
-    async getPasteEdits(providers, dataTransfer, model, selections, token) {
+    async getPasteEdits(providers, dataTransfer, model, selections, context, token) {
         const results = await raceCancellation(Promise.all(( providers.map(async (provider) => {
             try {
-                const edit = await provider.provideDocumentPasteEdits?.(model, selections, dataTransfer, token);
+                const edit = await provider.provideDocumentPasteEdits?.(model, selections, dataTransfer, context, token);
                 if (edit) {
                     return { ...edit, providerId: provider.id };
                 }

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.js

@@ -15,7 +15,7 @@ const builtInLabel = ( localizeWithPath(
     'Built-in'
 ));
 class SimplePasteAndDropProvider {
-    async provideDocumentPasteEdits(_model, _ranges, dataTransfer, token) {
+    async provideDocumentPasteEdits(_model, _ranges, dataTransfer, context, token) {
         const edit = await this.getEdit(dataTransfer, token);
         return edit ? { insertText: edit.insertText, label: edit.label, detail: edit.detail, handledMimeType: edit.handledMimeType, yieldTo: edit.yieldTo } : undefined;
     }
@@ -152,6 +152,33 @@ let RelativePathProvider = class RelativePathProvider extends SimplePasteAndDrop
 RelativePathProvider = ( __decorate([
     ( __param(0, IWorkspaceContextService))
 ], RelativePathProvider));
+class PasteHtmlProvider {
+    constructor() {
+        this.id = 'html';
+        this.pasteMimeTypes = ['text/html'];
+        this._yieldTo = [{ mimeType: Mimes.text }];
+    }
+    async provideDocumentPasteEdits(_model, _ranges, dataTransfer, context, token) {
+        if (context.trigger !== 'explicit' && context.only !== this.id) {
+            return;
+        }
+        const entry = dataTransfer.get('text/html');
+        const htmlText = await entry?.asString();
+        if (!htmlText || token.isCancellationRequested) {
+            return;
+        }
+        return {
+            insertText: htmlText,
+            yieldTo: this._yieldTo,
+            label: ( localizeWithPath(
+                'vs/editor/contrib/dropOrPasteInto/browser/defaultProviders',
+                'pasteHtmlLabel',
+                'Insert HTML'
+            )),
+            detail: builtInLabel,
+        };
+    }
+}
 async function extractUriList(dataTransfer) {
     const urlListEntry = dataTransfer.get(Mimes.uriList);
     if (!urlListEntry) {
@@ -186,6 +213,7 @@ let DefaultPasteProvidersFeature = class DefaultPasteProvidersFeature extends Di
         this._register(languageFeaturesService.documentPasteEditProvider.register('*', ( new DefaultTextProvider())));
         this._register(languageFeaturesService.documentPasteEditProvider.register('*', ( new PathProvider())));
         this._register(languageFeaturesService.documentPasteEditProvider.register('*', ( new RelativePathProvider(workspaceContextService))));
+        this._register(languageFeaturesService.documentPasteEditProvider.register('*', ( new PasteHtmlProvider())));
     }
 };
 DefaultPasteProvidersFeature = ( __decorate([

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/edit.js

@@ -1,10 +1,17 @@
 import { ResourceTextEdit } from '../../../browser/services/bulkEditService.js';
+import { SnippetParser } from '../../snippet/browser/snippetParser.js';
 function createCombinedWorkspaceEdit(uri, ranges, edit) {
+    if (typeof edit.insertText === 'string' ? edit.insertText === '' : edit.insertText.snippet === '') {
+        return {
+            edits: edit.additionalEdit?.edits ?? []
+        };
+    }
     return {
         edits: [
-            ...( ranges.map(range => ( new ResourceTextEdit(uri, typeof edit.insertText === 'string'
-                ? { range, text: edit.insertText, insertAsSnippet: false }
-                : { range, text: edit.insertText.snippet, insertAsSnippet: true })))),
+            ...( ranges.map(range => ( new ResourceTextEdit(
+                uri,
+                { range, text: typeof edit.insertText === 'string' ? SnippetParser.escape(edit.insertText) + '$0' : edit.insertText.snippet, insertAsSnippet: true }
+            )))),
             ...(edit.additionalEdit?.edits ?? [])
         ]
     };

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.js

@@ -5,7 +5,8 @@ import { toAction } from '../../../../base/common/actions.js';
 import { Event } from '../../../../base/common/event.js';
 import { Disposable, toDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import './postEditWidget.css.js';
-import { IBulkEditService, ResourceTextEdit } from '../../../browser/services/bulkEditService.js';
+import { IBulkEditService } from '../../../browser/services/bulkEditService.js';
+import { createCombinedWorkspaceEdit } from './edit.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -113,22 +114,7 @@ let PostEditWidgetManager = class PostEditWidgetManager extends Disposable {
         if (!edit) {
             return;
         }
-        let insertTextEdit = [];
-        if (typeof edit.insertText === 'string' ? edit.insertText === '' : edit.insertText.snippet === '') {
-            insertTextEdit = [];
-        }
-        else {
-            insertTextEdit = ( ranges.map(range => ( new ResourceTextEdit(model.uri, typeof edit.insertText === 'string'
-                ? { range, text: edit.insertText, insertAsSnippet: false }
-                : { range, text: edit.insertText.snippet, insertAsSnippet: true }))));
-        }
-        const allEdits = [
-            ...insertTextEdit,
-            ...(edit.additionalEdit?.edits ?? [])
-        ];
-        const combinedWorkspaceEdit = {
-            edits: allEdits
-        };
+        const combinedWorkspaceEdit = createCombinedWorkspaceEdit(model.uri, ranges, edit);
         const primaryRange = ranges[0];
         const editTrackingDecoration = model.deltaDecorations([], [{
                 range: primaryRange,