Merge pull request microsoft#184641 from microsoft/merogge/editor-h

use `AccessibleView` for editor accessibility help menu

Author: meganrogge

src/vs/editor/common/standaloneStrings.ts

@@ -6,30 +6,22 @@
 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.");
-	export const auto_off = nls.localize("auto_off", "The editor is configured to never be optimized for usage with a Screen Reader, which is not the case at this time.");
+	export const auto_off = nls.localize("auto_off", "The editor is configured to never be optimized for usage with a Screen Reader");
 	export const tabFocusModeOnMsg = nls.localize("tabFocusModeOnMsg", "Pressing Tab in the current editor will move focus to the next focusable element. Toggle this behavior by pressing {0}.");
 	export const tabFocusModeOnMsgNoKb = nls.localize("tabFocusModeOnMsgNoKb", "Pressing Tab in the current editor will move focus to the next focusable element. The command {0} is currently not triggerable by a keybinding.");
 	export const tabFocusModeOffMsg = nls.localize("tabFocusModeOffMsg", "Pressing Tab in the current editor will insert the tab character. Toggle this behavior by pressing {0}.");
 	export const tabFocusModeOffMsgNoKb = nls.localize("tabFocusModeOffMsgNoKb", "Pressing Tab in the current editor will insert the tab character. The command {0} is currently not triggerable by a keybinding.");
-	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 outroMsg = nls.localize("outroMsg", "You can dismiss this tooltip and return to the editor by pressing Escape or Shift+Escape.");
+	export const openDoc = nls.localize("openDoc", "Press 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/editor/editor.main.ts

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/editor/editor.all';
-import 'vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp';
 import 'vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard';
 import 'vs/editor/standalone/browser/inspectTokens/inspectTokens';
 import 'vs/editor/standalone/browser/quickAccess/standaloneHelpQuickAccess';