@codingame/monaco-vscode-accessibility-service-override 25.1.2 → 26.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-accessibility-service-override",
-  "version": "25.1.2",
+  "version": "26.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - accessibility service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "25.1.2",
+    "@codingame/monaco-vscode-api": "26.0.1",
     "marked": "14.0.0"
   },
   "main": "index.js",

package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibility.contribution.js

@@ -23,8 +23,28 @@ workbenchRegistry.registerWorkbenchContribution(UnfocusedViewDimmingContribution
 workbenchRegistry.registerWorkbenchContribution(AccesibleViewHelpContribution, LifecyclePhase.Eventually);
 workbenchRegistry.registerWorkbenchContribution(AccesibleViewContributions, LifecyclePhase.Eventually);
 registerWorkbenchContribution2(AccessibilityStatus.ID, AccessibilityStatus, WorkbenchPhase.BlockRestore);
-registerWorkbenchContribution2(ExtensionAccessibilityHelpDialogContribution.ID, ExtensionAccessibilityHelpDialogContribution, WorkbenchPhase.BlockRestore);
-registerWorkbenchContribution2(SaveAccessibilitySignalContribution.ID, SaveAccessibilitySignalContribution, WorkbenchPhase.AfterRestored);
-registerWorkbenchContribution2(SpeechAccessibilitySignalContribution.ID, SpeechAccessibilitySignalContribution, WorkbenchPhase.AfterRestored);
-registerWorkbenchContribution2(DiffEditorActiveAnnouncementContribution.ID, DiffEditorActiveAnnouncementContribution, WorkbenchPhase.AfterRestored);
-registerWorkbenchContribution2(DynamicSpeechAccessibilityConfiguration.ID, DynamicSpeechAccessibilityConfiguration, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(
+    ExtensionAccessibilityHelpDialogContribution.ID,
+    ExtensionAccessibilityHelpDialogContribution,
+    WorkbenchPhase.BlockRestore
+);
+registerWorkbenchContribution2(
+    SaveAccessibilitySignalContribution.ID,
+    SaveAccessibilitySignalContribution,
+    WorkbenchPhase.AfterRestored
+);
+registerWorkbenchContribution2(
+    SpeechAccessibilitySignalContribution.ID,
+    SpeechAccessibilitySignalContribution,
+    WorkbenchPhase.AfterRestored
+);
+registerWorkbenchContribution2(
+    DiffEditorActiveAnnouncementContribution.ID,
+    DiffEditorActiveAnnouncementContribution,
+    WorkbenchPhase.AfterRestored
+);
+registerWorkbenchContribution2(
+    DynamicSpeechAccessibilityConfiguration.ID,
+    DynamicSpeechAccessibilityConfiguration,
+    WorkbenchPhase.AfterRestored
+);

package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.js

@@ -15,8 +15,16 @@ import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 
 let AccessibilityStatus = class AccessibilityStatus extends Disposable {
-    static { this.ID = 'workbench.contrib.accessibilityStatus'; }
-    constructor(configurationService, notificationService, accessibilityService, statusbarService, openerService) {
+    static {
+        this.ID = "workbench.contrib.accessibilityStatus";
+    }
+    constructor(
+        configurationService,
+        notificationService,
+        accessibilityService,
+        statusbarService,
+        openerService
+    ) {
         super();
         this.configurationService = configurationService;
         this.notificationService = notificationService;
@@ -26,40 +34,44 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
         this.screenReaderNotification = null;
         this.promptedScreenReader = false;
         this.screenReaderModeElement = this._register(( new MutableDisposable()));
-        this._register(CommandsRegistry.registerCommand({ id: 'showEditorScreenReaderNotification', handler: () => this.showScreenReaderNotification() }));
+        this._register(CommandsRegistry.registerCommand({
+            id: "showEditorScreenReaderNotification",
+            handler: () => this.showScreenReaderNotification()
+        }));
         this.updateScreenReaderModeElement(this.accessibilityService.isScreenReaderOptimized());
         this.registerListeners();
     }
     registerListeners() {
-        this._register(this.accessibilityService.onDidChangeScreenReaderOptimized(() => this.onScreenReaderModeChange()));
+        this._register(
+            this.accessibilityService.onDidChangeScreenReaderOptimized(() => this.onScreenReaderModeChange())
+        );
         this._register(this.configurationService.onDidChangeConfiguration(c => {
-            if (c.affectsConfiguration('editor.accessibilitySupport')) {
+            if (c.affectsConfiguration("editor.accessibilitySupport")) {
                 this.onScreenReaderModeChange();
             }
         }));
     }
     showScreenReaderNotification() {
         this.screenReaderNotification = this.notificationService.prompt(Severity.Info, ( localize(
-            4376,
+            4386,
             "Screen reader usage detected. Do you want to enable {0} to optimize the editor for screen reader usage?",
-            'editor.accessibilitySupport'
+            "editor.accessibilitySupport"
         )), [{
-                label: ( localize(4377, "Yes")),
-                run: () => {
-                    this.configurationService.updateValue('editor.accessibilitySupport', 'on', ConfigurationTarget.USER);
-                }
-            }, {
-                label: ( localize(4378, "No")),
-                run: () => {
-                    this.configurationService.updateValue('editor.accessibilitySupport', 'off', ConfigurationTarget.USER);
-                }
-            },
-            {
-                label: ( localize(4379, "Learn More")),
-                run: () => {
-                    this.openerService.open('https://code.visualstudio.com/docs/editor/accessibility#_screen-readers');
-                }
-            }], {
+            label: ( localize(4387, "Yes")),
+            run: () => {
+                this.configurationService.updateValue("editor.accessibilitySupport", "on", ConfigurationTarget.USER);
+            }
+        }, {
+            label: ( localize(4388, "No")),
+            run: () => {
+                this.configurationService.updateValue("editor.accessibilitySupport", "off", ConfigurationTarget.USER);
+            }
+        }, {
+            label: ( localize(4389, "Learn More")),
+            run: () => {
+                this.openerService.open("https://code.visualstudio.com/docs/editor/accessibility#_screen-readers");
+            }
+        }], {
             sticky: true,
             priority: NotificationPriority.URGENT
         });
@@ -68,26 +80,25 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
     updateScreenReaderModeElement(visible) {
         if (visible) {
             if (!this.screenReaderModeElement.value) {
-                const text = ( localize(4380, "Screen Reader Optimized"));
+                const text = ( localize(4390, "Screen Reader Optimized"));
                 this.screenReaderModeElement.value = this.statusbarService.addEntry({
-                    name: ( localize(4381, "Screen Reader Mode")),
+                    name: ( localize(4391, "Screen Reader Mode")),
                     text,
                     ariaLabel: text,
-                    command: 'showEditorScreenReaderNotification',
-                    kind: 'prominent',
+                    command: "showEditorScreenReaderNotification",
+                    kind: "prominent",
                     showInAllWindows: true
-                }, 'status.editor.screenReaderMode', StatusbarAlignment.RIGHT, 100.6);
+                }, "status.editor.screenReaderMode", StatusbarAlignment.RIGHT, 100.6);
             }
-        }
-        else {
+        } else {
             this.screenReaderModeElement.clear();
         }
     }
     onScreenReaderModeChange() {
         const screenReaderDetected = this.accessibilityService.isScreenReaderOptimized();
         if (screenReaderDetected) {
-            const screenReaderConfiguration = this.configurationService.getValue('editor.accessibilitySupport');
-            if (screenReaderConfiguration === 'auto') {
+            const screenReaderConfiguration = this.configurationService.getValue("editor.accessibilitySupport");
+            if (screenReaderConfiguration === "auto") {
                 if (!this.promptedScreenReader) {
                     this.promptedScreenReader = true;
                     setTimeout(() => this.showScreenReaderNotification(), 100);
@@ -100,12 +111,6 @@ let AccessibilityStatus = class AccessibilityStatus extends Disposable {
         this.updateScreenReaderModeElement(this.accessibilityService.isScreenReaderOptimized());
     }
 };
-AccessibilityStatus = ( __decorate([
-    ( __param(0, IConfigurationService)),
-    ( __param(1, INotificationService)),
-    ( __param(2, IAccessibilityService)),
-    ( __param(3, IStatusbarService)),
-    ( __param(4, IOpenerService))
-], AccessibilityStatus));
+AccessibilityStatus = ( __decorate([( __param(0, IConfigurationService)), ( __param(1, INotificationService)), ( __param(2, IAccessibilityService)), ( __param(3, IStatusbarService)), ( __param(4, IOpenerService))], AccessibilityStatus));
 
 export { AccessibilityStatus };

package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleView.d.ts

@@ -1,11 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { CodeEditorWidget } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget";
 import { IPosition, Position } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position";
-import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
 import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
-import { ITextModelContentProvider } from "@codingame/monaco-vscode-model-service-override/vscode/vs/editor/common/services/resolverService";
-import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { AccessibleContentProvider, AccessibleViewProviderId, ExtensionContentProvider, IAccessibleViewSymbol } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView";
 import { IAccessibleViewService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView.service";
 import { IAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service";
@@ -25,7 +21,7 @@ import { IChatCodeBlockContextProviderService } from "@codingame/monaco-vscode-a
 import { ICodeBlockActionContext } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/codeBlockPart";
 import { AccessibilityVerbositySettingId } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration";
 export type AccesibleViewContentProvider = AccessibleContentProvider | ExtensionContentProvider;
-export declare class AccessibleView extends Disposable implements ITextModelContentProvider {
+export declare class AccessibleView extends Disposable {
     private readonly _openerService;
     private readonly _instantiationService;
     private readonly _configurationService;
@@ -39,7 +35,6 @@ export declare class AccessibleView extends Disposable implements ITextModelCont
     private readonly _commandService;
     private readonly _codeBlockContextProviderService;
     private readonly _storageService;
-    private readonly textModelResolverService;
     private readonly _quickInputService;
     private readonly _accessibilitySignalService;
     private _editorWidget;
@@ -64,9 +59,8 @@ export declare class AccessibleView extends Disposable implements ITextModelCont
     private _currentContent;
     private _lastProvider;
     private _viewContainer;
-    constructor(_openerService: IOpenerService, _instantiationService: IInstantiationService, _configurationService: IConfigurationService, _modelService: IModelService, _contextViewService: IContextViewService, _contextKeyService: IContextKeyService, _accessibilityService: IAccessibilityService, _keybindingService: IKeybindingService, _layoutService: ILayoutService, _menuService: IMenuService, _commandService: ICommandService, _codeBlockContextProviderService: IChatCodeBlockContextProviderService, _storageService: IStorageService, textModelResolverService: ITextModelService, _quickInputService: IQuickInputService, _accessibilitySignalService: IAccessibilitySignalService);
+    constructor(_openerService: IOpenerService, _instantiationService: IInstantiationService, _configurationService: IConfigurationService, _modelService: IModelService, _contextViewService: IContextViewService, _contextKeyService: IContextKeyService, _accessibilityService: IAccessibilityService, _keybindingService: IKeybindingService, _layoutService: ILayoutService, _menuService: IMenuService, _commandService: ICommandService, _codeBlockContextProviderService: IChatCodeBlockContextProviderService, _storageService: IStorageService, _quickInputService: IQuickInputService, _accessibilitySignalService: IAccessibilitySignalService);
     private _playDiffSignals;
-    provideTextContent(resource: URI): Promise<ITextModel | null> | null;
     private _resetContextKeys;
     getPosition(id?: AccessibleViewProviderId): Position | undefined;
     setPosition(position: Position, reveal?: boolean, select?: boolean): void;
@@ -86,6 +80,7 @@ export declare class AccessibleView extends Disposable implements ITextModelCont
     showSymbol(provider: AccesibleViewContentProvider, symbol: IAccessibleViewSymbol): void;
     disableHint(): void;
     private _updateContextKeys;
+    private _getStableUri;
     private _updateContent;
     private _render;
     private _updateToolbar;