Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix paste behavior across editors that have pasteAs enabled/disabled #187626

Merged
merged 1 commit into from
Jul 11, 2023
Merged

Fix paste behavior across editors that have pasteAs enabled/disabled #187626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/vs/editor/browser/controller/textAreaInput.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,9 +650,9 @@ export class TextAreaInput extends Disposable {
}
}

class ClipboardEventUtils {
export const ClipboardEventUtils = {

public static getTextData(clipboardData: DataTransfer): [string, ClipboardStoredMetadata | null] {
getTextData(clipboardData: DataTransfer): [string, ClipboardStoredMetadata | null] {
const text = clipboardData.getData(Mimes.text);
let metadata: ClipboardStoredMetadata | null = null;
const rawmetadata = clipboardData.getData('vscode-editor-data');
Expand All @@ -674,16 +674,16 @@ class ClipboardEventUtils {
}

return [text, metadata];
}
},

public static setTextData(clipboardData: DataTransfer, text: string, html: string | null | undefined, metadata: ClipboardStoredMetadata): void {
setTextData(clipboardData: DataTransfer, text: string, html: string | null | undefined, metadata: ClipboardStoredMetadata): void {
clipboardData.setData(Mimes.text, text);
if (typeof html === 'string') {
clipboardData.setData('text/html', html);
}
clipboardData.setData('vscode-editor-data', JSON.stringify(metadata));
}
}
};

export class TextAreaWrapper extends Disposable implements ICompleteTextAreaWrapper {

Expand Down
26 changes: 23 additions & 3 deletions src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ import { UriList, VSDataTransfer, createStringDataTransferItem, matchesMimeType
import { Disposable } from 'vs/base/common/lifecycle';
import { Mimes } from 'vs/base/common/mime';
import * as platform from 'vs/base/common/platform';
import { withUndefinedAsNull } from 'vs/base/common/types';
import { generateUuid } from 'vs/base/common/uuid';
import { ClipboardEventUtils } from 'vs/editor/browser/controller/textAreaInput';
import { toExternalVSDataTransfer, toVSDataTransfer } from 'vs/editor/browser/dnd';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
Expand Down Expand Up @@ -220,7 +222,7 @@ export class CopyPasteController extends Disposable implements IEditorContributi
return;
}

const metadata = this.fetchCopyMetadata(e.clipboardData);
const metadata = this.fetchCopyMetadata(e);
const dataTransfer = toExternalVSDataTransfer(e.clipboardData);
dataTransfer.delete(vscodeClipboardMime);

Expand Down Expand Up @@ -375,15 +377,33 @@ export class CopyPasteController extends Disposable implements IEditorContributi
dataTransfer.setData(vscodeClipboardMime, JSON.stringify(metadata));
}

private fetchCopyMetadata(dataTransfer: DataTransfer): CopyMetadata | undefined {
const rawMetadata = dataTransfer.getData(vscodeClipboardMime);
private fetchCopyMetadata(e: ClipboardEvent): CopyMetadata | undefined {
if (!e.clipboardData) {
return;
}

// Prefer using the clipboard data we saved off
const rawMetadata = e.clipboardData.getData(vscodeClipboardMime);
if (rawMetadata) {
try {
return JSON.parse(rawMetadata);
} catch {
return undefined;
}
}

// Otherwise try to extract the generic text editor metadata
const [_, metadata] = ClipboardEventUtils.getTextData(e.clipboardData);
if (metadata) {
return {
defaultPastePayload: {
mode: metadata.mode,
multicursorText: withUndefinedAsNull(metadata.multicursorText),
pasteOnNewLine: !!metadata.isFromEmptySelection,
},
};
}

return undefined;
}

Expand Down