polish import/export (microsoft#166703)

Author: sandy081

src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts

@@ -261,24 +261,24 @@ const jsonRegistry = <jsonContributionRegistry.IJSONContributionRegistry>Registr
 jsonRegistry.registerSchema(ExtensionsConfigurationSchemaId, ExtensionsConfigurationSchema);
 
 // Register Commands
-CommandsRegistry.registerCommand('_extensions.manage', (accessor: ServicesAccessor, extensionId: string, tab?: ExtensionEditorTab) => {
+CommandsRegistry.registerCommand('_extensions.manage', (accessor: ServicesAccessor, extensionId: string, tab?: ExtensionEditorTab, preserveFocus?: boolean) => {
 	const extensionService = accessor.get(IExtensionsWorkbenchService);
 	const extension = extensionService.local.filter(e => areSameExtensions(e.identifier, { id: extensionId }));
 	if (extension.length === 1) {
-		extensionService.open(extension[0], { tab });
+		extensionService.open(extension[0], { tab, preserveFocus });
 	}
 });
 
-CommandsRegistry.registerCommand('extension.open', async (accessor: ServicesAccessor, extensionId: string, tab?: ExtensionEditorTab) => {
+CommandsRegistry.registerCommand('extension.open', async (accessor: ServicesAccessor, extensionId: string, tab?: ExtensionEditorTab, preserveFocus?: boolean) => {
 	const extensionService = accessor.get(IExtensionsWorkbenchService);
 	const commandService = accessor.get(ICommandService);
 
 	const [extension] = await extensionService.getExtensions([{ id: extensionId }], CancellationToken.None);
 	if (extension) {
-		return extensionService.open(extension, { tab });
+		return extensionService.open(extension, { tab, preserveFocus });
 	}
 
-	return commandService.executeCommand('_extensions.manage', extensionId, tab);
+	return commandService.executeCommand('_extensions.manage', extensionId, tab, preserveFocus);
 });
 
 CommandsRegistry.registerCommand({

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

@@ -176,7 +176,7 @@ export class ExtensionsResourceExportTreeItem implements IProfileResourceTreeIte
 			command: {
 				id: 'extension.open',
 				title: '',
-				arguments: [e.identifier.id]
+				arguments: [e.identifier.id, undefined, true]
 			}
 		}));
 	}
@@ -214,11 +214,16 @@ export class ExtensionsResourceImportTreeItem implements IProfileResourceTreeIte
 			command: {
 				id: 'extension.open',
 				title: '',
-				arguments: [e.identifier.id]
+				arguments: [e.identifier.id, undefined, true]
 			}
 		}));
 	}
 
+	async hasContent(): Promise<boolean> {
+		const extensions = await this.instantiationService.createInstance(ExtensionsResource).getProfileExtensions(this.content);
+		return extensions.length > 0;
+	}
+
 }
 
 

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

@@ -77,9 +77,15 @@ export class GlobalStateResourceExportTreeItem implements IProfileResourceTreeIt
 	readonly label = { label: localize('globalState', "UI State") };
 	readonly collapsibleState = TreeItemCollapsibleState.None;
 	checkbox: ITreeItemCheckboxState = { isChecked: true };
+	readonly command = {
+		id: API_OPEN_EDITOR_COMMAND_ID,
+		title: '',
+		arguments: [this.resource, undefined, undefined]
+	};
 
 	constructor(
 		private readonly profile: IUserDataProfile,
+		private readonly resource: URI,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) { }