fix microsoft#89499

jrieken · jrieken · commit 186a5bfe694f · 2020-02-03T11:49:30.000+01:00
diff --git a/src/vs/editor/browser/services/bulkEditService.ts b/src/vs/editor/browser/services/bulkEditService.ts
@@ -27,6 +27,8 @@ export type IBulkEditPreviewHandler = (edit: WorkspaceEdit, options?: IBulkEditO
 export interface IBulkEditService {
 	_serviceBrand: undefined;
 
+	hasPreviewHandler(): boolean;
+
 	setPreviewHandler(handler: IBulkEditPreviewHandler): IDisposable;
 
 	apply(edit: WorkspaceEdit, options?: IBulkEditOptions): Promise<IBulkEditResult>;
diff --git a/src/vs/editor/contrib/rename/rename.ts b/src/vs/editor/contrib/rename/rename.ts
@@ -179,7 +179,7 @@ class RenameController implements IEditorContribution {
 			selectionEnd = Math.min(loc.range.endColumn, selection.endColumn) - loc.range.startColumn;
 		}
 
-		const supportPreview = this._configService.getValue<boolean>(this.editor.getModel().uri, 'editor.rename.enablePreview');
+		const supportPreview = this._bulkEditService.hasPreviewHandler() && this._configService.getValue<boolean>(this.editor.getModel().uri, 'editor.rename.enablePreview');
 		const inputFieldResult = await this._renameInputField.getValue().getInput(loc.range, loc.text, selectionStart, selectionEnd, supportPreview);
 
 		// no result, only hint to focus the editor or not
diff --git a/src/vs/editor/standalone/browser/simpleServices.ts b/src/vs/editor/standalone/browser/simpleServices.ts
@@ -635,6 +635,10 @@ export class SimpleBulkEditService implements IBulkEditService {
 		//
 	}
 
+	hasPreviewHandler(): false {
+		return false;
+	}
+
 	setPreviewHandler(): IDisposable {
 		return Disposable.None;
 	}
diff --git a/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts b/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts
@@ -392,6 +392,10 @@ export class BulkEditService implements IBulkEditService {
 		});
 	}
 
+	hasPreviewHandler(): boolean {
+		return Boolean(this._previewHandler);
+	}
+
 	async apply(edit: WorkspaceEdit, options?: IBulkEditOptions): Promise<IBulkEditResult> {
 
 		if (edit.edits.length === 0) {

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ class RenameController implements IEditorContribution {`
`179`	`179`	`selectionEnd = Math.min(loc.range.endColumn, selection.endColumn) - loc.range.startColumn;`
`180`	`180`	`}`
`181`	`181`
`182`		`- const supportPreview = this._configService.getValue<boolean>(this.editor.getModel().uri, 'editor.rename.enablePreview');`
	`182`	`+ const supportPreview = this._bulkEditService.hasPreviewHandler() && this._configService.getValue<boolean>(this.editor.getModel().uri, 'editor.rename.enablePreview');`
`183`	`183`	`const inputFieldResult = await this._renameInputField.getValue().getInput(loc.range, loc.text, selectionStart, selectionEnd, supportPreview);`
`184`	`184`
`185`	`185`	`// no result, only hint to focus the editor or not`
Original file line number	Diff line number	Diff line change
`@@ -635,6 +635,10 @@ export class SimpleBulkEditService implements IBulkEditService {`
`635`	`635`	`//`
`636`	`636`	`}`
`637`	`637`
	`638`	`+ hasPreviewHandler(): false {`
	`639`	`+ return false;`
	`640`	`+ }`
	`641`	`+`
`638`	`642`	`setPreviewHandler(): IDisposable {`
`639`	`643`	`return Disposable.None;`
`640`	`644`	`}`
Original file line number	Diff line number	Diff line change
`@@ -392,6 +392,10 @@ export class BulkEditService implements IBulkEditService {`
`392`	`392`	`});`
`393`	`393`	`}`
`394`	`394`
	`395`	`+ hasPreviewHandler(): boolean {`
	`396`	`+ return Boolean(this._previewHandler);`
	`397`	`+ }`
	`398`	`+`
`395`	`399`	`async apply(edit: WorkspaceEdit, options?: IBulkEditOptions): Promise<IBulkEditResult> {`
`396`	`400`
`397`	`401`	`if (edit.edits.length === 0) {`