Skip to content

Commit

Permalink
Merge branch 'main' into alex/esm
Browse files Browse the repository at this point in the history
  • Loading branch information
@jrieken
jrieken committed Jan 17, 2023
2 parents de94d0a + 19bd91a commit b42832f
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 110 deletions.
6 changes: 3 additions & 3 deletions src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,12 +567,12 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
}, {
id: SyncResource.Tasks,
label: getSyncAreaLabel(SyncResource.Tasks)
}, {
id: SyncResource.Extensions,
label: getSyncAreaLabel(SyncResource.Extensions)
}, {
id: SyncResource.GlobalState,
label: getSyncAreaLabel(SyncResource.GlobalState),
}, {
id: SyncResource.Extensions,
label: getSyncAreaLabel(SyncResource.Extensions)
}];
if (this.userDataProfilesService.isEnabled()) {
result.push({
Expand Down
1 change: 0 additions & 1 deletion src/vs/workbench/contrib/userDataSync/browser/userDataSyncConflictsView.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import 'vs/css!./media/userDataSyncViews';
import { ITreeItem, TreeItemCollapsibleState, TreeViewItemHandleArg, IViewDescriptorService } from 'vs/workbench/common/views';
import { localize } from 'vs/nls';
import { TreeViewPane } from 'vs/workbench/browser/parts/views/treeView';
Expand Down
0 ...owser/rawSearchService.integrationTest.ts → .../node/rawSearchService.integrationTest.ts
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion src/vs/workbench/services/userDataProfile/browser/globalStateResource.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export abstract class GlobalStateResourceTreeItem implements IProfileResourceTre
readonly type = ProfileResourceType.GlobalState;
readonly handle = ProfileResourceType.GlobalState;
readonly label = { label: localize('globalState', "UI State") };
readonly collapsibleState = TreeItemCollapsibleState.Expanded;
readonly collapsibleState = TreeItemCollapsibleState.Collapsed;
checkbox: ITreeItemCheckboxState = { isChecked: true };

constructor(private readonly resource: URI) { }
Expand Down
6 changes: 3 additions & 3 deletions ...aSync/browser/media/userDataSyncViews.css → ...ile/browser/media/userDataProfileView.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

.monaco-workbench .pane > .pane-body > .manual-sync-buttons-container {
.monaco-workbench .pane > .pane-body > .profile-view-buttons-container {
display: flex;
flex-direction: column;
padding: 13px 20px 0 20px;
padding: 13px 20px;
box-sizing: border-box;
}

.monaco-workbench .pane > .pane-body > .manual-sync-buttons-container .monaco-button {
.monaco-workbench .pane > .pane-body > .profile-view-buttons-container .monaco-button {
margin-block-start: 13px;
margin-inline-start: 0px;
margin-inline-end: 0px;
Expand Down
124 changes: 22 additions & 102 deletions src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import 'vs/css!./media/userDataProfileView';
import { localize } from 'vs/nls';
import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
Expand Down Expand Up @@ -183,19 +184,7 @@ export class UserDataProfileImportExportService extends Disposable implements IU
const disposables = new DisposableStore();
try {
const userDataProfilesExportState = disposables.add(this.instantiationService.createInstance(UserDataProfileExportState, this.userDataProfileService.currentProfile));

const title = localize('export profile preview', "Export");
const exportProfile = await this.selectProfileResources(
userDataProfilesExportState,
localize('export title', "{0}: {1} ({2})", PROFILES_CATEGORY.value, title, this.userDataProfileService.currentProfile.name),
localize('export description', "Choose what to export")
);

if (exportProfile === undefined) {
return;
}

await this.doExportProfile(userDataProfilesExportState, !exportProfile, localize('cancel', "Cancel"));
await this.doExportProfile(userDataProfilesExportState, true, localize('cancel', "Cancel"));
} finally {
disposables.dispose();
}
Expand Down Expand Up @@ -230,20 +219,7 @@ export class UserDataProfileImportExportService extends Disposable implements IU
const title = localize('import profile preview', "Import");

if (!userDataProfileImportState.isEmpty()) {
let importProfile = await this.selectProfileResources(
userDataProfileImportState,
localize('import title', "{0}: {1} ({2})", PROFILES_CATEGORY.value, title, profileTemplate.name),
localize('import description', "Choose what to import")
);

if (importProfile === undefined) {
return;
}

if (!importProfile) {
importProfile = await this.showProfilePreviewView(`workbench.views.profiles.import.preview`, title, title, localize('cancel', "Cancel"), userDataProfileImportState);
}

const importProfile = await this.showProfilePreviewView(`workbench.views.profiles.import.preview`, title, title, localize('cancel', "Cancel"), userDataProfileImportState);
if (!importProfile) {
return;
}
Expand Down Expand Up @@ -464,62 +440,6 @@ export class UserDataProfileImportExportService extends Disposable implements IU
}
}

private async selectProfileResources(profileImportExportState: UserDataProfileImportExportState, title: string, description: string): Promise<boolean | undefined> {
type ProfileResourceQuickItem = { item: IProfileResourceTreeItem; label: string };
const disposables: DisposableStore = new DisposableStore();
const quickPick = this.quickInputService.createQuickPick<ProfileResourceQuickItem>();
disposables.add(quickPick);
quickPick.title = title;
quickPick.ok = 'default';
quickPick.customButton = true;
quickPick.customLabel = localize('show contents', "Show Contents");
quickPick.description = description;
quickPick.canSelectMany = true;
quickPick.hideInput = true;
quickPick.hideCheckAll = true;
quickPick.busy = true;

let accepted: boolean = false;
let preview: boolean = false;
disposables.add(quickPick.onDidAccept(() => {
accepted = true;
quickPick.hide();
}));
disposables.add(quickPick.onDidCustom(() => {
preview = true;
quickPick.hide();
}));

const promise = new Promise<boolean | undefined>((c, e) => {
disposables.add(quickPick.onDidHide(() => {
try {
if (accepted || preview) {
for (const root of roots) {
root.checkbox.isChecked = quickPick.selectedItems.some(({ item }) => item === root);
}
c(accepted);
} else {
c(undefined);
}
} catch (error) {
e(error);
} finally {
disposables.dispose();
}
}));
});
quickPick.show();

const roots = await profileImportExportState.getRoots();
quickPick.busy = false;

const items = roots.map<ProfileResourceQuickItem>(item => ({ item, label: item.label?.label ?? item.type }));
quickPick.items = items;
quickPick.selectedItems = items.filter(({ item }) => item.checkbox?.isChecked);

return promise;
}

private async showProfilePreviewView(id: string, name: string, confirmLabel: string, cancelLabel: string, userDataProfilesData: UserDataProfileImportExportState): Promise<boolean> {
const disposables = new DisposableStore();
const viewsRegistry = Registry.as<IViewsRegistry>(Extensions.ViewsRegistry);
Expand Down Expand Up @@ -683,7 +603,7 @@ class UserDataProfilePreviewViewPane extends TreeViewPane {
}

private createButtons(container: HTMLElement): void {
this.buttonsContainer = DOM.append(container, DOM.$('.manual-sync-buttons-container'));
this.buttonsContainer = DOM.append(container, DOM.$('.profile-view-buttons-container'));

this.confirmButton = this._register(new Button(this.buttonsContainer, { ...defaultButtonStyles }));
this.confirmButton.label = this.confirmLabel;
Expand All @@ -698,7 +618,7 @@ class UserDataProfilePreviewViewPane extends TreeViewPane {

protected override layoutTreeView(height: number, width: number): void {
this.dimension = new DOM.Dimension(width, height);
const buttonContainerHeight = 78;
const buttonContainerHeight = 108;
this.buttonsContainer.style.height = `${buttonContainerHeight}px`;
this.buttonsContainer.style.width = `${width}px`;

Expand Down Expand Up @@ -851,14 +771,6 @@ class UserDataProfileExportState extends UserDataProfileImportExportState {
roots.push(keybindingsResourceTreeItem);
}

const tasksResource = this.instantiationService.createInstance(TasksResource);
const tasksContent = await tasksResource.getContent(this.profile);
await tasksResource.apply(tasksContent, exportPreviewProfle);
const tasksResourceTreeItem = this.instantiationService.createInstance(TasksResourceTreeItem, exportPreviewProfle);
if (await tasksResourceTreeItem.hasContent()) {
roots.push(tasksResourceTreeItem);
}

const snippetsResource = this.instantiationService.createInstance(SnippetsResource);
const snippetsContent = await snippetsResource.getContent(this.profile);
await snippetsResource.apply(snippetsContent, exportPreviewProfle);
Expand All @@ -867,6 +779,14 @@ class UserDataProfileExportState extends UserDataProfileImportExportState {
roots.push(snippetsResourceTreeItem);
}

const tasksResource = this.instantiationService.createInstance(TasksResource);
const tasksContent = await tasksResource.getContent(this.profile);
await tasksResource.apply(tasksContent, exportPreviewProfle);
const tasksResourceTreeItem = this.instantiationService.createInstance(TasksResourceTreeItem, exportPreviewProfle);
if (await tasksResourceTreeItem.hasContent()) {
roots.push(tasksResourceTreeItem);
}

const globalStateResource = joinPath(exportPreviewProfle.globalStorageHome, 'globalState.json').with({ scheme: USER_DATA_PROFILE_EXPORT_PREVIEW_SCHEME });
const globalStateResourceTreeItem = this.instantiationService.createInstance(GlobalStateResourceExportTreeItem, exportPreviewProfle, globalStateResource);
const content = await globalStateResourceTreeItem.getContent();
Expand Down Expand Up @@ -959,15 +879,6 @@ class UserDataProfileImportState extends UserDataProfileImportExportState {
}
}

if (this.profile.tasks) {
const tasksResource = this.instantiationService.createInstance(TasksResource);
await tasksResource.apply(this.profile.tasks, importPreviewProfle);
const tasksResourceTreeItem = this.instantiationService.createInstance(TasksResourceTreeItem, importPreviewProfle);
if (await tasksResourceTreeItem.hasContent()) {
roots.push(tasksResourceTreeItem);
}
}

if (this.profile.snippets) {
const snippetsResource = this.instantiationService.createInstance(SnippetsResource);
await snippetsResource.apply(this.profile.snippets, importPreviewProfle);
Expand All @@ -977,6 +888,15 @@ class UserDataProfileImportState extends UserDataProfileImportExportState {
}
}

if (this.profile.tasks) {
const tasksResource = this.instantiationService.createInstance(TasksResource);
await tasksResource.apply(this.profile.tasks, importPreviewProfle);
const tasksResourceTreeItem = this.instantiationService.createInstance(TasksResourceTreeItem, importPreviewProfle);
if (await tasksResourceTreeItem.hasContent()) {
roots.push(tasksResourceTreeItem);
}
}

if (this.profile.globalState) {
const globalStateResource = joinPath(importPreviewProfle.globalStorageHome, 'globalState.json');
const content = VSBuffer.fromString(JSON.stringify(JSON.parse(this.profile.globalState), null, '\t'));
Expand Down

0 comments on commit b42832f

Please sign in to comment.