From 3e6ba164cce3f643b560eef8dbcf5ec32a4e22ca Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 10 Jan 2020 07:00:00 +0100 Subject: [PATCH] show preview only for rename --- src/vs/editor/browser/services/bulkEditService.ts | 2 +- src/vs/editor/contrib/rename/rename.ts | 2 +- src/vs/workbench/api/browser/mainThreadEditors.ts | 2 +- src/vs/workbench/contrib/search/browser/replaceService.ts | 2 +- src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vs/editor/browser/services/bulkEditService.ts b/src/vs/editor/browser/services/bulkEditService.ts index 7c433166856..0aecb86edfa 100644 --- a/src/vs/editor/browser/services/bulkEditService.ts +++ b/src/vs/editor/browser/services/bulkEditService.ts @@ -14,7 +14,7 @@ export const IBulkEditService = createDecorator('IWorkspaceEdi export interface IBulkEditOptions { editor?: ICodeEditor; progress?: IProgress; - noPreview?: boolean; + showPreview?: boolean; } export interface IBulkEditResult { diff --git a/src/vs/editor/contrib/rename/rename.ts b/src/vs/editor/contrib/rename/rename.ts index 29b4bb8f7cf..20ef921a6c1 100644 --- a/src/vs/editor/contrib/rename/rename.ts +++ b/src/vs/editor/contrib/rename/rename.ts @@ -200,7 +200,7 @@ class RenameController implements IEditorContribution { this._bulkEditService.apply(renameResult, { editor: this.editor, - noPreview: !inputFieldResult.wantsPreview + showPreview: inputFieldResult.wantsPreview }).then(result => { if (result.ariaSummary) { alert(nls.localize('aria', "Successfully renamed '{0}' to '{1}'. Summary: {2}", loc!.text, inputFieldResult.newName, result.ariaSummary)); diff --git a/src/vs/workbench/api/browser/mainThreadEditors.ts b/src/vs/workbench/api/browser/mainThreadEditors.ts index 421201a9c64..8dd058290d0 100644 --- a/src/vs/workbench/api/browser/mainThreadEditors.ts +++ b/src/vs/workbench/api/browser/mainThreadEditors.ts @@ -217,7 +217,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape { $tryApplyWorkspaceEdit(dto: IWorkspaceEditDto): Promise { const { edits } = reviveWorkspaceEditDto(dto); - return this._bulkEditService.apply({ edits }, { noPreview: false }).then(() => true, err => false); + return this._bulkEditService.apply({ edits }).then(() => true, _err => false); } $tryInsertSnippet(id: string, template: string, ranges: readonly IRange[], opts: IUndoStopOptions): Promise { diff --git a/src/vs/workbench/contrib/search/browser/replaceService.ts b/src/vs/workbench/contrib/search/browser/replaceService.ts index 92a9cf4b56b..bc7e14ab2e2 100644 --- a/src/vs/workbench/contrib/search/browser/replaceService.ts +++ b/src/vs/workbench/contrib/search/browser/replaceService.ts @@ -105,7 +105,7 @@ export class ReplaceService implements IReplaceService { replace(match: FileMatchOrMatch, progress?: IProgress, resource?: URI): Promise; replace(arg: any, progress: IProgress | undefined = undefined, resource: URI | null = null): Promise { const edits: ResourceTextEdit[] = this.createEdits(arg, resource); - return this.bulkEditorService.apply({ edits }, { progress, noPreview: true }).then(() => this.textFileService.saveAll(edits.map(e => e.resource))); + return this.bulkEditorService.apply({ edits }, { progress }).then(() => this.textFileService.saveAll(edits.map(e => e.resource))); } openReplacePreview(element: FileMatchOrMatch, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): Promise { diff --git a/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts b/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts index 7d543daaadd..5808f9a78fd 100644 --- a/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts +++ b/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts @@ -406,7 +406,7 @@ export class BulkEditService implements IBulkEditService { async apply(edit: WorkspaceEdit, options?: IBulkEditOptions): Promise { - if (this._previewHandler && !options?.noPreview) { + if (this._previewHandler && options?.showPreview) { edit = await this._previewHandler(edit, options); }