fix microsoft#186857 (microsoft#188248)

Author: sandy081

src/vs/workbench/services/userDataProfile/browser/extensionsResource.ts

@@ -274,7 +274,10 @@ export abstract class ExtensionsResourceTreeItem implements IProfileResourceTree
 						that.excludedExtensions.add(e.identifier.id.toLowerCase());
 					}
 				},
-				tooltip: localize('exclude', "Select {0} Extension", e.displayName || e.identifier.id)
+				tooltip: localize('exclude', "Select {0} Extension", e.displayName || e.identifier.id),
+				accessibilityInformation: {
+					label: localize('exclude', "Select {0} Extension", e.displayName || e.identifier.id),
+				}
 			} : undefined,
 			command: {
 				id: 'extension.open',

src/vs/workbench/services/userDataProfile/browser/globalStateResource.ts

@@ -9,6 +9,7 @@ import { localize } from 'vs/nls';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IStorageEntry, IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
+import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { IUserDataProfile, ProfileResourceType } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { IUserDataProfileStorageService } from 'vs/platform/userDataProfile/common/userDataProfileStorageService';
 import { API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
@@ -97,13 +98,19 @@ export abstract class GlobalStateResourceTreeItem implements IProfileResourceTre
 	readonly collapsibleState = TreeItemCollapsibleState.Collapsed;
 	checkbox: ITreeItemCheckboxState | undefined;
 
-	constructor(private readonly resource: URI) { }
+	constructor(
+		private readonly resource: URI,
+		private readonly uriIdentityService: IUriIdentityService
+	) { }
 
 	async getChildren(): Promise<IProfileResourceChildTreeItem[]> {
 		return [{
 			handle: this.resource.toString(),
 			resourceUri: this.resource,
 			collapsibleState: TreeItemCollapsibleState.None,
+			accessibilityInformation: {
+				label: this.uriIdentityService.extUri.basename(this.resource)
+			},
 			parent: this,
 			command: {
 				id: API_OPEN_EDITOR_COMMAND_ID,
@@ -122,9 +129,10 @@ export class GlobalStateResourceExportTreeItem extends GlobalStateResourceTreeIt
 	constructor(
 		private readonly profile: IUserDataProfile,
 		resource: URI,
+		@IUriIdentityService uriIdentityService: IUriIdentityService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
-		super(resource);
+		super(resource, uriIdentityService);
 	}
 
 	async hasContent(): Promise<boolean> {
@@ -147,8 +155,9 @@ export class GlobalStateResourceImportTreeItem extends GlobalStateResourceTreeIt
 	constructor(
 		private readonly content: string,
 		resource: URI,
+		@IUriIdentityService uriIdentityService: IUriIdentityService,
 	) {
-		super(resource);
+		super(resource, uriIdentityService);
 	}
 
 	async getContent(): Promise<string> {

src/vs/workbench/services/userDataProfile/browser/keybindingsResource.ts

@@ -13,6 +13,7 @@ import { IUserDataProfile, ProfileResourceType } from 'vs/platform/userDataProfi
 import { API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { localize } from 'vs/nls';
+import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 
 interface IKeybindingsResourceContent {
 	platform: Platform;
@@ -91,6 +92,7 @@ export class KeybindingsResourceTreeItem implements IProfileResourceTreeItem {
 
 	constructor(
 		private readonly profile: IUserDataProfile,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) { }
 
@@ -104,6 +106,9 @@ export class KeybindingsResourceTreeItem implements IProfileResourceTreeItem {
 			resourceUri: this.profile.keybindingsResource,
 			collapsibleState: TreeItemCollapsibleState.None,
 			parent: this,
+			accessibilityInformation: {
+				label: this.uriIdentityService.extUri.basename(this.profile.settingsResource)
+			},
 			command: {
 				id: API_OPEN_EDITOR_COMMAND_ID,
 				title: '',

src/vs/workbench/services/userDataProfile/browser/settingsResource.ts

@@ -16,6 +16,7 @@ import { IUserDataProfile, ProfileResourceType } from 'vs/platform/userDataProfi
 import { API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { localize } from 'vs/nls';
+import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 
 interface ISettingsContent {
 	settings: string | null;
@@ -110,6 +111,7 @@ export class SettingsResourceTreeItem implements IProfileResourceTreeItem {
 
 	constructor(
 		private readonly profile: IUserDataProfile,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) { }
 
@@ -119,6 +121,9 @@ export class SettingsResourceTreeItem implements IProfileResourceTreeItem {
 			resourceUri: this.profile.settingsResource,
 			collapsibleState: TreeItemCollapsibleState.None,
 			parent: this,
+			accessibilityInformation: {
+				label: this.uriIdentityService.extUri.basename(this.profile.settingsResource)
+			},
 			command: {
 				id: API_OPEN_EDITOR_COMMAND_ID,
 				title: '',

src/vs/workbench/services/userDataProfile/browser/snippetsResource.ts

@@ -109,6 +109,7 @@ export class SnippetsResourceTreeItem implements IProfileResourceTreeItem {
 	constructor(
 		private readonly profile: IUserDataProfile,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 	) { }
 
 	async getChildren(): Promise<IProfileResourceChildTreeItem[] | undefined> {
@@ -119,6 +120,9 @@ export class SnippetsResourceTreeItem implements IProfileResourceTreeItem {
 			parent: that,
 			resourceUri: resource,
 			collapsibleState: TreeItemCollapsibleState.None,
+			accessibilityInformation: {
+				label: this.uriIdentityService.extUri.basename(resource),
+			},
 			checkbox: that.checkbox ? {
 				get isChecked() { return !that.excludedSnippets.has(resource); },
 				set isChecked(value: boolean) {
@@ -127,6 +131,9 @@ export class SnippetsResourceTreeItem implements IProfileResourceTreeItem {
 					} else {
 						that.excludedSnippets.add(resource);
 					}
+				},
+				accessibilityInformation: {
+					label: localize('exclude', "Select Snippet {0}", this.uriIdentityService.extUri.basename(resource)),
 				}
 			} : undefined,
 			command: {

src/vs/workbench/services/userDataProfile/browser/tasksResource.ts

@@ -8,6 +8,7 @@ import { localize } from 'vs/nls';
 import { FileOperationError, FileOperationResult, IFileService } from 'vs/platform/files/common/files';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vs/platform/log/common/log';
+import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { IUserDataProfile, ProfileResourceType } from 'vs/platform/userDataProfile/common/userDataProfile';
 import { API_OPEN_EDITOR_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands';
 import { ITreeItemCheckboxState, TreeItemCollapsibleState } from 'vs/workbench/common/views';
@@ -89,6 +90,7 @@ export class TasksResourceTreeItem implements IProfileResourceTreeItem {
 
 	constructor(
 		private readonly profile: IUserDataProfile,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) { }
 
@@ -98,6 +100,9 @@ export class TasksResourceTreeItem implements IProfileResourceTreeItem {
 			resourceUri: this.profile.tasksResource,
 			collapsibleState: TreeItemCollapsibleState.None,
 			parent: this,
+			accessibilityInformation: {
+				label: this.uriIdentityService.extUri.basename(this.profile.settingsResource)
+			},
 			command: {
 				id: API_OPEN_EDITOR_COMMAND_ID,
 				title: '',

src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts

@@ -899,7 +899,7 @@ abstract class UserDataProfileImportExportState extends Disposable implements IT
 			if (children) {
 				for (const child of children) {
 					child.checkbox = child.parent.checkbox && child.checkbox
-						? { isChecked: child.parent.checkbox.isChecked ? child.checkbox.isChecked : false }
+						? { ...child.checkbox, isChecked: child.parent.checkbox.isChecked ? child.checkbox.isChecked : false }
 						: undefined;
 				}
 			}
@@ -918,7 +918,13 @@ abstract class UserDataProfileImportExportState extends Disposable implements IT
 			this.rootsPromise = (async () => {
 				this.roots = await this.fetchRoots();
 				for (const root of this.roots) {
-					root.checkbox = { isChecked: !root.isFromDefaultProfile(), tooltip: localize('select', "Select {0}", root.label.label) };
+					root.checkbox = {
+						isChecked: !root.isFromDefaultProfile(),
+						tooltip: localize('select', "Select {0}", root.label.label),
+						accessibilityInformation: {
+							label: localize('select', "Select {0}", root.label.label),
+						}
+					};
 					if (root.isFromDefaultProfile()) {
 						root.description = localize('from default', "From Default Profile");
 					}