use aria-roledescription and use ame aria label between editor and tab

isidorn · isidorn · commit bd04766970cd · 2020-04-13T18:35:23.000+02:00
fixes microsoft#94828
diff --git a/src/vs/editor/browser/controller/textAreaHandler.ts b/src/vs/editor/browser/controller/textAreaHandler.ts
@@ -125,6 +125,7 @@ export class TextAreaHandler extends ViewPart {
 		this.textArea.setAttribute('spellcheck', 'false');
 		this.textArea.setAttribute('aria-label', this._getAriaLabel(options));
 		this.textArea.setAttribute('role', 'textbox');
+		this.textArea.setAttribute('aria-roledescription', nls.localize('editor', "editor"));
 		this.textArea.setAttribute('aria-multiline', 'true');
 		this.textArea.setAttribute('aria-haspopup', 'false');
 		this.textArea.setAttribute('aria-autocomplete', 'both');
diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
@@ -845,7 +845,7 @@ export class TabsTitleControl extends TitleControl {
 			name: editor.getName(),
 			description: editor.getDescription(verbosity),
 			title: withNullAsUndefined(editor.getTitle(Verbosity.LONG)),
-			ariaLabel: editor.getTitle(Verbosity.SHORT)
+			ariaLabel: editor.isReadonly() ? localize('readonlyEditor', "{0} readonly", editor.getTitle(Verbosity.SHORT)) : editor.getTitle(Verbosity.SHORT)
 		}));
 
 		// Shorten labels as needed
diff --git a/src/vs/workbench/contrib/files/browser/editors/textFileEditor.ts b/src/vs/workbench/contrib/files/browser/editors/textFileEditor.ts
@@ -12,7 +12,7 @@ import { Action } from 'vs/base/common/actions';
 import { VIEWLET_ID, TEXT_FILE_EDITOR_ID, IExplorerService } from 'vs/workbench/contrib/files/common/files';
 import { ITextFileService, TextFileOperationError, TextFileOperationResult } from 'vs/workbench/services/textfile/common/textfiles';
 import { BaseTextEditor, IEditorConfiguration } from 'vs/workbench/browser/parts/editor/textEditor';
-import { EditorOptions, TextEditorOptions, IEditorCloseEvent } from 'vs/workbench/common/editor';
+import { EditorOptions, TextEditorOptions, IEditorCloseEvent, Verbosity } from 'vs/workbench/common/editor';
 import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
 import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
@@ -246,16 +246,8 @@ export class TextFileEditor extends BaseTextEditor {
 	}
 
 	protected getAriaLabel(): string {
-		const inputName = this.input?.getName();
-
-		let ariaLabel: string;
-		if (this.input?.isReadonly()) {
-			ariaLabel = inputName ? nls.localize('readonlyFileEditorWithInputAriaLabel', "{0} readonly editor", inputName) : nls.localize('readonlyFileEditorAriaLabel', "Readonly editor");
-		} else {
-			ariaLabel = inputName ? nls.localize('fileEditorWithInputAriaLabel', "{0} editor", inputName) : nls.localize('fileEditorAriaLabel', "Editor");
-		}
-
-		return ariaLabel;
+		const title = this.input?.getTitle(Verbosity.SHORT) || nls.localize('fileEditorAriaLabel', "editor");
+		return this.input?.isReadonly() ? nls.localize('readonlyEditor', "{0} readonly", title) : title;
 	}
 
 	clearInput(): void {
