diff --git a/src/vs/base/common/accessibility.ts b/src/vs/base/common/accessibility.ts deleted file mode 100644 index 4b2322da9c288491d0b620f4e0f03deed1258292..0000000000000000000000000000000000000000 --- a/src/vs/base/common/accessibility.ts +++ /dev/null @@ -1,9 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -export interface AccessibilityInformation { - label: string; - role?: string; -} diff --git a/src/vs/platform/accessibility/common/accessibility.ts b/src/vs/platform/accessibility/common/accessibility.ts index 3a025be247a59d618033b999cd52b71b0fb01381..65fcf4abaf6995821b18dba9d3d15987146a0c07 100644 --- a/src/vs/platform/accessibility/common/accessibility.ts +++ b/src/vs/platform/accessibility/common/accessibility.ts @@ -32,3 +32,8 @@ export const enum AccessibilitySupport { } export const CONTEXT_ACCESSIBILITY_MODE_ENABLED = new RawContextKey('accessibilityModeEnabled', false); + +export interface IAccessibilityInformation { + label: string; + role?: string; +} diff --git a/src/vs/workbench/api/browser/mainThreadStatusBar.ts b/src/vs/workbench/api/browser/mainThreadStatusBar.ts index 46feba4475be675a101239d4070c84c4ec9acac4..33e5b948c9f386269aa144aca3eb3ff1e918a00d 100644 --- a/src/vs/workbench/api/browser/mainThreadStatusBar.ts +++ b/src/vs/workbench/api/browser/mainThreadStatusBar.ts @@ -9,7 +9,7 @@ import { ThemeColor } from 'vs/platform/theme/common/themeService'; import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers'; import { dispose } from 'vs/base/common/lifecycle'; import { Command } from 'vs/editor/common/modes'; -import { AccessibilityInformation } from 'vs/base/common/accessibility'; +import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility'; @extHostNamedCustomer(MainContext.MainThreadStatusBar) export class MainThreadStatusBar implements MainThreadStatusBarShape { @@ -26,7 +26,7 @@ export class MainThreadStatusBar implements MainThreadStatusBarShape { this.entries.clear(); } - $setEntry(id: number, statusId: string, statusName: string, text: string, tooltip: string | undefined, command: Command | undefined, color: string | ThemeColor | undefined, alignment: MainThreadStatusBarAlignment, priority: number | undefined, accessibilityInformation: AccessibilityInformation): void { + $setEntry(id: number, statusId: string, statusName: string, text: string, tooltip: string | undefined, command: Command | undefined, color: string | ThemeColor | undefined, alignment: MainThreadStatusBarAlignment, priority: number | undefined, accessibilityInformation: IAccessibilityInformation): void { // if there are icons in the text use the tooltip for the aria label let ariaLabel: string; if (accessibilityInformation) { diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts index bd821f097a192c7aa27cc8f65ab3c7fa276396b9..0dd2ec1b545093f0d0df2009cd72f26c4095b090 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts @@ -56,7 +56,7 @@ import { CallHierarchyItem } from 'vs/workbench/contrib/callHierarchy/common/cal import { Dto } from 'vs/base/common/types'; import { ISerializableEnvironmentVariableCollection } from 'vs/workbench/contrib/terminal/common/environmentVariable'; import { DebugConfigurationProviderTriggerKind } from 'vs/workbench/api/common/extHostTypes'; -import { AccessibilityInformation } from 'vs/base/common/accessibility'; +import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility'; export interface IEnvironment { isExtensionDevelopmentDebug: boolean; @@ -546,7 +546,7 @@ export interface MainThreadQuickOpenShape extends IDisposable { } export interface MainThreadStatusBarShape extends IDisposable { - $setEntry(id: number, statusId: string, statusName: string, text: string, tooltip: string | undefined, command: ICommandDto | undefined, color: string | ThemeColor | undefined, alignment: statusbar.StatusbarAlignment, priority: number | undefined, accessibilityInformation: AccessibilityInformation | undefined): void; + $setEntry(id: number, statusId: string, statusName: string, text: string, tooltip: string | undefined, command: ICommandDto | undefined, color: string | ThemeColor | undefined, alignment: statusbar.StatusbarAlignment, priority: number | undefined, accessibilityInformation: IAccessibilityInformation | undefined): void; $dispose(id: number): void; } diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts index a73ce8f34f61200a4db4e0ae7efc6814e0092a4e..7ed78a972f589486fd858d0fa7f29e17c39130f0 100644 --- a/src/vs/workbench/common/views.ts +++ b/src/vs/workbench/common/views.ts @@ -22,7 +22,7 @@ import { SetMap } from 'vs/base/common/collections'; import { IProgressIndicator } from 'vs/platform/progress/common/progress'; import Severity from 'vs/base/common/severity'; import { IPaneComposite } from 'vs/workbench/common/panecomposite'; -import { AccessibilityInformation } from 'vs/base/common/accessibility'; +import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility'; export const TEST_VIEW_CONTAINER_ID = 'workbench.view.extension.test'; @@ -636,7 +636,7 @@ export interface ITreeItem { children?: ITreeItem[]; - accessibilityInformation?: AccessibilityInformation; + accessibilityInformation?: IAccessibilityInformation; } export interface ITreeViewDataProvider { diff --git a/src/vs/workbench/contrib/timeline/common/timeline.ts b/src/vs/workbench/contrib/timeline/common/timeline.ts index 09a40ad3432f841d6ad66fcf6b752ec9e14450ac..c63e6ad52a108390aaa8b923fe72e43dd0f48bbb 100644 --- a/src/vs/workbench/contrib/timeline/common/timeline.ts +++ b/src/vs/workbench/contrib/timeline/common/timeline.ts @@ -10,7 +10,7 @@ import { URI } from 'vs/base/common/uri'; import { Command } from 'vs/editor/common/modes'; import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { AccessibilityInformation } from 'vs/base/common/accessibility'; +import { IAccessibilityInformation } from 'vs/platform/accessibility/common/accessibility'; export function toKey(extension: ExtensionIdentifier | string, source: string) { return `${typeof extension === 'string' ? extension : ExtensionIdentifier.toKey(extension)}|${source}`; @@ -25,7 +25,7 @@ export interface TimelineItem { id?: string; timestamp: number; label: string; - accessibilityInformation?: AccessibilityInformation; + accessibilityInformation?: IAccessibilityInformation; icon?: URI, iconDark?: URI, themeIcon?: { id: string },