wip

Author: meganrogge

src/vs/editor/common/standaloneStrings.ts

@@ -6,17 +6,12 @@
 import * as nls from 'vs/nls';
 
 export namespace AccessibilityHelpNLS {
-	export const noSelection = nls.localize("noSelection", "No selection");
-	export const singleSelectionRange = nls.localize("singleSelectionRange", "Line {0}, Column {1} ({2} selected)");
-	export const singleSelection = nls.localize("singleSelection", "Line {0}, Column {1}");
-	export const multiSelectionRange = nls.localize("multiSelectionRange", "{0} selections ({1} characters selected)");
-	export const multiSelection = nls.localize("multiSelection", "{0} selections");
-	export const emergencyConfOn = nls.localize("emergencyConfOn", "Now changing the setting `accessibilitySupport` to 'on'.");
+	export const accessibilityHelpTitle = nls.localize('accessibilityHelpTitle', "Accessibility Help");
 	export const openingDocs = nls.localize("openingDocs", "Now opening the Editor Accessibility documentation page.");
-	export const readonlyDiffEditor = nls.localize("readonlyDiffEditor", " in a read-only pane of a diff editor.");
-	export const editableDiffEditor = nls.localize("editableDiffEditor", " in a pane of a diff editor.");
-	export const readonlyEditor = nls.localize("readonlyEditor", " in a read-only code editor");
-	export const editableEditor = nls.localize("editableEditor", " in a code editor");
+	export const readonlyDiffEditor = nls.localize("readonlyDiffEditor", "You are in a read-only pane of a diff editor.");
+	export const editableDiffEditor = nls.localize("editableDiffEditor", "You are in a pane of a diff editor.");
+	export const readonlyEditor = nls.localize("readonlyEditor", "You are in a read-only code editor");
+	export const editableEditor = nls.localize("editableEditor", "You are in a code editor");
 	export const changeConfigToOnMac = nls.localize("changeConfigToOnMac", "To configure the editor to be optimized for usage with a Screen Reader press Command+E now.");
 	export const changeConfigToOnWinLinux = nls.localize("changeConfigToOnWinLinux", "To configure the editor to be optimized for usage with a Screen Reader press Control+E now.");
 	export const auto_on = nls.localize("auto_on", "The editor is configured to be optimized for usage with a Screen Reader.");
@@ -28,7 +23,6 @@ export namespace AccessibilityHelpNLS {
 	export const openDocMac = nls.localize("openDocMac", "Press Command+H now to open a browser window with more information related to editor accessibility.");
 	export const openDocWinLinux = nls.localize("openDocWinLinux", "Press Control+H now to open a browser window with more information related to editor accessibility.");
 	export const showAccessibilityHelpAction = nls.localize("showAccessibilityHelpAction", "Show Accessibility Help");
-	export const accessibilityHelpTitle = nls.localize('accessibilityHelpTitle', "Accessibility Help");
 }
 
 export namespace InspectTokensNLS {

src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.ts

@@ -27,7 +27,6 @@ import { NEW_UNTITLED_FILE_COMMAND_ID } from 'vs/workbench/contrib/files/browser
 registerAccessibilityConfiguration();
 registerSingleton(IAccessibleViewService, AccessibleViewService, InstantiationType.Delayed);
 
-
 class AccessibilityHelpProvider extends Disposable implements IAccessibleContentProvider {
 	onClose() {
 		this._editor.focus();
@@ -123,5 +122,6 @@ class EditorAccessibilityHelpContribution extends Disposable {
 		}));
 	}
 }
+
 const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 workbenchRegistry.registerWorkbenchContribution(EditorAccessibilityHelpContribution, LifecyclePhase.Eventually);

src/vs/workbench/contrib/accessibility/browser/accessibleView.ts

@@ -25,7 +25,7 @@ export const IAccessibleViewService = createDecorator<IAccessibleViewService>('a
 
 export interface IAccessibleViewService {
 	readonly _serviceBrand: undefined;
-	show(providerId: string): void;
+	show(providerId: string): AccessibleView;
 	registerProvider(provider: IAccessibleContentProvider): IDisposable;
 }
 
@@ -35,6 +35,7 @@ export interface IAccessibleViewOptions {
 
 class AccessibleView extends Disposable {
 	private _editorWidget: CodeEditorWidget;
+	get editorWidget() { return this._editorWidget; }
 	private _editorContainer: HTMLElement;
 
 	constructor(
@@ -155,7 +156,7 @@ export class AccessibleViewService extends Disposable implements IAccessibleView
 		});
 	}
 
-	show(providerId: string): void {
+	show(providerId: string): AccessibleView {
 		if (!this._accessibleView) {
 			this._accessibleView = this._register(this._instantiationService.createInstance(AccessibleView));
 		}
@@ -164,5 +165,6 @@ export class AccessibleViewService extends Disposable implements IAccessibleView
 			throw new Error(`No accessible view provider with id: ${providerId}`);
 		}
 		this._accessibleView.show(provider);
+		return this._accessibleView;
 	}
 }