show preview only for rename

jrieken · jrieken · commit 3e6ba164cce3 · 2020-01-10T07:00:00.000+01:00
diff --git a/src/vs/editor/browser/services/bulkEditService.ts b/src/vs/editor/browser/services/bulkEditService.ts
@@ -14,7 +14,7 @@ export const IBulkEditService = createDecorator<IBulkEditService>('IWorkspaceEdi
 export interface IBulkEditOptions {
 	editor?: ICodeEditor;
 	progress?: IProgress<IProgressStep>;
-	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
@@ -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
@@ -217,7 +217,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 
 	$tryApplyWorkspaceEdit(dto: IWorkspaceEditDto): Promise<boolean> {
 		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<boolean> {
diff --git 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<IProgressStep>, resource?: URI): Promise<any>;
 	replace(arg: any, progress: IProgress<IProgressStep> | undefined = undefined, resource: URI | null = null): Promise<any> {
 		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<any> {
diff --git 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<IBulkEditResult> {
 
-		if (this._previewHandler && !options?.noPreview) {
+		if (this._previewHandler && options?.showPreview) {
 			edit = await this._previewHandler(edit, options);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export const IBulkEditService = createDecorator<IBulkEditService>('IWorkspaceEdi`
`14`	`14`	`export interface IBulkEditOptions {`
`15`	`15`	`editor?: ICodeEditor;`
`16`	`16`	`progress?: IProgress<IProgressStep>;`
`17`		`- noPreview?: boolean;`
	`17`	`+ showPreview?: boolean;`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`export interface IBulkEditResult {`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {`
`217`	`217`
`218`	`218`	`$tryApplyWorkspaceEdit(dto: IWorkspaceEditDto): Promise<boolean> {`
`219`	`219`	`const { edits } = reviveWorkspaceEditDto(dto);`
`220`		`- return this._bulkEditService.apply({ edits }, { noPreview: false }).then(() => true, err => false);`
	`220`	`+ return this._bulkEditService.apply({ edits }).then(() => true, _err => false);`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`$tryInsertSnippet(id: string, template: string, ranges: readonly IRange[], opts: IUndoStopOptions): Promise<boolean> {`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ export class ReplaceService implements IReplaceService {`
`105`	`105`	`replace(match: FileMatchOrMatch, progress?: IProgress<IProgressStep>, resource?: URI): Promise<any>;`
`106`	`106`	`replace(arg: any, progress: IProgress<IProgressStep> \| undefined = undefined, resource: URI \| null = null): Promise<any> {`
`107`	`107`	`const edits: ResourceTextEdit[] = this.createEdits(arg, resource);`
`108`		`- return this.bulkEditorService.apply({ edits }, { progress, noPreview: true }).then(() => this.textFileService.saveAll(edits.map(e => e.resource)));`
	`108`	`+ return this.bulkEditorService.apply({ edits }, { progress }).then(() => this.textFileService.saveAll(edits.map(e => e.resource)));`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`openReplacePreview(element: FileMatchOrMatch, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): Promise<any> {`
Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ export class BulkEditService implements IBulkEditService {`
`406`	`406`
`407`	`407`	`async apply(edit: WorkspaceEdit, options?: IBulkEditOptions): Promise<IBulkEditResult> {`
`408`	`408`
`409`		`- if (this._previewHandler && !options?.noPreview) {`
	`409`	`+ if (this._previewHandler && options?.showPreview) {`
`410`	`410`	`edit = await this._previewHandler(edit, options);`
`411`	`411`	`}`
`412`	`412`