@codingame/monaco-vscode-api 3.2.2 → 4.0.0

package/vscode/src/vs/editor/contrib/comment/browser/lineCommentCommand.js

@@ -5,10 +5,10 @@ import { Range } from '../../../common/core/range.js';
 import { Selection } from '../../../common/core/selection.js';
 import { BlockCommentCommand } from './blockCommentCommand.js';
 class LineCommentCommand {
-    constructor(languageConfigurationService, selection, tabSize, type, insertSpace, ignoreEmptyLines, ignoreFirstLine) {
+    constructor(languageConfigurationService, selection, indentSize, type, insertSpace, ignoreEmptyLines, ignoreFirstLine) {
         this.languageConfigurationService = languageConfigurationService;
         this._selection = selection;
-        this._tabSize = tabSize;
+        this._indentSize = indentSize;
         this._type = type;
         this._insertSpace = insertSpace;
         this._selectionId = null;
@@ -108,7 +108,7 @@ class LineCommentCommand {
             ops = LineCommentCommand._createRemoveLineCommentsOperations(data.lines, s.startLineNumber);
         }
         else {
-            LineCommentCommand._normalizeInsertionPoint(model, data.lines, s.startLineNumber, this._tabSize);
+            LineCommentCommand._normalizeInsertionPoint(model, data.lines, s.startLineNumber, this._indentSize);
             ops = this._createAddLineCommentsOperations(data.lines, s.startLineNumber);
         }
         const cursorPosition = ( new Position(s.positionLineNumber, s.positionColumn));
@@ -264,13 +264,13 @@ class LineCommentCommand {
         }
         return res;
     }
-    static nextVisibleColumn(currentVisibleColumn, tabSize, isTab, columnSize) {
+    static nextVisibleColumn(currentVisibleColumn, indentSize, isTab, columnSize) {
         if (isTab) {
-            return currentVisibleColumn + (tabSize - (currentVisibleColumn % tabSize));
+            return currentVisibleColumn + (indentSize - (currentVisibleColumn % indentSize));
         }
         return currentVisibleColumn + columnSize;
     }
-    static _normalizeInsertionPoint(model, lines, startLineNumber, tabSize) {
+    static _normalizeInsertionPoint(model, lines, startLineNumber, indentSize) {
         let minVisibleColumn = 1073741824 ;
         let j;
         let lenJ;
@@ -281,13 +281,13 @@ class LineCommentCommand {
             const lineContent = model.getLineContent(startLineNumber + i);
             let currentVisibleColumn = 0;
             for (let j = 0, lenJ = lines[i].commentStrOffset; currentVisibleColumn < minVisibleColumn && j < lenJ; j++) {
-                currentVisibleColumn = LineCommentCommand.nextVisibleColumn(currentVisibleColumn, tabSize, lineContent.charCodeAt(j) === 9 , 1);
+                currentVisibleColumn = LineCommentCommand.nextVisibleColumn(currentVisibleColumn, indentSize, lineContent.charCodeAt(j) === 9 , 1);
             }
             if (currentVisibleColumn < minVisibleColumn) {
                 minVisibleColumn = currentVisibleColumn;
             }
         }
-        minVisibleColumn = Math.floor(minVisibleColumn / tabSize) * tabSize;
+        minVisibleColumn = Math.floor(minVisibleColumn / indentSize) * indentSize;
         for (let i = 0, len = lines.length; i < len; i++) {
             if (lines[i].ignore) {
                 continue;
@@ -295,7 +295,7 @@ class LineCommentCommand {
             const lineContent = model.getLineContent(startLineNumber + i);
             let currentVisibleColumn = 0;
             for (j = 0, lenJ = lines[i].commentStrOffset; currentVisibleColumn < minVisibleColumn && j < lenJ; j++) {
-                currentVisibleColumn = LineCommentCommand.nextVisibleColumn(currentVisibleColumn, tabSize, lineContent.charCodeAt(j) === 9 , 1);
+                currentVisibleColumn = LineCommentCommand.nextVisibleColumn(currentVisibleColumn, indentSize, lineContent.charCodeAt(j) === 9 , 1);
             }
             if (currentVisibleColumn > minVisibleColumn) {
                 lines[i].commentStrOffset = j - 1;

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

@@ -1,14 +1,16 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { reverseOrder, compareBy, numberComparator } from '../../../../base/common/arrays.js';
+import { observableValue } from '../../../../base/common/observableInternal/base.js';
+import '../../../../base/common/observableInternal/derived.js';
+import { autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
+import { observableSignalFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.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();

package/vscode/src/vs/editor/contrib/documentSymbols/browser/outlineModel.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { equals, binarySearch, coalesceInPlace } from '../../../../base/common/arrays.js';
+import { binarySearch, coalesceInPlace, equals } from '../../../../base/common/arrays.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
 import { Iterable } from '../../../../base/common/iterator.js';

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

@@ -1,8 +1,9 @@
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 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';
+import { DefaultTextPasteOrDropEditProvider, DefaultPasteProvidersFeature } from './defaultProviders.js';
 import { localizeWithPath } from '../../../../nls.js';
 registerEditorContribution(CopyPasteController.ID, CopyPasteController, 0 );
 registerEditorFeature(DefaultPasteProvidersFeature);
@@ -17,11 +18,39 @@ registerEditorCommand(new (class extends EditorCommand {
             }
         });
     }
-    runEditorCommand(_accessor, editor, _args) {
+    runEditorCommand(_accessor, editor) {
         return CopyPasteController.get(editor)?.changePasteType();
     }
 }));
-registerEditorAction(class extends EditorAction {
+registerEditorCommand(new (class extends EditorCommand {
+    constructor() {
+        super({
+            id: 'editor.hidePasteWidget',
+            precondition: pasteWidgetVisibleCtx,
+            kbOpts: {
+                weight: 100 ,
+                primary: 9 ,
+            }
+        });
+    }
+    runEditorCommand(_accessor, editor) {
+        CopyPasteController.get(editor)?.clearWidgets();
+    }
+}));
+registerEditorAction(class PasteAsAction extends EditorAction {
+    static { this.argsSchema = {
+        type: 'object',
+        properties: {
+            kind: {
+                type: 'string',
+                description: ( localizeWithPath(
+                    'vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution',
+                    'pasteAs.kind',
+                    "The kind of the paste edit to try applying. If not provided or there are multiple edits for this kind, the editor will show a picker."
+                )),
+            }
+        },
+    }; }
     constructor() {
         super({
             id: 'editor.action.pasteAs',
@@ -36,26 +65,17 @@ registerEditorAction(class extends EditorAction {
                 description: 'Paste as',
                 args: [{
                         name: 'args',
-                        schema: {
-                            type: 'object',
-                            properties: {
-                                'id': {
-                                    type: 'string',
-                                    description: ( localizeWithPath(
-                                        'vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution',
-                                        'pasteAs.id',
-                                        "The id of the paste edit to try applying. If not provided, the editor will show a picker."
-                                    )),
-                                }
-                            },
-                        }
+                        schema: PasteAsAction.argsSchema
                     }]
             }
         });
     }
     run(_accessor, editor, args) {
-        const id = typeof args?.id === 'string' ? args.id : undefined;
-        return CopyPasteController.get(editor)?.pasteAs(id);
+        let kind = typeof args?.kind === 'string' ? args.kind : undefined;
+        if (!kind && args) {
+            kind = typeof args.id === 'string' ? args.id : undefined;
+        }
+        return CopyPasteController.get(editor)?.pasteAs(kind ? ( new HierarchicalKind(kind)) : undefined);
     }
 });
 registerEditorAction(class extends EditorAction {
@@ -71,7 +91,7 @@ registerEditorAction(class extends EditorAction {
             precondition: EditorContextKeys.writable,
         });
     }
-    run(_accessor, editor, args) {
-        return CopyPasteController.get(editor)?.pasteAs('text');
+    run(_accessor, editor) {
+        return CopyPasteController.get(editor)?.pasteAs({ providerId: DefaultTextPasteOrDropEditProvider.id });
     }
 });

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

@@ -3,6 +3,7 @@ import { addDisposableListener, getActiveDocument } from '../../../../base/brows
 import { coalesce } from '../../../../base/common/arrays.js';
 import { createCancelablePromise, raceCancellation } from '../../../../base/common/async.js';
 import { matchesMimeType, createStringDataTransferItem, UriList } from '../../../../base/common/dataTransfer.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { Mimes } from '../../../../base/common/mime.js';
 import { isWeb, isWindows } from '../../../../base/common/platform.js';
@@ -11,10 +12,13 @@ import { ClipboardEventUtils } from '../../../browser/controller/textAreaInput.j
 import { toVSDataTransfer, toExternalVSDataTransfer } from '../../../browser/dnd.js';
 import { IBulkEditService } from '../../../browser/services/bulkEditService.js';
 import { Range } from '../../../common/core/range.js';
+import { DocumentPasteTriggerKind } from '../../../common/languages.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { DefaultTextPasteOrDropEditProvider } from './defaultProviders.js';
 import { sortEditsByYieldTo, createCombinedWorkspaceEdit } from './edit.js';
 import { EditorStateCancellationTokenSource } from '../../editorState/browser/editorState.js';
 import { InlineProgressManager } from '../../inlineProgress/browser/inlineProgress.js';
+import { MessageController } from '../../message/browser/messageController.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
@@ -22,7 +26,6 @@ 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(
@@ -59,10 +62,10 @@ let CopyPasteController = class CopyPasteController extends Disposable {
     changePasteType() {
         this._postPasteWidgetManager.tryShowSelector();
     }
-    pasteAs(preferredId) {
+    pasteAs(preferred) {
         this._editor.focus();
         try {
-            this._pasteAsActionContext = { preferredId };
+            this._pasteAsActionContext = { preferred };
             getActiveDocument().execCommand('paste');
         }
         finally {
@@ -148,8 +151,8 @@ let CopyPasteController = class CopyPasteController extends Disposable {
             }
             return dataTransfer;
         });
-        this._currentCopyOperation?.dataTransferPromise.cancel();
-        this._currentCopyOperation = { handle: handle, dataTransferPromise: promise };
+        CopyPasteController_1._currentCopyOperation?.dataTransferPromise.cancel();
+        CopyPasteController_1._currentCopyOperation = { handle: handle, dataTransferPromise: promise };
     }
     async handlePaste(e) {
         if (!e.clipboardData || !this._editor.hasTextFocus()) {
@@ -179,37 +182,38 @@ let CopyPasteController = class CopyPasteController extends Disposable {
         const allProviders = this._languageFeaturesService.documentPasteEditProvider
             .ordered(model)
             .filter(provider => {
-            if (this._pasteAsActionContext?.preferredId) {
-                if (this._pasteAsActionContext.preferredId !== provider.id) {
+            const preference = this._pasteAsActionContext?.preferred;
+            if (preference) {
+                if (provider.providedPasteEditKinds && !this.providerMatchesPreference(provider, preference)) {
                     return false;
                 }
             }
             return provider.pasteMimeTypes?.some(type => matchesMimeType(type, allPotentialMimeTypes));
         });
         if (!allProviders.length) {
-            if (this._pasteAsActionContext?.preferredId) {
-                this.showPasteAsNoEditMessage(selections, this._pasteAsActionContext?.preferredId);
+            if (this._pasteAsActionContext?.preferred) {
+                this.showPasteAsNoEditMessage(selections, this._pasteAsActionContext.preferred);
             }
             return;
         }
         e.preventDefault();
         e.stopImmediatePropagation();
         if (this._pasteAsActionContext) {
-            this.showPasteAsPick(this._pasteAsActionContext.preferredId, allProviders, selections, dataTransfer, metadata, { trigger: 'explicit', only: this._pasteAsActionContext.preferredId });
+            this.showPasteAsPick(this._pasteAsActionContext.preferred, allProviders, selections, dataTransfer, metadata);
         }
         else {
-            this.doPasteInline(allProviders, selections, dataTransfer, metadata, { trigger: 'implicit' });
+            this.doPasteInline(allProviders, selections, dataTransfer, metadata, e);
         }
     }
-    showPasteAsNoEditMessage(selections, editId) {
+    showPasteAsNoEditMessage(selections, preference) {
         MessageController.get(this._editor)?.showMessage(( localizeWithPath(
             'vs/editor/contrib/dropOrPasteInto/browser/copyPasteController',
             'pasteAsError',
             "No paste edits for '{0}' found",
-            editId
+            preference instanceof HierarchicalKind ? preference.value : preference.providerId
         )), selections[0].getStartPosition());
     }
-    doPasteInline(allProviders, selections, dataTransfer, metadata, context) {
+    doPasteInline(allProviders, selections, dataTransfer, metadata, clipboardEvent) {
         const p = createCancelablePromise(async (token) => {
             const editor = this._editor;
             if (!editor.hasModel()) {
@@ -227,26 +231,33 @@ let CopyPasteController = class CopyPasteController extends Disposable {
                 if (tokenSource.token.isCancellationRequested) {
                     return;
                 }
-                const supportedProviders = allProviders.filter(provider => isSupportedPasteProvider(provider, dataTransfer));
+                const supportedProviders = allProviders.filter(provider => this.isSupportedPasteProvider(provider, dataTransfer));
                 if (!supportedProviders.length
-                    || (supportedProviders.length === 1 && supportedProviders[0].id === 'text')
+                    || (supportedProviders.length === 1 && supportedProviders[0] instanceof DefaultTextPasteOrDropEditProvider)
                 ) {
-                    await this.applyDefaultPasteHandler(dataTransfer, metadata, tokenSource.token);
-                    return;
+                    return this.applyDefaultPasteHandler(dataTransfer, metadata, tokenSource.token, clipboardEvent);
                 }
+                const context = {
+                    triggerKind: DocumentPasteTriggerKind.Automatic,
+                };
                 const providerEdits = await this.getPasteEdits(supportedProviders, dataTransfer, model, selections, context, tokenSource.token);
                 if (tokenSource.token.isCancellationRequested) {
                     return;
                 }
-                if (providerEdits.length === 1 && providerEdits[0].providerId === 'text') {
-                    await this.applyDefaultPasteHandler(dataTransfer, metadata, tokenSource.token);
-                    return;
+                if (providerEdits.length === 1 && providerEdits[0].provider instanceof DefaultTextPasteOrDropEditProvider) {
+                    return this.applyDefaultPasteHandler(dataTransfer, metadata, tokenSource.token, clipboardEvent);
                 }
                 if (providerEdits.length) {
                     const canShowWidget = editor.getOption(85 ).showPasteSelector === 'afterPaste';
-                    return this._postPasteWidgetManager.applyEditAndShowIfNeeded(selections, { activeEditIndex: 0, allEdits: providerEdits }, canShowWidget, tokenSource.token);
+                    return this._postPasteWidgetManager.applyEditAndShowIfNeeded(selections, { activeEditIndex: 0, allEdits: providerEdits }, canShowWidget, async (edit, token) => {
+                        const resolved = await edit.provider.resolveDocumentPasteEdit?.(edit, token);
+                        if (resolved) {
+                            edit.additionalEdit = resolved.additionalEdit;
+                        }
+                        return edit;
+                    }, tokenSource.token);
                 }
-                await this.applyDefaultPasteHandler(dataTransfer, metadata, tokenSource.token);
+                await this.applyDefaultPasteHandler(dataTransfer, metadata, tokenSource.token, clipboardEvent);
             }
             finally {
                 tokenSource.dispose();
@@ -262,7 +273,7 @@ let CopyPasteController = class CopyPasteController extends Disposable {
         )), p);
         this._currentPasteOperation = p;
     }
-    showPasteAsPick(preferredId, allProviders, selections, dataTransfer, metadata, context) {
+    showPasteAsPick(preference, allProviders, selections, dataTransfer, metadata) {
         const p = createCancelablePromise(async (token) => {
             const editor = this._editor;
             if (!editor.hasModel()) {
@@ -280,14 +291,28 @@ let CopyPasteController = class CopyPasteController extends Disposable {
                 if (tokenSource.token.isCancellationRequested) {
                     return;
                 }
-                let supportedProviders = allProviders.filter(provider => isSupportedPasteProvider(provider, dataTransfer));
-                if (preferredId) {
-                    supportedProviders = supportedProviders.filter(edit => edit.id === preferredId);
+                let supportedProviders = allProviders.filter(provider => this.isSupportedPasteProvider(provider, dataTransfer, preference));
+                if (preference) {
+                    supportedProviders = supportedProviders.filter(provider => this.providerMatchesPreference(provider, preference));
                 }
-                const providerEdits = await this.getPasteEdits(supportedProviders, dataTransfer, model, selections, context, tokenSource.token);
+                const context = {
+                    triggerKind: DocumentPasteTriggerKind.PasteAs,
+                    only: preference && preference instanceof HierarchicalKind ? preference : undefined,
+                };
+                let providerEdits = await this.getPasteEdits(supportedProviders, dataTransfer, model, selections, context, tokenSource.token);
                 if (tokenSource.token.isCancellationRequested) {
                     return;
                 }
+                if (preference) {
+                    providerEdits = providerEdits.filter(edit => {
+                        if (preference instanceof HierarchicalKind) {
+                            return preference.contains(edit.kind);
+                        }
+                        else {
+                            return preference.providerId === edit.provider.id;
+                        }
+                    });
+                }
                 if (!providerEdits.length) {
                     if (context.only) {
                         this.showPasteAsNoEditMessage(selections, context.only);
@@ -295,14 +320,13 @@ let CopyPasteController = class CopyPasteController extends Disposable {
                     return;
                 }
                 let pickedEdit;
-                if (preferredId) {
+                if (preference) {
                     pickedEdit = providerEdits.at(0);
                 }
                 else {
                     const selected = await this._quickInputService.pick(( providerEdits.map((edit) => ({
-                        label: edit.label,
-                        description: edit.providerId,
-                        detail: edit.detail,
+                        label: edit.title,
+                        description: edit.kind?.value,
                         edit,
                     }))), {
                         placeHolder: ( localizeWithPath(
@@ -364,8 +388,8 @@ let CopyPasteController = class CopyPasteController extends Disposable {
         return undefined;
     }
     async mergeInDataFromCopy(dataTransfer, metadata, token) {
-        if (metadata?.id && this._currentCopyOperation?.handle === metadata.id) {
-            const toMergeDataTransfer = await this._currentCopyOperation.dataTransferPromise;
+        if (metadata?.id && CopyPasteController_1._currentCopyOperation?.handle === metadata.id) {
+            const toMergeDataTransfer = await CopyPasteController_1._currentCopyOperation.dataTransferPromise;
             if (token.isCancellationRequested) {
                 return;
             }
@@ -386,29 +410,27 @@ let CopyPasteController = class CopyPasteController extends Disposable {
     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, context, token);
-                if (edit) {
-                    return { ...edit, providerId: provider.id };
-                }
+                const edits = await provider.provideDocumentPasteEdits?.(model, selections, dataTransfer, context, token);
+                return edits?.edits?.map(edit => ({ ...edit, provider }));
             }
             catch (err) {
                 console.error(err);
             }
             return undefined;
         }))), token);
-        const edits = coalesce(results ?? []);
+        const edits = coalesce(results ?? []).flat().filter(edit => {
+            return !context.only || context.only.contains(edit.kind);
+        });
         return sortEditsByYieldTo(edits);
     }
-    async applyDefaultPasteHandler(dataTransfer, metadata, token) {
+    async applyDefaultPasteHandler(dataTransfer, metadata, token, clipboardEvent) {
         const textDataTransfer = dataTransfer.get(Mimes.text) ?? dataTransfer.get('text');
-        if (!textDataTransfer) {
-            return;
-        }
-        const text = await textDataTransfer.asString();
+        const text = (await textDataTransfer?.asString()) ?? '';
         if (token.isCancellationRequested) {
             return;
         }
         const payload = {
+            clipboardEvent,
             text,
             pasteOnNewLine: metadata?.defaultPastePayload.pasteOnNewLine ?? false,
             multicursorText: metadata?.defaultPastePayload.multicursorText ?? null,
@@ -416,6 +438,23 @@ let CopyPasteController = class CopyPasteController extends Disposable {
         };
         this._editor.trigger('keyboard', "paste" , payload);
     }
+    isSupportedPasteProvider(provider, dataTransfer, preference) {
+        if (!provider.pasteMimeTypes?.some(type => dataTransfer.matches(type))) {
+            return false;
+        }
+        return !preference || this.providerMatchesPreference(provider, preference);
+    }
+    providerMatchesPreference(provider, preference) {
+        if (preference instanceof HierarchicalKind) {
+            if (!provider.providedPasteEditKinds) {
+                return true;
+            }
+            return ( provider.providedPasteEditKinds.some(providedKind => preference.contains(providedKind)));
+        }
+        else {
+            return provider.id === preference.providerId;
+        }
+    }
 };
 CopyPasteController = CopyPasteController_1 = ( __decorate([
     ( __param(1, IInstantiationService)),
@@ -425,7 +464,4 @@ CopyPasteController = CopyPasteController_1 = ( __decorate([
     ( __param(5, IQuickInputService)),
     ( __param(6, IProgressService))
 ], CopyPasteController));
-function isSupportedPasteProvider(provider, dataTransfer) {
-    return Boolean(provider.pasteMimeTypes?.some(type => dataTransfer.matches(type)));
-}
 export { CopyPasteController, changePasteTypeCommandId, pasteWidgetVisibleCtx };

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

@@ -1,36 +1,42 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { coalesce } from '../../../../base/common/arrays.js';
 import { UriList } from '../../../../base/common/dataTransfer.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { Mimes } from '../../../../base/common/mime.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { relativePath } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
+import { DocumentPasteTriggerKind } from '../../../common/languages.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
-const builtInLabel = ( localizeWithPath(
-    'vs/editor/contrib/dropOrPasteInto/browser/defaultProviders',
-    'builtIn',
-    'Built-in'
-));
 class SimplePasteAndDropProvider {
     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;
+        if (!edit) {
+            return undefined;
+        }
+        return {
+            dispose() { },
+            edits: [{ insertText: edit.insertText, title: edit.title, kind: edit.kind, handledMimeType: edit.handledMimeType, yieldTo: edit.yieldTo }]
+        };
     }
     async provideDocumentOnDropEdits(_model, _position, dataTransfer, token) {
         const edit = await this.getEdit(dataTransfer, token);
-        return edit ? { insertText: edit.insertText, label: edit.label, handledMimeType: edit.handledMimeType, yieldTo: edit.yieldTo } : undefined;
+        return edit ? [{ insertText: edit.insertText, title: edit.title, kind: edit.kind, handledMimeType: edit.handledMimeType, yieldTo: edit.yieldTo }] : undefined;
     }
 }
-class DefaultTextProvider extends SimplePasteAndDropProvider {
+class DefaultTextPasteOrDropEditProvider extends SimplePasteAndDropProvider {
     constructor() {
         super(...arguments);
-        this.id = 'text';
+        this.id = DefaultTextPasteOrDropEditProvider.id;
+        this.kind = DefaultTextPasteOrDropEditProvider.kind;
         this.dropMimeTypes = [Mimes.text];
         this.pasteMimeTypes = [Mimes.text];
     }
+    static { this.id = 'text'; }
+    static { this.kind = ( new HierarchicalKind('text.plain')); }
     async getEdit(dataTransfer, _token) {
         const textEntry = dataTransfer.get(Mimes.text);
         if (!textEntry) {
@@ -42,20 +48,20 @@ class DefaultTextProvider extends SimplePasteAndDropProvider {
         const insertText = await textEntry.asString();
         return {
             handledMimeType: Mimes.text,
-            label: ( localizeWithPath(
+            title: ( localizeWithPath(
                 'vs/editor/contrib/dropOrPasteInto/browser/defaultProviders',
                 'text.label',
                 "Insert Plain Text"
             )),
-            detail: builtInLabel,
-            insertText
+            insertText,
+            kind: this.kind,
         };
     }
 }
 class PathProvider extends SimplePasteAndDropProvider {
     constructor() {
         super(...arguments);
-        this.id = 'uri';
+        this.kind = ( new HierarchicalKind('uri.absolute'));
         this.dropMimeTypes = [Mimes.uriList];
         this.pasteMimeTypes = [Mimes.uriList];
     }
@@ -106,8 +112,8 @@ class PathProvider extends SimplePasteAndDropProvider {
         return {
             handledMimeType: Mimes.uriList,
             insertText,
-            label,
-            detail: builtInLabel,
+            title: label,
+            kind: this.kind,
         };
     }
 }
@@ -115,7 +121,7 @@ let RelativePathProvider = class RelativePathProvider extends SimplePasteAndDrop
     constructor(_workspaceContextService) {
         super();
         this._workspaceContextService = _workspaceContextService;
-        this.id = 'relativePath';
+        this.kind = ( new HierarchicalKind('uri.relative'));
         this.dropMimeTypes = [Mimes.uriList];
         this.pasteMimeTypes = [Mimes.uriList];
     }
@@ -134,7 +140,7 @@ let RelativePathProvider = class RelativePathProvider extends SimplePasteAndDrop
         return {
             handledMimeType: Mimes.uriList,
             insertText: relativeUris.join(' '),
-            label: entries.length > 1
+            title: entries.length > 1
                 ? ( localizeWithPath(
                 'vs/editor/contrib/dropOrPasteInto/browser/defaultProviders',
                 'defaultDropProvider.uriList.relativePaths',
@@ -145,7 +151,7 @@ let RelativePathProvider = class RelativePathProvider extends SimplePasteAndDrop
                 'defaultDropProvider.uriList.relativePath',
                 "Insert Relative Path"
             )),
-            detail: builtInLabel,
+            kind: this.kind,
         };
     }
 };
@@ -154,12 +160,12 @@ RelativePathProvider = ( __decorate([
 ], RelativePathProvider));
 class PasteHtmlProvider {
     constructor() {
-        this.id = 'html';
+        this.kind = ( new HierarchicalKind('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) {
+        if (context.triggerKind !== DocumentPasteTriggerKind.PasteAs && !context.only?.contains(this.kind)) {
             return;
         }
         const entry = dataTransfer.get('text/html');
@@ -168,14 +174,17 @@ class PasteHtmlProvider {
             return;
         }
         return {
-            insertText: htmlText,
-            yieldTo: this._yieldTo,
-            label: ( localizeWithPath(
-                'vs/editor/contrib/dropOrPasteInto/browser/defaultProviders',
-                'pasteHtmlLabel',
-                'Insert HTML'
-            )),
-            detail: builtInLabel,
+            dispose() { },
+            edits: [{
+                    insertText: htmlText,
+                    yieldTo: this._yieldTo,
+                    title: ( localizeWithPath(
+                        'vs/editor/contrib/dropOrPasteInto/browser/defaultProviders',
+                        'pasteHtmlLabel',
+                        'Insert HTML'
+                    )),
+                    kind: this.kind,
+                }],
         };
     }
 }
@@ -198,7 +207,7 @@ async function extractUriList(dataTransfer) {
 let DefaultDropProvidersFeature = class DefaultDropProvidersFeature extends Disposable {
     constructor(languageFeaturesService, workspaceContextService) {
         super();
-        this._register(languageFeaturesService.documentOnDropEditProvider.register('*', ( new DefaultTextProvider())));
+        this._register(languageFeaturesService.documentOnDropEditProvider.register('*', ( new DefaultTextPasteOrDropEditProvider())));
         this._register(languageFeaturesService.documentOnDropEditProvider.register('*', ( new PathProvider())));
         this._register(languageFeaturesService.documentOnDropEditProvider.register('*', ( new RelativePathProvider(workspaceContextService))));
     }
@@ -210,7 +219,7 @@ DefaultDropProvidersFeature = ( __decorate([
 let DefaultPasteProvidersFeature = class DefaultPasteProvidersFeature extends Disposable {
     constructor(languageFeaturesService, workspaceContextService) {
         super();
-        this._register(languageFeaturesService.documentPasteEditProvider.register('*', ( new DefaultTextProvider())));
+        this._register(languageFeaturesService.documentPasteEditProvider.register('*', ( new DefaultTextPasteOrDropEditProvider())));
         this._register(languageFeaturesService.documentPasteEditProvider.register('*', ( new PathProvider())));
         this._register(languageFeaturesService.documentPasteEditProvider.register('*', ( new RelativePathProvider(workspaceContextService))));
         this._register(languageFeaturesService.documentPasteEditProvider.register('*', ( new PasteHtmlProvider())));
@@ -220,4 +229,4 @@ DefaultPasteProvidersFeature = ( __decorate([
     ( __param(0, ILanguageFeaturesService)),
     ( __param(1, IWorkspaceContextService))
 ], DefaultPasteProvidersFeature));
-export { DefaultDropProvidersFeature, DefaultPasteProvidersFeature };
+export { DefaultDropProvidersFeature, DefaultPasteProvidersFeature, DefaultTextPasteOrDropEditProvider };