@codingame/monaco-vscode-accessibility-service-override 4.5.1 → 4.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.js +13 -32
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleView.js +74 -145
- package/vscode/src/vs/workbench/contrib/accessibility/browser/openDiffEditorAnnouncement.js +7 -10
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/accessibility/accessibility.js +2 -5
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-accessibility-service-override",
|
|
3
|
-
"version": "4.5.
|
|
3
|
+
"version": "4.5.2",
|
|
4
4
|
"keywords": [],
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "CodinGame",
|
|
@@ -26,6 +26,6 @@
|
|
|
26
26
|
}
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"vscode": "npm:@codingame/monaco-vscode-api@4.5.
|
|
29
|
+
"vscode": "npm:@codingame/monaco-vscode-api@4.5.2"
|
|
30
30
|
}
|
|
31
31
|
}
|
|
@@ -10,6 +10,7 @@ import { NotificationPriority } from 'vscode/vscode/vs/platform/notification/com
|
|
|
10
10
|
import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
|
|
11
11
|
import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
|
|
12
12
|
|
|
13
|
+
const _moduleId = "vs/workbench/contrib/accessibility/browser/accessibilityStatus";
|
|
13
14
|
let AccessibilityStatus = class AccessibilityStatus extends Disposable {
|
|
14
15
|
static { this.ID = 'workbench.contrib.accessibilityStatus'; }
|
|
15
16
|
constructor(configurationService, notificationService, accessibilityService, statusbarService) {
|
|
@@ -20,7 +21,7 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
|
|
|
20
21
|
this.statusbarService = statusbarService;
|
|
21
22
|
this.screenReaderNotification = null;
|
|
22
23
|
this.promptedScreenReader = false;
|
|
23
|
-
this.screenReaderModeElement = this._register(( new MutableDisposable()));
|
|
24
|
+
this.screenReaderModeElement = this._register(( (new MutableDisposable())));
|
|
24
25
|
this._register(CommandsRegistry.registerCommand({ id: 'showEditorScreenReaderNotification', handler: () => this.showScreenReaderNotification() }));
|
|
25
26
|
this.updateScreenReaderModeElement(this.accessibilityService.isScreenReaderOptimized());
|
|
26
27
|
this.registerListeners();
|
|
@@ -34,25 +35,13 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
|
|
|
34
35
|
}));
|
|
35
36
|
}
|
|
36
37
|
showScreenReaderNotification() {
|
|
37
|
-
this.screenReaderNotification = this.notificationService.prompt(Severity$1.Info, ( localizeWithPath(
|
|
38
|
-
|
|
39
|
-
'screenReaderDetectedExplanation.question',
|
|
40
|
-
"Are you using a screen reader to operate VS Code?"
|
|
41
|
-
)), [{
|
|
42
|
-
label: ( localizeWithPath(
|
|
43
|
-
'vs/workbench/contrib/accessibility/browser/accessibilityStatus',
|
|
44
|
-
'screenReaderDetectedExplanation.answerYes',
|
|
45
|
-
"Yes"
|
|
46
|
-
)),
|
|
38
|
+
this.screenReaderNotification = this.notificationService.prompt(Severity$1.Info, ( localizeWithPath(_moduleId, 0, "Are you using a screen reader to operate VS Code?")), [{
|
|
39
|
+
label: ( localizeWithPath(_moduleId, 1, "Yes")),
|
|
47
40
|
run: () => {
|
|
48
41
|
this.configurationService.updateValue('editor.accessibilitySupport', 'on', 2 );
|
|
49
42
|
}
|
|
50
43
|
}, {
|
|
51
|
-
label: ( localizeWithPath(
|
|
52
|
-
'vs/workbench/contrib/accessibility/browser/accessibilityStatus',
|
|
53
|
-
'screenReaderDetectedExplanation.answerNo',
|
|
54
|
-
"No"
|
|
55
|
-
)),
|
|
44
|
+
label: ( localizeWithPath(_moduleId, 2, "No")),
|
|
56
45
|
run: () => {
|
|
57
46
|
this.configurationService.updateValue('editor.accessibilitySupport', 'off', 2 );
|
|
58
47
|
}
|
|
@@ -65,17 +54,9 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
|
|
|
65
54
|
updateScreenReaderModeElement(visible) {
|
|
66
55
|
if (visible) {
|
|
67
56
|
if (!this.screenReaderModeElement.value) {
|
|
68
|
-
const text = ( localizeWithPath(
|
|
69
|
-
'vs/workbench/contrib/accessibility/browser/accessibilityStatus',
|
|
70
|
-
'screenReaderDetected',
|
|
71
|
-
"Screen Reader Optimized"
|
|
72
|
-
));
|
|
57
|
+
const text = ( localizeWithPath(_moduleId, 3, "Screen Reader Optimized"));
|
|
73
58
|
this.screenReaderModeElement.value = this.statusbarService.addEntry({
|
|
74
|
-
name: ( localizeWithPath(
|
|
75
|
-
'vs/workbench/contrib/accessibility/browser/accessibilityStatus',
|
|
76
|
-
'status.editor.screenReaderMode',
|
|
77
|
-
"Screen Reader Mode"
|
|
78
|
-
)),
|
|
59
|
+
name: ( localizeWithPath(_moduleId, 4, "Screen Reader Mode")),
|
|
79
60
|
text,
|
|
80
61
|
ariaLabel: text,
|
|
81
62
|
command: 'showEditorScreenReaderNotification',
|
|
@@ -105,11 +86,11 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
|
|
|
105
86
|
this.updateScreenReaderModeElement(this.accessibilityService.isScreenReaderOptimized());
|
|
106
87
|
}
|
|
107
88
|
};
|
|
108
|
-
AccessibilityStatus = ( __decorate([
|
|
109
|
-
( __param(0, IConfigurationService)),
|
|
110
|
-
( __param(1, INotificationService)),
|
|
111
|
-
( __param(2, IAccessibilityService)),
|
|
112
|
-
( __param(3, IStatusbarService))
|
|
113
|
-
], AccessibilityStatus));
|
|
89
|
+
AccessibilityStatus = ( (__decorate([
|
|
90
|
+
( (__param(0, IConfigurationService))),
|
|
91
|
+
( (__param(1, INotificationService))),
|
|
92
|
+
( (__param(2, IAccessibilityService))),
|
|
93
|
+
( (__param(3, IStatusbarService)))
|
|
94
|
+
], AccessibilityStatus)));
|
|
114
95
|
|
|
115
96
|
export { AccessibilityStatus };
|
|
@@ -33,6 +33,7 @@ import { accessibilityHelpIsShown, accessibleViewIsShown, accessibleViewSupports
|
|
|
33
33
|
import { IChatCodeBlockContextProviderService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
|
|
34
34
|
import { getSimpleEditorOptions } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
|
|
35
35
|
|
|
36
|
+
const _moduleId = "vs/workbench/contrib/accessibility/browser/accessibleView";
|
|
36
37
|
let AccessibleView = class AccessibleView extends Disposable {
|
|
37
38
|
get editorWidget() { return this._editorWidget; }
|
|
38
39
|
constructor(_openerService, _instantiationService, _configurationService, _modelService, _contextViewService, _contextKeyService, _accessibilityService, _keybindingService, _layoutService, _menuService, _commandService, _codeBlockContextProviderService) {
|
|
@@ -290,19 +291,7 @@ let AccessibleView = class AccessibleView extends Disposable {
|
|
|
290
291
|
}
|
|
291
292
|
}
|
|
292
293
|
if (label) {
|
|
293
|
-
symbols.push({ markdownToParse: label, label: ( localizeWithPath(
|
|
294
|
-
'vs/workbench/contrib/accessibility/browser/accessibleView',
|
|
295
|
-
'symbolLabel',
|
|
296
|
-
"({0}) {1}",
|
|
297
|
-
token.type,
|
|
298
|
-
label
|
|
299
|
-
)), ariaLabel: ( localizeWithPath(
|
|
300
|
-
'vs/workbench/contrib/accessibility/browser/accessibleView',
|
|
301
|
-
'symbolLabelAria',
|
|
302
|
-
"({0}) {1}",
|
|
303
|
-
token.type,
|
|
304
|
-
label
|
|
305
|
-
)), firstListItem });
|
|
294
|
+
symbols.push({ markdownToParse: label, label: ( localizeWithPath(_moduleId, 0, "({0}) {1}", token.type, label)), ariaLabel: ( localizeWithPath(_moduleId, 1, "({0}) {1}", token.type, label)), firstListItem });
|
|
306
295
|
firstListItem = undefined;
|
|
307
296
|
}
|
|
308
297
|
}
|
|
@@ -334,8 +323,8 @@ let AccessibleView = class AccessibleView extends Disposable {
|
|
|
334
323
|
}
|
|
335
324
|
this._configurationService.updateValue(this._currentProvider?.verbositySettingKey, false);
|
|
336
325
|
alert(( localizeWithPath(
|
|
337
|
-
|
|
338
|
-
|
|
326
|
+
_moduleId,
|
|
327
|
+
2,
|
|
339
328
|
'{0} accessibility verbosity is now disabled',
|
|
340
329
|
this._currentProvider.verbositySettingKey
|
|
341
330
|
)));
|
|
@@ -364,8 +353,8 @@ let AccessibleView = class AccessibleView extends Disposable {
|
|
|
364
353
|
this._accessibleViewCurrentProviderId.set(provider.id);
|
|
365
354
|
const value = this._configurationService.getValue(provider.verbositySettingKey);
|
|
366
355
|
const readMoreLink = provider.options.readMoreUrl ? ( localizeWithPath(
|
|
367
|
-
|
|
368
|
-
|
|
356
|
+
_moduleId,
|
|
357
|
+
3,
|
|
369
358
|
"\n\nOpen a browser window with more information related to accessibility (H)."
|
|
370
359
|
)) : '';
|
|
371
360
|
let disableHelpHint = '';
|
|
@@ -388,19 +377,15 @@ let AccessibleView = class AccessibleView extends Disposable {
|
|
|
388
377
|
}
|
|
389
378
|
}
|
|
390
379
|
const verbose = this._configurationService.getValue(provider.verbositySettingKey);
|
|
391
|
-
const exitThisDialogHint = verbose && !provider.options.position ? ( localizeWithPath(
|
|
392
|
-
'vs/workbench/contrib/accessibility/browser/accessibleView',
|
|
393
|
-
'exit',
|
|
394
|
-
'\n\nExit this dialog (Escape).'
|
|
395
|
-
)) : '';
|
|
380
|
+
const exitThisDialogHint = verbose && !provider.options.position ? ( localizeWithPath(_moduleId, 4, '\n\nExit this dialog (Escape).')) : '';
|
|
396
381
|
const newContent = message + provider.provideContent() + readMoreLink + disableHelpHint + exitThisDialogHint;
|
|
397
382
|
this.calculateCodeBlocks(newContent);
|
|
398
383
|
this._currentContent = newContent;
|
|
399
384
|
this._updateContextKeys(provider, true);
|
|
400
385
|
const widgetIsFocused = this._editorWidget.hasTextFocus() || this._editorWidget.hasWidgetFocus();
|
|
401
|
-
this._getTextModel(( URI.from(
|
|
386
|
+
this._getTextModel(( (URI.from(
|
|
402
387
|
{ path: `accessible-view-${provider.verbositySettingKey}`, scheme: 'accessible-view', fragment: this._currentContent }
|
|
403
|
-
))).then((model) => {
|
|
388
|
+
)))).then((model) => {
|
|
404
389
|
if (!model) {
|
|
405
390
|
return;
|
|
406
391
|
}
|
|
@@ -416,40 +401,18 @@ let AccessibleView = class AccessibleView extends Disposable {
|
|
|
416
401
|
const hasActions = this._accessibleViewSupportsNavigation.get() || this._accessibleViewVerbosityEnabled.get() || this._accessibleViewGoToSymbolSupported.get() || this._currentProvider?.actions;
|
|
417
402
|
if (verbose && !showAccessibleViewHelp && hasActions) {
|
|
418
403
|
actionsHint = provider.options.position ? ( localizeWithPath(
|
|
419
|
-
|
|
420
|
-
|
|
404
|
+
_moduleId,
|
|
405
|
+
5,
|
|
421
406
|
'Explore actions such as disabling this hint (Shift+Tab), use Escape to exit this dialog.'
|
|
422
|
-
)) : ( localizeWithPath(
|
|
423
|
-
'vs/workbench/contrib/accessibility/browser/accessibleView',
|
|
424
|
-
'ariaAccessibleViewActions',
|
|
425
|
-
'Explore actions such as disabling this hint (Shift+Tab).'
|
|
426
|
-
));
|
|
407
|
+
)) : ( localizeWithPath(_moduleId, 6, 'Explore actions such as disabling this hint (Shift+Tab).'));
|
|
427
408
|
}
|
|
428
|
-
let ariaLabel = provider.options.type === "help" ? ( localizeWithPath(
|
|
429
|
-
'vs/workbench/contrib/accessibility/browser/accessibleView',
|
|
430
|
-
'accessibility-help',
|
|
431
|
-
"Accessibility Help"
|
|
432
|
-
)) : ( localizeWithPath(
|
|
433
|
-
'vs/workbench/contrib/accessibility/browser/accessibleView',
|
|
434
|
-
'accessible-view',
|
|
435
|
-
"Accessible View"
|
|
436
|
-
));
|
|
409
|
+
let ariaLabel = provider.options.type === "help" ? ( localizeWithPath(_moduleId, 7, "Accessibility Help")) : ( localizeWithPath(_moduleId, 8, "Accessible View"));
|
|
437
410
|
this._title.textContent = ariaLabel;
|
|
438
411
|
if (actionsHint && provider.options.type === "view" ) {
|
|
439
|
-
ariaLabel = ( localizeWithPath(
|
|
440
|
-
'vs/workbench/contrib/accessibility/browser/accessibleView',
|
|
441
|
-
'accessible-view-hint',
|
|
442
|
-
"Accessible View, {0}",
|
|
443
|
-
actionsHint
|
|
444
|
-
));
|
|
412
|
+
ariaLabel = ( localizeWithPath(_moduleId, 9, "Accessible View, {0}", actionsHint));
|
|
445
413
|
}
|
|
446
414
|
else if (actionsHint) {
|
|
447
|
-
ariaLabel = ( localizeWithPath(
|
|
448
|
-
'vs/workbench/contrib/accessibility/browser/accessibleView',
|
|
449
|
-
'accessibility-help-hint',
|
|
450
|
-
"Accessibility Help, {0}",
|
|
451
|
-
actionsHint
|
|
452
|
-
));
|
|
415
|
+
ariaLabel = ( localizeWithPath(_moduleId, 10, "Accessibility Help, {0}", actionsHint));
|
|
453
416
|
}
|
|
454
417
|
if (isWindows && widgetIsFocused) {
|
|
455
418
|
ariaLabel = '';
|
|
@@ -461,7 +424,7 @@ let AccessibleView = class AccessibleView extends Disposable {
|
|
|
461
424
|
const isDefaultPosition = position?.lineNumber === 1 && position.column === 1;
|
|
462
425
|
if (this._currentProvider.options.position === 'bottom' || this._currentProvider.options.position === 'initial-bottom' && isDefaultPosition) {
|
|
463
426
|
const lastLine = this.editorWidget.getModel()?.getLineCount();
|
|
464
|
-
const position = lastLine !== undefined && lastLine > 0 ? ( new Position(lastLine, 1)) : undefined;
|
|
427
|
+
const position = lastLine !== undefined && lastLine > 0 ? ( (new Position(lastLine, 1))) : undefined;
|
|
465
428
|
if (position) {
|
|
466
429
|
this._editorWidget.setPosition(position);
|
|
467
430
|
this._editorWidget.revealLine(position.lineNumber);
|
|
@@ -478,7 +441,7 @@ let AccessibleView = class AccessibleView extends Disposable {
|
|
|
478
441
|
this._lastProvider = undefined;
|
|
479
442
|
this._currentContent = undefined;
|
|
480
443
|
};
|
|
481
|
-
const disposableStore = ( new DisposableStore());
|
|
444
|
+
const disposableStore = ( (new DisposableStore()));
|
|
482
445
|
disposableStore.add(this._editorWidget.onKeyDown((e) => {
|
|
483
446
|
if (e.keyCode === 3 ) {
|
|
484
447
|
this._commandService.executeCommand('editor.action.openLink');
|
|
@@ -489,14 +452,14 @@ let AccessibleView = class AccessibleView extends Disposable {
|
|
|
489
452
|
else if (e.keyCode === 38 && provider.options.readMoreUrl) {
|
|
490
453
|
const url = provider.options.readMoreUrl;
|
|
491
454
|
alert(AccessibilityHelpNLS.openingDocs);
|
|
492
|
-
this._openerService.open(( URI.parse(url)));
|
|
455
|
+
this._openerService.open(( (URI.parse(url))));
|
|
493
456
|
e.preventDefault();
|
|
494
457
|
e.stopPropagation();
|
|
495
458
|
}
|
|
496
459
|
provider.onKeyDown?.(e);
|
|
497
460
|
}));
|
|
498
461
|
disposableStore.add(addDisposableListener(this._toolbar.getElement(), EventType.KEY_DOWN, (e) => {
|
|
499
|
-
const keyboardEvent = ( new StandardKeyboardEvent(e));
|
|
462
|
+
const keyboardEvent = ( (new StandardKeyboardEvent(e)));
|
|
500
463
|
if (keyboardEvent.equals(9 )) {
|
|
501
464
|
hide(e);
|
|
502
465
|
}
|
|
@@ -511,15 +474,7 @@ let AccessibleView = class AccessibleView extends Disposable {
|
|
|
511
474
|
return disposableStore;
|
|
512
475
|
}
|
|
513
476
|
_updateToolbar(providedActions, type) {
|
|
514
|
-
this._toolbar.setAriaLabel(type === "help" ? ( localizeWithPath(
|
|
515
|
-
'vs/workbench/contrib/accessibility/browser/accessibleView',
|
|
516
|
-
'accessibleHelpToolbar',
|
|
517
|
-
'Accessibility Help'
|
|
518
|
-
)) : ( localizeWithPath(
|
|
519
|
-
'vs/workbench/contrib/accessibility/browser/accessibleView',
|
|
520
|
-
'accessibleViewToolbar',
|
|
521
|
-
"Accessible View"
|
|
522
|
-
)));
|
|
477
|
+
this._toolbar.setAriaLabel(type === "help" ? ( localizeWithPath(_moduleId, 11, 'Accessibility Help')) : ( localizeWithPath(_moduleId, 12, "Accessible View")));
|
|
523
478
|
const menuActions = [];
|
|
524
479
|
const toolbarMenu = this._register(this._menuService.createMenu(MenuId.AccessibleView, this._contextKeyService));
|
|
525
480
|
createAndFillInActionBarActions(toolbarMenu, {}, menuActions);
|
|
@@ -582,17 +537,9 @@ let AccessibleView = class AccessibleView extends Disposable {
|
|
|
582
537
|
_getAccessibleViewHelpDialogContent(providerHasSymbols) {
|
|
583
538
|
const navigationHint = this._getNavigationHint();
|
|
584
539
|
const goToSymbolHint = this._getGoToSymbolHint(providerHasSymbols);
|
|
585
|
-
const toolbarHint = ( localizeWithPath(
|
|
586
|
-
'vs/workbench/contrib/accessibility/browser/accessibleView',
|
|
587
|
-
'toolbar',
|
|
588
|
-
"Navigate to the toolbar (Shift+Tab)."
|
|
589
|
-
));
|
|
540
|
+
const toolbarHint = ( localizeWithPath(_moduleId, 13, "Navigate to the toolbar (Shift+Tab)."));
|
|
590
541
|
const chatHints = this._getChatHints();
|
|
591
|
-
let hint = ( localizeWithPath(
|
|
592
|
-
'vs/workbench/contrib/accessibility/browser/accessibleView',
|
|
593
|
-
'intro',
|
|
594
|
-
"In the accessible view, you can:\n"
|
|
595
|
-
));
|
|
542
|
+
let hint = ( localizeWithPath(_moduleId, 14, "In the accessible view, you can:\n"));
|
|
596
543
|
if (navigationHint) {
|
|
597
544
|
hint += ' - ' + navigationHint + '\n';
|
|
598
545
|
}
|
|
@@ -617,46 +564,46 @@ let AccessibleView = class AccessibleView extends Disposable {
|
|
|
617
564
|
const runInTerminalKb = this._keybindingService.lookupKeybinding('workbench.action.chat.runInTerminal')?.getAriaLabel();
|
|
618
565
|
if (insertAtCursorKb) {
|
|
619
566
|
hint += ( localizeWithPath(
|
|
620
|
-
|
|
621
|
-
|
|
567
|
+
_moduleId,
|
|
568
|
+
15,
|
|
622
569
|
" - Insert the code block at the cursor ({0}).\n",
|
|
623
570
|
insertAtCursorKb
|
|
624
571
|
));
|
|
625
572
|
}
|
|
626
573
|
else {
|
|
627
574
|
hint += ( localizeWithPath(
|
|
628
|
-
|
|
629
|
-
|
|
575
|
+
_moduleId,
|
|
576
|
+
16,
|
|
630
577
|
" - Insert the code block at the cursor by configuring a keybinding for the Chat: Insert Code Block command.\n"
|
|
631
578
|
));
|
|
632
579
|
}
|
|
633
580
|
if (insertIntoNewFileKb) {
|
|
634
581
|
hint += ( localizeWithPath(
|
|
635
|
-
|
|
636
|
-
|
|
582
|
+
_moduleId,
|
|
583
|
+
17,
|
|
637
584
|
" - Insert the code block into a new file ({0}).\n",
|
|
638
585
|
insertIntoNewFileKb
|
|
639
586
|
));
|
|
640
587
|
}
|
|
641
588
|
else {
|
|
642
589
|
hint += ( localizeWithPath(
|
|
643
|
-
|
|
644
|
-
|
|
590
|
+
_moduleId,
|
|
591
|
+
18,
|
|
645
592
|
" - Insert the code block into a new file by configuring a keybinding for the Chat: Insert into New File command.\n"
|
|
646
593
|
));
|
|
647
594
|
}
|
|
648
595
|
if (runInTerminalKb) {
|
|
649
596
|
hint += ( localizeWithPath(
|
|
650
|
-
|
|
651
|
-
|
|
597
|
+
_moduleId,
|
|
598
|
+
19,
|
|
652
599
|
" - Run the code block in the terminal ({0}).\n",
|
|
653
600
|
runInTerminalKb
|
|
654
601
|
));
|
|
655
602
|
}
|
|
656
603
|
else {
|
|
657
604
|
hint += ( localizeWithPath(
|
|
658
|
-
|
|
659
|
-
|
|
605
|
+
_moduleId,
|
|
606
|
+
20,
|
|
660
607
|
" - Run the coe block in the terminal by configuring a keybinding for the Chat: Insert into Terminal command.\n"
|
|
661
608
|
));
|
|
662
609
|
}
|
|
@@ -668,8 +615,8 @@ let AccessibleView = class AccessibleView extends Disposable {
|
|
|
668
615
|
const previousKeybinding = this._keybindingService.lookupKeybinding("editor.action.accessibleViewPrevious" )?.getAriaLabel();
|
|
669
616
|
if (nextKeybinding && previousKeybinding) {
|
|
670
617
|
hint = ( localizeWithPath(
|
|
671
|
-
|
|
672
|
-
|
|
618
|
+
_moduleId,
|
|
619
|
+
21,
|
|
673
620
|
"Show the next ({0}) or previous ({1}) item.",
|
|
674
621
|
nextKeybinding,
|
|
675
622
|
previousKeybinding
|
|
@@ -677,8 +624,8 @@ let AccessibleView = class AccessibleView extends Disposable {
|
|
|
677
624
|
}
|
|
678
625
|
else {
|
|
679
626
|
hint = ( localizeWithPath(
|
|
680
|
-
|
|
681
|
-
|
|
627
|
+
_moduleId,
|
|
628
|
+
22,
|
|
682
629
|
"Show the next or previous item by configuring keybindings for the Show Next & Previous in Accessible View commands."
|
|
683
630
|
));
|
|
684
631
|
}
|
|
@@ -692,16 +639,16 @@ let AccessibleView = class AccessibleView extends Disposable {
|
|
|
692
639
|
const disableKeybinding = this._keybindingService.lookupKeybinding("editor.action.accessibleViewDisableHint" , this._contextKeyService)?.getAriaLabel();
|
|
693
640
|
if (disableKeybinding) {
|
|
694
641
|
hint = ( localizeWithPath(
|
|
695
|
-
|
|
696
|
-
|
|
642
|
+
_moduleId,
|
|
643
|
+
23,
|
|
697
644
|
"\n\nDisable accessibility verbosity for this feature ({0}).",
|
|
698
645
|
disableKeybinding
|
|
699
646
|
));
|
|
700
647
|
}
|
|
701
648
|
else {
|
|
702
649
|
hint = ( localizeWithPath(
|
|
703
|
-
|
|
704
|
-
|
|
650
|
+
_moduleId,
|
|
651
|
+
24,
|
|
705
652
|
"\n\nAdd a keybinding for the command Disable Accessible View Hint, which disables accessibility verbosity for this feature.s"
|
|
706
653
|
));
|
|
707
654
|
}
|
|
@@ -712,17 +659,12 @@ let AccessibleView = class AccessibleView extends Disposable {
|
|
|
712
659
|
let goToSymbolHint = '';
|
|
713
660
|
if (providerHasSymbols) {
|
|
714
661
|
if (goToSymbolKb) {
|
|
715
|
-
goToSymbolHint = ( localizeWithPath(
|
|
716
|
-
'vs/workbench/contrib/accessibility/browser/accessibleView',
|
|
717
|
-
'goToSymbolHint',
|
|
718
|
-
'Go to a symbol ({0}).',
|
|
719
|
-
goToSymbolKb
|
|
720
|
-
));
|
|
662
|
+
goToSymbolHint = ( localizeWithPath(_moduleId, 25, 'Go to a symbol ({0}).', goToSymbolKb));
|
|
721
663
|
}
|
|
722
664
|
else {
|
|
723
665
|
goToSymbolHint = ( localizeWithPath(
|
|
724
|
-
|
|
725
|
-
|
|
666
|
+
_moduleId,
|
|
667
|
+
26,
|
|
726
668
|
'To go to a symbol, configure a keybinding for the command Go To Symbol in Accessible View'
|
|
727
669
|
));
|
|
728
670
|
}
|
|
@@ -730,20 +672,20 @@ let AccessibleView = class AccessibleView extends Disposable {
|
|
|
730
672
|
return goToSymbolHint;
|
|
731
673
|
}
|
|
732
674
|
};
|
|
733
|
-
AccessibleView = ( __decorate([
|
|
734
|
-
( __param(0, IOpenerService)),
|
|
735
|
-
( __param(1, IInstantiationService)),
|
|
736
|
-
( __param(2, IConfigurationService)),
|
|
737
|
-
( __param(3, IModelService)),
|
|
738
|
-
( __param(4, IContextViewService)),
|
|
739
|
-
( __param(5, IContextKeyService)),
|
|
740
|
-
( __param(6, IAccessibilityService)),
|
|
741
|
-
( __param(7, IKeybindingService)),
|
|
742
|
-
( __param(8, ILayoutService)),
|
|
743
|
-
( __param(9, IMenuService)),
|
|
744
|
-
( __param(10, ICommandService)),
|
|
745
|
-
( __param(11, IChatCodeBlockContextProviderService))
|
|
746
|
-
], AccessibleView));
|
|
675
|
+
AccessibleView = ( (__decorate([
|
|
676
|
+
( (__param(0, IOpenerService))),
|
|
677
|
+
( (__param(1, IInstantiationService))),
|
|
678
|
+
( (__param(2, IConfigurationService))),
|
|
679
|
+
( (__param(3, IModelService))),
|
|
680
|
+
( (__param(4, IContextViewService))),
|
|
681
|
+
( (__param(5, IContextKeyService))),
|
|
682
|
+
( (__param(6, IAccessibilityService))),
|
|
683
|
+
( (__param(7, IKeybindingService))),
|
|
684
|
+
( (__param(8, ILayoutService))),
|
|
685
|
+
( (__param(9, IMenuService))),
|
|
686
|
+
( (__param(10, ICommandService))),
|
|
687
|
+
( (__param(11, IChatCodeBlockContextProviderService)))
|
|
688
|
+
], AccessibleView)));
|
|
747
689
|
let AccessibleViewService = class AccessibleViewService extends Disposable {
|
|
748
690
|
constructor(_instantiationService, _configurationService, _keybindingService) {
|
|
749
691
|
super();
|
|
@@ -776,17 +718,12 @@ let AccessibleViewService = class AccessibleViewService extends Disposable {
|
|
|
776
718
|
const keybinding = this._keybindingService.lookupKeybinding("editor.action.accessibleView" )?.getAriaLabel();
|
|
777
719
|
let hint = null;
|
|
778
720
|
if (keybinding) {
|
|
779
|
-
hint = ( localizeWithPath(
|
|
780
|
-
'vs/workbench/contrib/accessibility/browser/accessibleView',
|
|
781
|
-
'acessibleViewHint',
|
|
782
|
-
"Inspect this in the accessible view with {0}",
|
|
783
|
-
keybinding
|
|
784
|
-
));
|
|
721
|
+
hint = ( localizeWithPath(_moduleId, 27, "Inspect this in the accessible view with {0}", keybinding));
|
|
785
722
|
}
|
|
786
723
|
else {
|
|
787
724
|
hint = ( localizeWithPath(
|
|
788
|
-
|
|
789
|
-
|
|
725
|
+
_moduleId,
|
|
726
|
+
28,
|
|
790
727
|
"Inspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding."
|
|
791
728
|
));
|
|
792
729
|
}
|
|
@@ -803,7 +740,7 @@ let AccessibleViewService = class AccessibleViewService extends Disposable {
|
|
|
803
740
|
}
|
|
804
741
|
getLastPosition() {
|
|
805
742
|
const lastLine = this._accessibleView?.editorWidget.getModel()?.getLineCount();
|
|
806
|
-
return lastLine !== undefined && lastLine > 0 ? ( new Position(lastLine, 1)) : undefined;
|
|
743
|
+
return lastLine !== undefined && lastLine > 0 ? ( (new Position(lastLine, 1))) : undefined;
|
|
807
744
|
}
|
|
808
745
|
setPosition(position, reveal) {
|
|
809
746
|
const editorWidget = this._accessibleView?.editorWidget;
|
|
@@ -816,11 +753,11 @@ let AccessibleViewService = class AccessibleViewService extends Disposable {
|
|
|
816
753
|
return this._accessibleView?.getCodeBlockContext();
|
|
817
754
|
}
|
|
818
755
|
};
|
|
819
|
-
AccessibleViewService = ( __decorate([
|
|
820
|
-
( __param(0, IInstantiationService)),
|
|
821
|
-
( __param(1, IConfigurationService)),
|
|
822
|
-
( __param(2, IKeybindingService))
|
|
823
|
-
], AccessibleViewService));
|
|
756
|
+
AccessibleViewService = ( (__decorate([
|
|
757
|
+
( (__param(0, IInstantiationService))),
|
|
758
|
+
( (__param(1, IConfigurationService))),
|
|
759
|
+
( (__param(2, IKeybindingService)))
|
|
760
|
+
], AccessibleViewService)));
|
|
824
761
|
let AccessibleViewSymbolQuickPick = class AccessibleViewSymbolQuickPick {
|
|
825
762
|
constructor(_accessibleView, _quickInputService) {
|
|
826
763
|
this._accessibleView = _accessibleView;
|
|
@@ -828,16 +765,8 @@ let AccessibleViewSymbolQuickPick = class AccessibleViewSymbolQuickPick {
|
|
|
828
765
|
}
|
|
829
766
|
show(provider) {
|
|
830
767
|
const quickPick = this._quickInputService.createQuickPick();
|
|
831
|
-
quickPick.placeholder = ( localizeWithPath(
|
|
832
|
-
|
|
833
|
-
'accessibleViewSymbolQuickPickPlaceholder',
|
|
834
|
-
"Type to search symbols"
|
|
835
|
-
));
|
|
836
|
-
quickPick.title = ( localizeWithPath(
|
|
837
|
-
'vs/workbench/contrib/accessibility/browser/accessibleView',
|
|
838
|
-
'accessibleViewSymbolQuickPickTitle',
|
|
839
|
-
"Go to Symbol Accessible View"
|
|
840
|
-
));
|
|
768
|
+
quickPick.placeholder = ( localizeWithPath(_moduleId, 29, "Type to search symbols"));
|
|
769
|
+
quickPick.title = ( localizeWithPath(_moduleId, 30, "Go to Symbol Accessible View"));
|
|
841
770
|
const symbols = this._accessibleView.getSymbols();
|
|
842
771
|
if (!symbols) {
|
|
843
772
|
return;
|
|
@@ -858,14 +787,14 @@ let AccessibleViewSymbolQuickPick = class AccessibleViewSymbolQuickPick {
|
|
|
858
787
|
});
|
|
859
788
|
}
|
|
860
789
|
};
|
|
861
|
-
AccessibleViewSymbolQuickPick = ( __decorate([
|
|
862
|
-
( __param(1, IQuickInputService))
|
|
863
|
-
], AccessibleViewSymbolQuickPick));
|
|
790
|
+
AccessibleViewSymbolQuickPick = ( (__decorate([
|
|
791
|
+
( (__param(1, IQuickInputService)))
|
|
792
|
+
], AccessibleViewSymbolQuickPick)));
|
|
864
793
|
function shouldHide(event, keybindingService, configurationService) {
|
|
865
794
|
if (!configurationService.getValue("accessibility.accessibleView.closeOnKeyPress" )) {
|
|
866
795
|
return false;
|
|
867
796
|
}
|
|
868
|
-
const standardKeyboardEvent = ( new StandardKeyboardEvent(event));
|
|
797
|
+
const standardKeyboardEvent = ( (new StandardKeyboardEvent(event)));
|
|
869
798
|
const resolveResult = keybindingService.softDispatch(standardKeyboardEvent, standardKeyboardEvent.target);
|
|
870
799
|
const isValidChord = resolveResult.kind === 1 ;
|
|
871
800
|
if (keybindingService.inChordMode || isValidChord) {
|
|
@@ -7,6 +7,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
|
|
|
7
7
|
import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
8
8
|
import { Event } from 'vscode/vscode/vs/base/common/event';
|
|
9
9
|
|
|
10
|
+
const _moduleId = "vs/workbench/contrib/accessibility/browser/openDiffEditorAnnouncement";
|
|
10
11
|
let DiffEditorActiveAnnouncementContribution = class DiffEditorActiveAnnouncementContribution extends Disposable {
|
|
11
12
|
static { this.ID = 'workbench.contrib.diffEditorActiveAnnouncement'; }
|
|
12
13
|
constructor(_editorService, _accessibilityService, _configurationService) {
|
|
@@ -34,19 +35,15 @@ let DiffEditorActiveAnnouncementContribution = class DiffEditorActiveAnnouncemen
|
|
|
34
35
|
}
|
|
35
36
|
this._onDidActiveEditorChangeListener = this._register(this._editorService.onDidActiveEditorChange(() => {
|
|
36
37
|
if (isDiffEditor(this._editorService.activeTextEditorControl)) {
|
|
37
|
-
this._accessibilityService.alert(( localizeWithPath(
|
|
38
|
-
'vs/workbench/contrib/accessibility/browser/openDiffEditorAnnouncement',
|
|
39
|
-
'openDiffEditorAnnouncement',
|
|
40
|
-
"Diff editor"
|
|
41
|
-
)));
|
|
38
|
+
this._accessibilityService.alert(( localizeWithPath(_moduleId, 0, "Diff editor")));
|
|
42
39
|
}
|
|
43
40
|
}));
|
|
44
41
|
}
|
|
45
42
|
};
|
|
46
|
-
DiffEditorActiveAnnouncementContribution = ( __decorate([
|
|
47
|
-
( __param(0, IEditorService)),
|
|
48
|
-
( __param(1, IAccessibilityService)),
|
|
49
|
-
( __param(2, IConfigurationService))
|
|
50
|
-
], DiffEditorActiveAnnouncementContribution));
|
|
43
|
+
DiffEditorActiveAnnouncementContribution = ( (__decorate([
|
|
44
|
+
( (__param(0, IEditorService))),
|
|
45
|
+
( (__param(1, IAccessibilityService))),
|
|
46
|
+
( (__param(2, IConfigurationService)))
|
|
47
|
+
], DiffEditorActiveAnnouncementContribution)));
|
|
51
48
|
|
|
52
49
|
export { DiffEditorActiveAnnouncementContribution };
|
|
@@ -7,15 +7,12 @@ import { accessibilityHelpIsShown } from 'vscode/vscode/vs/workbench/contrib/acc
|
|
|
7
7
|
import { alert } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
|
|
8
8
|
import { AccessibilityHelpNLS } from 'vscode/vscode/vs/editor/common/standaloneStrings';
|
|
9
9
|
|
|
10
|
+
const _moduleId = "vs/workbench/contrib/codeEditor/browser/accessibility/accessibility";
|
|
10
11
|
class ToggleScreenReaderMode extends Action2 {
|
|
11
12
|
constructor() {
|
|
12
13
|
super({
|
|
13
14
|
id: 'editor.action.toggleScreenReaderAccessibilityMode',
|
|
14
|
-
title: ( localize2WithPath(
|
|
15
|
-
'vs/workbench/contrib/codeEditor/browser/accessibility/accessibility',
|
|
16
|
-
'toggleScreenReaderMode',
|
|
17
|
-
"Toggle Screen Reader Accessibility Mode"
|
|
18
|
-
)),
|
|
15
|
+
title: ( localize2WithPath(_moduleId, 0, "Toggle Screen Reader Accessibility Mode")),
|
|
19
16
|
f1: true,
|
|
20
17
|
keybinding: [{
|
|
21
18
|
primary: 2048 | 35 ,
|