From fbb4fbcd4ba862cade0bbf39632a8b7a88aadef9 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Mon, 13 Jan 2020 21:06:05 +0100 Subject: [PATCH] fix issue with accessibility provider, #88554 --- .../contrib/bulkEdit/browser/bulkEditTree.ts | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts index 188c0569442..bbd92f7b31a 100644 --- a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts +++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts @@ -118,38 +118,44 @@ export class BulkEditAccessibilityProvider implements IAccessibilityProvider 0) { if (element.edit.type & BulkFileOperationType.Rename && element.edit.newUri) { return localize( - 'area.renameAndEdit', "Renaming {0} to {1}, also making text edits", + 'aria.renameAndEdit', "Renaming {0} to {1}, also making text edits", this._labelService.getUriLabel(element.edit.uri, { relative: true }), this._labelService.getUriLabel(element.edit.newUri, { relative: true }) ); } else if (element.edit.type & BulkFileOperationType.Create) { return localize( - 'area.createAndEdit', "Creating {0}, also making text edits", + 'aria.createAndEdit', "Creating {0}, also making text edits", this._labelService.getUriLabel(element.edit.uri, { relative: true }) ); } else if (element.edit.type & BulkFileOperationType.Delete) { return localize( - 'area.deleteAndEdit', "Deleting {0}, also making text edits", + 'aria.deleteAndEdit', "Deleting {0}, also making text edits", + this._labelService.getUriLabel(element.edit.uri, { relative: true }), + ); + } else { + return localize( + 'aria.editOnly', "{0}, making text edits", this._labelService.getUriLabel(element.edit.uri, { relative: true }), ); } + } else { if (element.edit.type & BulkFileOperationType.Rename && element.edit.newUri) { return localize( - 'area.rename', "Renaming {0} to {1}", + 'aria.rename', "Renaming {0} to {1}", this._labelService.getUriLabel(element.edit.uri, { relative: true }), this._labelService.getUriLabel(element.edit.newUri, { relative: true }) ); } else if (element.edit.type & BulkFileOperationType.Create) { return localize( - 'area.create', "Creating {0}", + 'aria.create', "Creating {0}", this._labelService.getUriLabel(element.edit.uri, { relative: true }) ); } else if (element.edit.type & BulkFileOperationType.Delete) { return localize( - 'area.delete', "Deleting {0}", + 'aria.delete', "Deleting {0}", this._labelService.getUriLabel(element.edit.uri, { relative: true }), ); } @@ -159,7 +165,7 @@ export class BulkEditAccessibilityProvider implements IAccessibilityProvider 0 && element.inserting.length > 0) { // edit: replace - return localize('aria.replace', "line {0}, replacing {1} with {0}", element.edit.edit.range.startLineNumber, element.selecting, element.inserting); + return localize('aria.replace', "line {0}, replacing {1} with {2}", element.edit.edit.range.startLineNumber, element.selecting, element.inserting); } else if (element.selecting.length > 0 && element.inserting.length === 0) { // edit: delete return localize('aria.del', "line {0}, removing {1}", element.edit.edit.range.startLineNumber, element.selecting);