Avoid having quotes inside quotes (for microsoft#91368)

alexdima · alexdima · commit d9b345b15564 · 2020-02-27T12:47:05.000+01:00
diff --git a/src/vs/editor/browser/services/bulkEditService.ts b/src/vs/editor/browser/services/bulkEditService.ts
@@ -16,6 +16,7 @@ export interface IBulkEditOptions {
 	progress?: IProgress<IProgressStep>;
 	showPreview?: boolean;
 	label?: string;
+	quotableLabel?: string;
 }
 
 export interface IBulkEditResult {
diff --git a/src/vs/editor/contrib/rename/rename.ts b/src/vs/editor/contrib/rename/rename.ts
@@ -206,7 +206,8 @@ class RenameController implements IEditorContribution {
 			this._bulkEditService.apply(renameResult, {
 				editor: this.editor,
 				showPreview: inputFieldResult.wantsPreview,
-				label: nls.localize('label', "Renaming '{0}'", loc?.text)
+				label: nls.localize('label', "Renaming '{0}'", loc?.text),
+				quotableLabel: nls.localize('quotableLabel', "Renaming {0}", loc?.text),
 			}).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/services/bulkEdit/browser/bulkEditService.ts b/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts
@@ -443,7 +443,7 @@ export class BulkEditService implements IBulkEditService {
 			// If the code editor is readonly still allow bulk edits to be applied #68549
 			codeEditor = undefined;
 		}
-		const bulkEdit = this._instaService.createInstance(BulkEdit, options?.label, codeEditor, options?.progress, edits);
+		const bulkEdit = this._instaService.createInstance(BulkEdit, options?.quotableLabel || options?.label, codeEditor, options?.progress, edits);
 		return bulkEdit.perform().then(() => {
 			return { ariaSummary: bulkEdit.ariaMessage() };
 		}).catch(err => {

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ export interface IBulkEditOptions {`
`16`	`16`	`progress?: IProgress<IProgressStep>;`
`17`	`17`	`showPreview?: boolean;`
`18`	`18`	`label?: string;`
	`19`	`+ quotableLabel?: string;`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`export interface IBulkEditResult {`
Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ export class BulkEditService implements IBulkEditService {`
`443`	`443`	`// If the code editor is readonly still allow bulk edits to be applied #68549`
`444`	`444`	`codeEditor = undefined;`
`445`	`445`	`}`
`446`		`- const bulkEdit = this._instaService.createInstance(BulkEdit, options?.label, codeEditor, options?.progress, edits);`
	`446`	`+ const bulkEdit = this._instaService.createInstance(BulkEdit, options?.quotableLabel \|\| options?.label, codeEditor, options?.progress, edits);`
`447`	`447`	`return bulkEdit.perform().then(() => {`
`448`	`448`	`return { ariaSummary: bulkEdit.ariaMessage() };`
`449`	`449`	`}).catch(err => {`