Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-15 07:28:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clear selection on paste edit apply (#202049)

Browse Source 
Switches to use a snippet to ensure that existing editor selections are cleared when paste edits are applied
This commit is contained in:
Matt Bierner
2024-01-08 22:51:28 -08:00
committed by GitHub
parent 284e949dac
commit 06bad2c05f
3 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts
View File

@@ -378,7 +378,6 @@ export class CopyPasteController extends Disposable implements IEditorContributi
}, () => p); }, () => p);
} }
private setCopyMetadata(dataTransfer: DataTransfer, metadata: CopyMetadata) { private setCopyMetadata(dataTransfer: DataTransfer, metadata: CopyMetadata) {
dataTransfer.setData(vscodeClipboardMime, JSON.stringify(metadata)); dataTransfer.setData(vscodeClipboardMime, JSON.stringify(metadata));
} }

16
src/vs/editor/contrib/dropOrPasteInto/browser/edit.ts
View File

@@ -7,6 +7,7 @@ import { URI } from 'vs/base/common/uri';
import { ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService'; import { ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
import { DropYieldTo, WorkspaceEdit } from 'vs/editor/common/languages'; import { DropYieldTo, WorkspaceEdit } from 'vs/editor/common/languages';
import { Range } from 'vs/editor/common/core/range'; import { Range } from 'vs/editor/common/core/range';
import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
export interface DropOrPasteEdit { export interface DropOrPasteEdit {
readonly label: string; readonly label: string;
@@ -14,14 +15,23 @@ export interface DropOrPasteEdit {
readonly additionalEdit?: WorkspaceEdit; readonly additionalEdit?: WorkspaceEdit;
} }
/**
* Given a {@link DropOrPasteEdit} and set of ranges, creates a {@link WorkspaceEdit} that applies the insert text from
* the {@link DropOrPasteEdit} at each range plus any additional edits.
*/
export function createCombinedWorkspaceEdit(uri: URI, ranges: readonly Range[], edit: DropOrPasteEdit): WorkspaceEdit { export function createCombinedWorkspaceEdit(uri: URI, ranges: readonly Range[], edit: DropOrPasteEdit): WorkspaceEdit {
// If the edit insert text is empty, skip applying at each range
if (typeof edit.insertText === 'string' ? edit.insertText === '' : edit.insertText.snippet === '') {
return {
edits: edit.additionalEdit?.edits ?? []
};
}
return { return {
edits: [ edits: [
...ranges.map(range => ...ranges.map(range =>
new ResourceTextEdit(uri, new ResourceTextEdit(uri,
typeof edit.insertText === 'string' { range, text: typeof edit.insertText === 'string' ? SnippetParser.escape(edit.insertText) + '$0' : edit.insertText.snippet, insertAsSnippet: true }
? { range, text: edit.insertText, insertAsSnippet: false }
: { range, text: edit.insertText.snippet, insertAsSnippet: true }
)), )),
...(edit.additionalEdit?.edits ?? []) ...(edit.additionalEdit?.edits ?? [])
] ]

23
src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.ts
View File

@@ -11,10 +11,11 @@ import { Event } from 'vs/base/common/event';
import { Disposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { Disposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
import 'vs/css!./postEditWidget'; import 'vs/css!./postEditWidget';
import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser'; import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
import { IBulkEditResult, IBulkEditService, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService'; import { IBulkEditResult, IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
import { Range } from 'vs/editor/common/core/range'; import { Range } from 'vs/editor/common/core/range';
import { WorkspaceEdit } from 'vs/editor/common/languages'; import { WorkspaceEdit } from 'vs/editor/common/languages';
import { TrackedRangeStickiness } from 'vs/editor/common/model'; import { TrackedRangeStickiness } from 'vs/editor/common/model';
import { createCombinedWorkspaceEdit } from 'vs/editor/contrib/dropOrPasteInto/browser/edit';
import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey'; import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -166,25 +167,7 @@ export class PostEditWidgetManager extends Disposable {
return; return;
} }
let insertTextEdit: ResourceTextEdit[] = []; const combinedWorkspaceEdit = createCombinedWorkspaceEdit(model.uri, ranges, edit);
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: WorkspaceEdit = {
edits: allEdits
};
// Use a decoration to track edits around the trigger range // Use a decoration to track edits around the trigger range
const primaryRange = ranges[0]; const primaryRange = ranges[0];