@codingame/monaco-vscode-user-data-profile-service-override 6.0.3 → 7.0.1

package/vscode/src/vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/userDataProfilesEditor.css.js';
 import { append, $, Dimension, trackFocus, addDisposableListener, EventType, EventHelper } from 'vscode/vscode/vs/base/browser/dom';
-import { SubmenuAction, Action, Separator } from 'vscode/vscode/vs/base/common/actions';
+import { SubmenuAction, Separator, Action } from 'vscode/vscode/vs/base/common/actions';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
@@ -31,8 +31,7 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { PANEL_BORDER } from 'vscode/vscode/vs/workbench/common/theme';
-import { WorkbenchObjectTree, WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { ObjectTreeElementCollapseState } from 'vscode/vscode/vs/base/browser/ui/tree/tree';
+import { WorkbenchList, WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { DisposableStore, Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { InputBox, MessageType } from 'vscode/vscode/vs/base/browser/ui/inputbox/inputBox';
 import { Checkbox } from 'vscode/vscode/vs/base/browser/ui/toggle/toggle';
@@ -46,33 +45,28 @@ import { HoverPosition } from 'vscode/vscode/vs/base/browser/ui/hover/hoverWidge
 import { SelectBox } from 'vscode/vscode/vs/base/browser/ui/selectBox/selectBox';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IEditorProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
-import { ExtensionsResourceTreeItem } from '../../../services/userDataProfile/browser/extensionsResource.js';
-import { isString, isUndefined } from 'vscode/vscode/vs/base/common/types';
+import { isUndefined } from 'vscode/vscode/vs/base/common/types';
 import { basename } from 'vscode/vscode/vs/base/common/resources';
 import { RenderIndentGuides } from 'vscode/vscode/vs/base/browser/ui/tree/abstractTree';
-import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
-import { API_OPEN_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
-import { SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { ResourceLabels, DEFAULT_LABELS_CONTAINER } from 'vscode/vscode/vs/workbench/browser/labels';
-import { IDialogService, IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
-import { UserDataProfileElement, AbstractUserDataProfileElement, NewProfileElement, UserDataProfilesEditorModel } from './userDataProfilesEditorModel.js';
+import { UserDataProfileElement, AbstractUserDataProfileElement, NewProfileElement, isProfileResourceTypeElement, isProfileResourceChildElement, UserDataProfilesEditorModel } from './userDataProfilesEditorModel.js';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { createInstantHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { Orientation } from 'vscode/vscode/vs/base/browser/ui/sash/sash';
 
-var UserDataProfilesEditor_1, NewProfileResourceTreeRenderer_1, ProfileResourceChildTreeItemRenderer_1, UserDataProfilesEditorInput_1;
+var UserDataProfilesEditor_1, ExistingProfileResourceTreeRenderer_1, NewProfileResourceTreeRenderer_1, ProfileResourceChildTreeItemRenderer_1, UserDataProfilesEditorInput_1;
 const _moduleId = "vs/workbench/contrib/userDataProfile/browser/userDataProfilesEditor";
-const profilesSashBorder = registerColor('profiles.sashBorder', { dark: PANEL_BORDER, light: PANEL_BORDER, hcDark: PANEL_BORDER, hcLight: PANEL_BORDER }, ( localizeWithPath(_moduleId, 0, "The color of the Profiles editor splitview sash border.")));
+const profilesSashBorder = registerColor('profiles.sashBorder', PANEL_BORDER, ( localizeWithPath(_moduleId, 0, "The color of the Profiles editor splitview sash border.")));
 let UserDataProfilesEditor = class UserDataProfilesEditor extends EditorPane {
     static { UserDataProfilesEditor_1 = this; }
     static { this.ID = 'workbench.editor.userDataProfiles'; }
-    constructor(group, telemetryService, themeService, storageService, userDataProfileManagementService, quickInputService, dialogService, fileDialogService, contextMenuService, instantiationService) {
+    constructor(group, telemetryService, themeService, storageService, userDataProfileManagementService, quickInputService, fileDialogService, contextMenuService, instantiationService) {
         super(UserDataProfilesEditor_1.ID, group, telemetryService, themeService, storageService);
         this.userDataProfileManagementService = userDataProfileManagementService;
         this.quickInputService = quickInputService;
-        this.dialogService = dialogService;
         this.fileDialogService = fileDialogService;
         this.contextMenuService = contextMenuService;
         this.instantiationService = instantiationService;
@@ -100,20 +94,21 @@ let UserDataProfilesEditor = class UserDataProfilesEditor extends EditorPane {
         this.splitView.addView({
             onDidChange: Event.None,
             element: sidebarView,
-            minimumSize: 175,
+            minimumSize: 200,
             maximumSize: 350,
             layout: (width, _, height) => {
                 sidebarView.style.width = `${width}px`;
-                if (height && this.profilesTree) {
-                    this.profilesTree.getHTMLElement().style.height = `${height - 38}px`;
-                    this.profilesTree.layout(height - 38, width);
+                if (height && this.profilesList) {
+                    const listHeight = height - 40  - 15 ;
+                    this.profilesList.getHTMLElement().style.height = `${listHeight}px`;
+                    this.profilesList.layout(listHeight, width);
                 }
             }
         }, 300, undefined, true);
         this.splitView.addView({
             onDidChange: Event.None,
             element: contentsView,
-            minimumSize: 500,
+            minimumSize: 550,
             maximumSize: Number.POSITIVE_INFINITY,
             layout: (width, _, height) => {
                 contentsView.style.width = `${width}px`;
@@ -122,32 +117,34 @@ let UserDataProfilesEditor = class UserDataProfilesEditor extends EditorPane {
                 }
             }
         }, Sizing.Distribute, undefined, true);
-        const borderColor = this.theme.getColor(profilesSashBorder);
-        this.splitView.style({ separatorBorder: borderColor });
         this.registerListeners();
+        this.updateStyles();
         this.userDataProfileManagementService.getBuiltinProfileTemplates().then(templates => {
             this.templates = templates;
             this.profileWidget.templates = templates;
         });
     }
+    updateStyles() {
+        const borderColor = this.theme.getColor(profilesSashBorder);
+        this.splitView?.style({ separatorBorder: borderColor });
+    }
     renderSidebar(parent) {
         this.renderNewProfileButton(append(parent, $('.new-profile-button')));
-        const renderer = this.instantiationService.createInstance(ProfileTreeElementRenderer);
-        const delegate = ( (new ProfileTreeElementDelegate()));
-        this.profilesTree = this._register(this.instantiationService.createInstance((WorkbenchObjectTree), 'ProfilesTree', append(parent, $('.profiles-tree')), delegate, [renderer], {
+        const renderer = this.instantiationService.createInstance(ProfileElementRenderer);
+        const delegate = ( (new ProfileElementDelegate()));
+        this.profilesList = this._register(this.instantiationService.createInstance((WorkbenchList), 'ProfilesList', append(parent, $('.profiles-list')), delegate, [renderer], {
             multipleSelectionSupport: false,
             setRowLineHeight: false,
             horizontalScrolling: false,
             accessibilityProvider: {
-                getAriaLabel(extensionFeature) {
-                    return extensionFeature?.name ?? '';
+                getAriaLabel(profileElement) {
+                    return profileElement?.name ?? '';
                 },
                 getWidgetAriaLabel() {
                     return ( localizeWithPath(_moduleId, 1, "Profiles"));
                 }
             },
             openOnSingleClick: true,
-            enableStickyScroll: false,
             identityProvider: {
                 getId(e) {
                     if (e instanceof UserDataProfileElement) {
@@ -164,11 +161,7 @@ let UserDataProfilesEditor = class UserDataProfilesEditor extends EditorPane {
                 getActions: () => {
                     const actions = [];
                     if (this.templates.length) {
-                        actions.push(( (new SubmenuAction('from.template', ( localizeWithPath(_moduleId, 2, "From Template")),  (this.templates.map(
-                            template => ( (new Action(`template:${template.url}`, template.name, undefined, true, async () => {
-                                    this.createNewProfile(( (URI.parse(template.url))));
-                                })))
-                        ))))));
+                        actions.push(( (new SubmenuAction('from.template', ( localizeWithPath(_moduleId, 2, "From Template")), this.getCreateFromTemplateActions()))));
                         actions.push(( (new Separator())));
                     }
                     actions.push(( (new Action('importProfile', ( localizeWithPath(_moduleId, 3, "Import Profile...")), undefined, true, () => this.importProfile()))));
@@ -180,27 +173,59 @@ let UserDataProfilesEditor = class UserDataProfilesEditor extends EditorPane {
             supportIcons: true,
             ...defaultButtonStyles
         }))));
-        button.label = `$(add) ${( localizeWithPath(_moduleId, 4, "New Profile"))}`;
+        button.label = ( localizeWithPath(_moduleId, 4, "New Profile"));
         this._register(button.onDidClick(e => this.createNewProfile()));
     }
+    getCreateFromTemplateActions() {
+        return (
+             (this.templates.map(
+                template => ( (new Action(`template:${template.url}`, template.name, undefined, true, async () => {
+                    this.createNewProfile(( (URI.parse(template.url))));
+                })))
+            ))
+        );
+    }
     registerListeners() {
-        if (this.profilesTree) {
-            this._register(this.profilesTree.onDidChangeSelection(e => {
+        if (this.profilesList) {
+            this._register(this.profilesList.onDidChangeSelection(e => {
                 const [element] = e.elements;
                 if (element instanceof AbstractUserDataProfileElement) {
                     this.profileWidget?.render(element);
                 }
             }));
-            this._register(this.profilesTree.onContextMenu(e => {
+            this._register(this.profilesList.onContextMenu(e => {
+                const actions = [];
+                if (!e.element) {
+                    actions.push(...this.getTreeContextMenuActions());
+                }
                 if (e.element instanceof AbstractUserDataProfileElement) {
+                    actions.push(...e.element.actions[1]);
+                }
+                if (actions.length) {
                     this.contextMenuService.showContextMenu({
                         getAnchor: () => e.anchor,
-                        getActions: () => e.element instanceof AbstractUserDataProfileElement ? e.element.contextMenuActions.slice(0) : [],
+                        getActions: () => actions,
                         getActionsContext: () => e.element
                     });
                 }
             }));
+            this._register(this.profilesList.onMouseDblClick(e => {
+                if (!e.element) {
+                    this.createNewProfile();
+                }
+            }));
+        }
+    }
+    getTreeContextMenuActions() {
+        const actions = [];
+        actions.push(( (new Action('newProfile', ( localizeWithPath(_moduleId, 4, "New Profile")), undefined, true, () => this.createNewProfile()))));
+        const templateActions = this.getCreateFromTemplateActions();
+        if (templateActions.length) {
+            actions.push(( (new SubmenuAction('from.template', ( localizeWithPath(_moduleId, 5, "New Profile From Template")), templateActions))));
         }
+        actions.push(( (new Separator())));
+        actions.push(( (new Action('importProfile', ( localizeWithPath(_moduleId, 3, "Import Profile...")), undefined, true, () => this.importProfile()))));
+        return actions;
     }
     async importProfile() {
         const disposables = ( (new DisposableStore()));
@@ -208,13 +233,13 @@ let UserDataProfilesEditor = class UserDataProfilesEditor extends EditorPane {
         const updateQuickPickItems = (value) => {
             const quickPickItems = [];
             if (value) {
-                quickPickItems.push({ label: quickPick.value, description: ( localizeWithPath(_moduleId, 5, "Import from URL")) });
+                quickPickItems.push({ label: quickPick.value, description: ( localizeWithPath(_moduleId, 6, "Import from URL")) });
             }
-            quickPickItems.push({ label: ( localizeWithPath(_moduleId, 6, "Select File...")) });
+            quickPickItems.push({ label: ( localizeWithPath(_moduleId, 7, "Select File...")) });
             quickPick.items = quickPickItems;
         };
-        quickPick.title = ( localizeWithPath(_moduleId, 7, "Import from Profile Template..."));
-        quickPick.placeholder = ( localizeWithPath(_moduleId, 8, "Provide Profile Template URL"));
+        quickPick.title = ( localizeWithPath(_moduleId, 8, "Import from Profile Template..."));
+        quickPick.placeholder = ( localizeWithPath(_moduleId, 9, "Provide Profile Template URL"));
         quickPick.ignoreFocusOut = true;
         disposables.add(quickPick.onDidChangeValue(updateQuickPickItems));
         updateQuickPickItems();
@@ -235,23 +260,7 @@ let UserDataProfilesEditor = class UserDataProfilesEditor extends EditorPane {
         quickPick.show();
     }
     async createNewProfile(copyFrom) {
-        if (this.model?.profiles.some(p => p instanceof NewProfileElement)) {
-            const result = await this.dialogService.confirm({
-                type: 'info',
-                message: ( localizeWithPath(
-                    _moduleId,
-                    9,
-                    "A new profile is already being created. Do you want to discard it and create a new one?"
-                )),
-                primaryButton: ( localizeWithPath(_moduleId, 10, "Discard & Create")),
-                cancelButton: ( localizeWithPath(_moduleId, 11, "Cancel"))
-            });
-            if (!result.confirmed) {
-                return;
-            }
-            this.model.revert();
-        }
-        this.model?.createNewProfile(copyFrom);
+        await this.model?.createNewProfile(copyFrom);
     }
     async getProfileUriFromFileSystem() {
         const profileLocation = await this.fileDialogService.showOpenDialog({
@@ -259,7 +268,7 @@ let UserDataProfilesEditor = class UserDataProfilesEditor extends EditorPane {
             canSelectFiles: true,
             canSelectMany: false,
             filters: PROFILE_FILTER,
-            title: ( localizeWithPath(_moduleId, 12, "Select Profile Template File")),
+            title: ( localizeWithPath(_moduleId, 10, "Select Profile Template File")),
         });
         if (!profileLocation) {
             return null;
@@ -269,46 +278,37 @@ let UserDataProfilesEditor = class UserDataProfilesEditor extends EditorPane {
     async setInput(input, options, context, token) {
         await super.setInput(input, options, context, token);
         this.model = await input.resolve();
-        this.updateProfilesTree();
+        this.updateProfilesList();
         this._register(this.model.onDidChange((element) => {
-            this.updateProfilesTree(element);
+            this.updateProfilesList(element);
         }));
     }
     focus() {
         super.focus();
-        this.profilesTree?.domFocus();
+        this.profilesList?.domFocus();
     }
-    updateProfilesTree(elementToSelect) {
+    updateProfilesList(elementToSelect) {
         if (!this.model) {
             return;
         }
-        const profileElements = ( (this.model.profiles.map(element => ({ element }))));
-        const currentSelection = this.profilesTree?.getSelection()?.[0];
-        this.profilesTree?.setChildren(null, [
-            {
-                element: { name: ( localizeWithPath(_moduleId, 1, "Profiles")) },
-                children: profileElements,
-                collapsible: false,
-                collapsed: ObjectTreeElementCollapseState.Expanded
-            }
-        ]);
+        const currentSelectionIndex = this.profilesList?.getSelection()?.[0];
+        const currentSelection = currentSelectionIndex !== undefined ? this.profilesList?.element(currentSelectionIndex) : undefined;
+        this.profilesList?.splice(0, this.profilesList.length, this.model.profiles);
         if (elementToSelect) {
-            this.profilesTree?.setSelection([elementToSelect]);
+            this.profilesList?.setSelection([this.model.profiles.indexOf(elementToSelect)]);
         }
         else if (currentSelection) {
-            if (currentSelection instanceof AbstractUserDataProfileElement) {
-                if (!this.model.profiles.includes(currentSelection)) {
-                    const elementToSelect = this.model.profiles.find(profile => profile.name === currentSelection.name) ?? this.model.profiles[0];
-                    if (elementToSelect) {
-                        this.profilesTree?.setSelection([elementToSelect]);
-                    }
+            if (!this.model.profiles.includes(currentSelection)) {
+                const elementToSelect = this.model.profiles.find(profile => profile.name === currentSelection.name) ?? this.model.profiles[0];
+                if (elementToSelect) {
+                    this.profilesList?.setSelection([this.model.profiles.indexOf(elementToSelect)]);
                 }
             }
         }
         else {
             const elementToSelect = this.model.profiles.find(profile => profile.active) ?? this.model.profiles[0];
             if (elementToSelect) {
-                this.profilesTree?.setSelection([elementToSelect]);
+                this.profilesList?.setSelection([this.model.profiles.indexOf(elementToSelect)]);
             }
         }
     }
@@ -319,42 +319,45 @@ UserDataProfilesEditor = UserDataProfilesEditor_1 = ( (__decorate([
     ( (__param(3, IStorageService))),
     ( (__param(4, IUserDataProfileManagementService))),
     ( (__param(5, IQuickInputService))),
-    ( (__param(6, IDialogService))),
-    ( (__param(7, IFileDialogService))),
-    ( (__param(8, IContextMenuService))),
-    ( (__param(9, IInstantiationService)))
+    ( (__param(6, IFileDialogService))),
+    ( (__param(7, IContextMenuService))),
+    ( (__param(8, IInstantiationService)))
 ], UserDataProfilesEditor)));
-class ProfileTreeElementDelegate {
+class ProfileElementDelegate {
     getHeight(element) {
-        return 30;
+        return 22;
     }
-    getTemplateId() { return 'profileTreeElement'; }
+    getTemplateId() { return 'profileListElement'; }
 }
-class ProfileTreeElementRenderer {
-    constructor() {
-        this.templateId = 'profileTreeElement';
+let ProfileElementRenderer = class ProfileElementRenderer {
+    constructor(instantiationService) {
+        this.instantiationService = instantiationService;
+        this.templateId = 'profileListElement';
     }
     renderTemplate(container) {
-        container.classList.add('profile-tree-item');
-        const icon = append(container, $('.profile-tree-item-icon'));
-        const label = append(container, $('.profile-tree-item-label'));
-        const description = append(container, $('.profile-tree-item-description'));
+        const disposables = ( (new DisposableStore()));
+        const elementDisposables = ( (new DisposableStore()));
+        container.classList.add('profile-list-item');
+        const icon = append(container, $('.profile-list-item-icon'));
+        const label = append(container, $('.profile-list-item-label'));
+        const description = append(container, $('.profile-list-item-description'));
         append(description, $(`span${ThemeIcon.asCSSSelector(Codicon.check)}`));
-        append(description, $('span', undefined, ( localizeWithPath(_moduleId, 13, "Active"))));
-        return { label, icon, description, disposables: ( (new DisposableStore())) };
+        append(description, $('span', undefined, ( localizeWithPath(_moduleId, 11, "In use"))));
+        const actionsContainer = append(container, $('.profile-tree-item-actions-container'));
+        const actionBar = disposables.add(this.instantiationService.createInstance(WorkbenchToolBar, actionsContainer, {
+            hoverDelegate: disposables.add(createInstantHoverDelegate()),
+            highlightToggledItems: true
+        }));
+        return { label, icon, description, actionBar, disposables, elementDisposables };
     }
-    renderElement({ element }, index, templateData, height) {
-        templateData.disposables.clear();
+    renderElement(element, index, templateData, height) {
+        templateData.elementDisposables.clear();
         templateData.label.textContent = element.name;
-        if (element.icon) {
-            templateData.icon.className = ThemeIcon.asClassName(ThemeIcon.fromId(element.icon));
-        }
-        else {
-            templateData.icon.className = 'hide';
-        }
+        templateData.label.classList.toggle('new-profile', element instanceof NewProfileElement);
+        templateData.icon.className = ThemeIcon.asClassName(element.icon ? ThemeIcon.fromId(element.icon) : DEFAULT_ICON);
         templateData.description.classList.toggle('hide', !element.active);
         if (element.onDidChange) {
-            templateData.disposables.add(element.onDidChange(e => {
+            templateData.elementDisposables.add(element.onDidChange(e => {
                 if (e.name) {
                     templateData.label.textContent = element.name;
                 }
@@ -371,56 +374,59 @@ class ProfileTreeElementRenderer {
                 }
             }));
         }
+        templateData.actionBar.setActions(element.actions[0] ?? []);
+    }
+    disposeElement(element, index, templateData, height) {
+        templateData.elementDisposables.clear();
     }
     disposeTemplate(templateData) {
         templateData.disposables.dispose();
+        templateData.elementDisposables.dispose();
     }
-}
+};
+ProfileElementRenderer = ( (__decorate([
+    ( (__param(0, IInstantiationService)))
+], ProfileElementRenderer)));
 let ProfileWidget = class ProfileWidget extends Disposable {
     set templates(templates) {
         this._templates = templates;
         this.renderSelectBox();
     }
-    constructor(parent, hoverService, userDataProfilesService, contextViewService, editorProgressService, commandService, instantiationService) {
+    constructor(parent, hoverService, userDataProfilesService, contextViewService, editorProgressService, instantiationService) {
         super();
         this.hoverService = hoverService;
         this.userDataProfilesService = userDataProfilesService;
         this.contextViewService = contextViewService;
         this.editorProgressService = editorProgressService;
-        this.commandService = commandService;
         this.instantiationService = instantiationService;
         this.copyFromOptions = [];
         this._templates = [];
         this._profileElement = this._register(( (new MutableDisposable())));
         const header = append(parent, $('.profile-header'));
-        const title = append(header, $('.profile-title'));
-        append(title, $('span', undefined, ( localizeWithPath(_moduleId, 14, "Profile: "))));
-        this.profileTitle = append(title, $('span'));
-        const actionsContainer = append(header, $('.profile-actions-container'));
-        this.buttonContainer = append(actionsContainer, $('.profile-button-container'));
-        this.toolbar = this._register(instantiationService.createInstance(WorkbenchToolBar, actionsContainer, {
-            hoverDelegate: this._register(createInstantHoverDelegate()),
-        }));
-        const body = append(parent, $('.profile-body'));
-        this.nameContainer = append(body, $('.profile-name-container'));
-        this.iconElement = append(this.nameContainer, $(`${ThemeIcon.asCSSSelector(DEFAULT_ICON)}`, { 'tabindex': '0', 'role': 'button', 'aria-label': ( localizeWithPath(_moduleId, 15, "Profile Icon")) }));
+        const title = append(header, $('.profile-title-container'));
+        this.iconElement = append(title, $(`${ThemeIcon.asCSSSelector(DEFAULT_ICON)}`, { 'tabindex': '0', 'role': 'button', 'aria-label': ( localizeWithPath(_moduleId, 12, "Profile Icon")) }));
         this.renderIconSelectBox(this.iconElement);
-        this.nameInput = this._register(( (new InputBox(this.nameContainer, undefined, {
+        this.profileTitle = append(title, $(''));
+        this.nameInput = this._register(( (new InputBox(title, undefined, {
             inputBoxStyles: defaultInputBoxStyles,
-            ariaLabel: ( localizeWithPath(_moduleId, 16, "Profile Name")),
-            placeholder: ( localizeWithPath(_moduleId, 16, "Profile Name")),
+            ariaLabel: ( localizeWithPath(_moduleId, 13, "Profile Name")),
+            placeholder: ( localizeWithPath(_moduleId, 13, "Profile Name")),
             validationOptions: {
                 validation: (value) => {
                     if (!value) {
                         return {
-                            content: ( localizeWithPath(_moduleId, 17, "Profile name is required and must be a non-empty value.")),
+                            content: ( localizeWithPath(_moduleId, 14, "Profile name is required and must be a non-empty value.")),
                             type: MessageType.ERROR
                         };
                     }
-                    const initialName = this._profileElement.value?.element instanceof UserDataProfileElement ? this._profileElement.value.element.profile.name : undefined;
+                    if (this._profileElement.value?.element.disabled) {
+                        return null;
+                    }
+                    const initialName = this._profileElement.value?.element.getInitialName();
+                    value = value.trim();
                     if (initialName !== value && ( (this.userDataProfilesService.profiles.some(p => p.name === value)))) {
                         return {
-                            content: ( localizeWithPath(_moduleId, 18, "Profile with name {0} already exists.", value)),
+                            content: ( localizeWithPath(_moduleId, 15, "Profile with name {0} already exists.", value)),
                             type: MessageType.ERROR
                         };
                     }
@@ -439,15 +445,38 @@ let ProfileWidget = class ProfileWidget extends Disposable {
                 this.nameInput.value = this._profileElement.value.element.name;
             }
         }));
+        const actionsContainer = append(header, $('.profile-actions-container'));
+        this.buttonContainer = append(actionsContainer, $('.profile-button-container'));
+        this.toolbar = this._register(instantiationService.createInstance(WorkbenchToolBar, actionsContainer, {
+            hoverDelegate: this._register(createInstantHoverDelegate()),
+            highlightToggledItems: true
+        }));
+        const body = append(parent, $('.profile-body'));
         this.copyFromContainer = append(body, $('.profile-copy-from-container'));
-        append(this.copyFromContainer, $('.profile-copy-from-label', undefined, ( localizeWithPath(_moduleId, 19, "Copy from:"))));
+        append(this.copyFromContainer, $('.profile-copy-from-label', undefined, ( localizeWithPath(_moduleId, 16, "Copy from"))));
         this.copyFromSelectBox = this._register(this.instantiationService.createInstance(SelectBox, [], 0, this.contextViewService, defaultSelectBoxStyles, {
             useCustomDrawn: true,
-            ariaLabel: ( localizeWithPath(_moduleId, 20, "Copy profile from")),
+            ariaLabel: ( localizeWithPath(_moduleId, 17, "Copy profile from")),
         }));
         this.copyFromSelectBox.render(append(this.copyFromContainer, $('.profile-select-container')));
-        const contentsContainer = append(body, $('.profile-contents-container'));
-        append(contentsContainer, $('.profile-contents-label', undefined, ( localizeWithPath(_moduleId, 21, "Contents"))));
+        this.useAsDefaultProfileContainer = append(body, $('.profile-use-as-default-container'));
+        const useAsDefaultProfileTitle = ( localizeWithPath(_moduleId, 18, "Use this profile as default for new windows"));
+        this.useAsDefaultProfileCheckbox = this._register(( (new Checkbox(useAsDefaultProfileTitle, false, defaultCheckboxStyles))));
+        append(this.useAsDefaultProfileContainer, this.useAsDefaultProfileCheckbox.domNode);
+        const useAsDefaultProfileLabel = append(this.useAsDefaultProfileContainer, $('.profile-use-as-default-label', undefined, useAsDefaultProfileTitle));
+        this._register(this.useAsDefaultProfileCheckbox.onChange(() => {
+            if (this._profileElement.value?.element instanceof UserDataProfileElement) {
+                this._profileElement.value.element.toggleNewWindowProfile();
+            }
+        }));
+        this._register(addDisposableListener(useAsDefaultProfileLabel, EventType.CLICK, () => {
+            if (this._profileElement.value?.element instanceof UserDataProfileElement) {
+                this._profileElement.value.element.toggleNewWindowProfile();
+            }
+        }));
+        this.contentsTreeHeader = append(body, $('.profile-content-tree-header'));
+        this.inheritLabelElement = $('.inherit-label', undefined, ( localizeWithPath(_moduleId, 19, "Use Default Profile")));
+        append(this.contentsTreeHeader, $(''), $(''), this.inheritLabelElement, $('.actions-label', undefined, ( localizeWithPath(_moduleId, 20, "Actions"))));
         const delegate = ( (new ProfileResourceTreeElementDelegate()));
         this.resourcesTree = this._register(this.instantiationService.createInstance((WorkbenchAsyncDataTree), 'ProfileEditor-ResourcesTree', append(body, $('.profile-content-tree.file-icon-themable-tree.show-file-icons')), delegate, [
             this.instantiationService.createInstance(ExistingProfileResourceTreeRenderer),
@@ -458,11 +487,11 @@ let ProfileWidget = class ProfileWidget extends Disposable {
             horizontalScrolling: false,
             accessibilityProvider: {
                 getAriaLabel(element) {
-                    if (isString(element?.element)) {
-                        return element.element;
+                    if ((element?.element).resourceType) {
+                        return (element?.element).resourceType;
                     }
-                    if (element?.element) {
-                        return element.element.label?.label ?? '';
+                    if ((element?.element).label) {
+                        return (element?.element).label;
                     }
                     return '';
                 },
@@ -472,10 +501,7 @@ let ProfileWidget = class ProfileWidget extends Disposable {
             },
             identityProvider: {
                 getId(element) {
-                    if (isString(element?.element)) {
-                        return element.element;
-                    }
-                    if (element?.element) {
+                    if (element?.element.handle) {
                         return element.element.handle;
                     }
                     return '';
@@ -483,8 +509,8 @@ let ProfileWidget = class ProfileWidget extends Disposable {
             },
             expandOnlyOnTwistieClick: true,
             renderIndentGuides: RenderIndentGuides.None,
-            openOnSingleClick: true,
             enableStickyScroll: false,
+            openOnSingleClick: false,
         }));
         this._register(this.resourcesTree.onDidOpen(async (e) => {
             if (!e.browserEvent) {
@@ -493,13 +519,8 @@ let ProfileWidget = class ProfileWidget extends Disposable {
             if (e.browserEvent.target && e.browserEvent.target.classList.contains(Checkbox.CLASS_NAME)) {
                 return;
             }
-            if (e.element && !isString(e.element.element)) {
-                if (e.element.element.resourceUri) {
-                    await this.commandService.executeCommand(API_OPEN_EDITOR_COMMAND_ID, e.element.element.resourceUri, [SIDE_GROUP], undefined, e);
-                }
-                else if (e.element.element.parent instanceof ExtensionsResourceTreeItem) {
-                    await this.commandService.executeCommand('extension.open', e.element.element.handle, undefined, true, undefined, true);
-                }
+            if (e.element?.element.action) {
+                await e.element.element.action.run();
             }
         }));
     }
@@ -510,6 +531,9 @@ let ProfileWidget = class ProfileWidget extends Disposable {
             if (this._profileElement.value?.element instanceof UserDataProfileElement && this._profileElement.value.element.profile.isDefault) {
                 return;
             }
+            if (this._profileElement.value?.element.disabled) {
+                return;
+            }
             iconSelectBox.clearInput();
             hoverWidget = this.hoverService.showHover({
                 content: iconSelectBox.domNode,
@@ -557,19 +581,7 @@ let ProfileWidget = class ProfileWidget extends Disposable {
         }));
     }
     renderSelectBox() {
-        const separator = { text: '\u2500\u2500\u2500\u2500\u2500\u2500', isDisabled: true };
-        this.copyFromOptions.push({ text: ( localizeWithPath(_moduleId, 22, "None")) });
-        if (this._templates.length) {
-            this.copyFromOptions.push({ ...separator, decoratorRight: ( localizeWithPath(_moduleId, 23, "Profile Templates")) });
-            for (const template of this._templates) {
-                this.copyFromOptions.push({ text: template.name, id: template.url, source: ( (URI.parse(template.url))) });
-            }
-        }
-        this.copyFromOptions.push({ ...separator, decoratorRight: ( localizeWithPath(_moduleId, 24, "Existing Profiles")) });
-        for (const profile of this.userDataProfilesService.profiles) {
-            this.copyFromOptions.push({ text: profile.name, id: profile.id, source: profile });
-        }
-        this.copyFromSelectBox.setOptions(this.copyFromOptions);
+        this.copyFromSelectBox.setOptions(this.getCopyFromOptions());
         this._register(this.copyFromSelectBox.onDidSelect(option => {
             if (this._profileElement.value?.element instanceof NewProfileElement) {
                 this._profileElement.value.element.copyFrom = this.copyFromOptions[option.index].source;
@@ -580,15 +592,18 @@ let ProfileWidget = class ProfileWidget extends Disposable {
         this.resourcesTree.layout(dimension.height - 34 - 20 - 25 - 20, dimension.width);
     }
     render(profileElement) {
+        this.resourcesTree.setInput(profileElement);
         const disposables = ( (new DisposableStore()));
         this._profileElement.value = { element: profileElement, dispose: () => disposables.dispose() };
         this.renderProfileElement(profileElement);
         disposables.add(profileElement.onDidChange(e => this.renderProfileElement(profileElement)));
         const profile = profileElement instanceof UserDataProfileElement ? profileElement.profile : undefined;
-        this.nameInput.setEnabled(!profile?.isDefault);
-        this.resourcesTree.setInput(profileElement);
+        this.profileTitle.classList.toggle('hide', !profile?.isDefault);
+        this.nameInput.element.classList.toggle('hide', !!profile?.isDefault);
+        this.iconElement.classList.toggle('disabled', !!profile?.isDefault);
+        this.iconElement.setAttribute('tabindex', profile?.isDefault ? '' : '0');
         disposables.add(profileElement.onDidChange(e => {
-            if (e.flags || e.copyFrom) {
+            if (e.flags || e.copyFrom || e.copyFlags || e.disabled) {
                 const viewState = this.resourcesTree.getViewState();
                 this.resourcesTree.setInput(profileElement, {
                     ...viewState,
@@ -596,39 +611,66 @@ let ProfileWidget = class ProfileWidget extends Disposable {
                 });
             }
         }));
-        if (profileElement.primaryAction) {
+        const [primaryTitleButtons, secondatyTitleButtons] = profileElement.titleButtons;
+        if (primaryTitleButtons?.length || secondatyTitleButtons?.length) {
             this.buttonContainer.classList.remove('hide');
-            const button = disposables.add(( (new Button(this.buttonContainer, {
-                supportIcons: true,
-                ...defaultButtonStyles
-            }))));
-            button.label = profileElement.primaryAction.label;
-            button.enabled = profileElement.primaryAction.enabled;
-            disposables.add(button.onDidClick(() => this.editorProgressService.showWhile(profileElement.primaryAction.run())));
-            disposables.add(profileElement.primaryAction.onDidChange((e) => {
-                if (!isUndefined(e.enabled)) {
-                    button.enabled = profileElement.primaryAction.enabled;
+            if (secondatyTitleButtons?.length) {
+                for (const action of secondatyTitleButtons) {
+                    const button = disposables.add(( (new Button(this.buttonContainer, {
+                        ...defaultButtonStyles,
+                        secondary: true
+                    }))));
+                    button.label = action.label;
+                    button.enabled = action.enabled;
+                    disposables.add(button.onDidClick(() => this.editorProgressService.showWhile(action.run())));
+                    disposables.add(action.onDidChange((e) => {
+                        if (!isUndefined(e.enabled)) {
+                            button.enabled = action.enabled;
+                        }
+                    }));
                 }
-            }));
-            disposables.add(profileElement.onDidChange(e => {
-                if (e.message) {
-                    button.setTitle(profileElement.message ?? profileElement.primaryAction.label);
-                    button.element.classList.toggle('error', !!profileElement.message);
+            }
+            if (primaryTitleButtons?.length) {
+                for (const action of primaryTitleButtons) {
+                    const button = disposables.add(( (new Button(this.buttonContainer, {
+                        ...defaultButtonStyles
+                    }))));
+                    button.label = action.label;
+                    button.enabled = action.enabled;
+                    disposables.add(button.onDidClick(() => this.editorProgressService.showWhile(action.run())));
+                    disposables.add(action.onDidChange((e) => {
+                        if (!isUndefined(e.enabled)) {
+                            button.enabled = action.enabled;
+                        }
+                    }));
+                    disposables.add(profileElement.onDidChange(e => {
+                        if (e.message) {
+                            button.setTitle(profileElement.message ?? action.label);
+                            button.element.classList.toggle('error', !!profileElement.message);
+                        }
+                    }));
                 }
-            }));
+            }
         }
         else {
             this.buttonContainer.classList.add('hide');
         }
         this.toolbar.setActions(profileElement.titleActions[0].slice(0), profileElement.titleActions[1].slice(0));
-        this.nameInput.focus();
         if (profileElement instanceof NewProfileElement) {
+            this.nameInput.focus();
             this.nameInput.select();
         }
     }
     renderProfileElement(profileElement) {
         this.profileTitle.textContent = profileElement.name;
         this.nameInput.value = profileElement.name;
+        this.nameInput.validate();
+        if (profileElement.disabled) {
+            this.nameInput.disable();
+        }
+        else {
+            this.nameInput.enable();
+        }
         if (profileElement.icon) {
             this.iconElement.className = ThemeIcon.asClassName(ThemeIcon.fromId(profileElement.icon));
         }
@@ -636,14 +678,18 @@ let ProfileWidget = class ProfileWidget extends Disposable {
             this.iconElement.className = ThemeIcon.asClassName(ThemeIcon.fromId(DEFAULT_ICON.id));
         }
         if (profileElement instanceof NewProfileElement) {
+            this.contentsTreeHeader.classList.add('new-profile');
+            this.inheritLabelElement.textContent = ( localizeWithPath(_moduleId, 21, "Options"));
+            this.useAsDefaultProfileContainer.classList.add('hide');
             this.copyFromContainer.classList.remove('hide');
+            this.copyFromOptions = this.getCopyFromOptions();
             const id = profileElement.copyFrom instanceof URI ? ( (profileElement.copyFrom.toString())) : profileElement.copyFrom?.id;
             const index = id
                 ? this.copyFromOptions.findIndex(option => option.id === id)
                 : 0;
             if (index !== -1) {
                 this.copyFromSelectBox.setOptions(this.copyFromOptions);
-                this.copyFromSelectBox.setEnabled(true);
+                this.copyFromSelectBox.setEnabled(!profileElement.previewProfile && !profileElement.disabled);
                 this.copyFromSelectBox.select(index);
             }
             else {
@@ -651,22 +697,41 @@ let ProfileWidget = class ProfileWidget extends Disposable {
                 this.copyFromSelectBox.setEnabled(false);
             }
         }
-        else {
+        else if (profileElement instanceof UserDataProfileElement) {
+            this.contentsTreeHeader.classList.remove('new-profile');
+            this.inheritLabelElement.textContent = profileElement.profile.isDefault ? '' : ( localizeWithPath(_moduleId, 19, "Use Default Profile"));
+            this.useAsDefaultProfileContainer.classList.remove('hide');
+            this.useAsDefaultProfileCheckbox.checked = profileElement.isNewWindowProfile;
             this.copyFromContainer.classList.add('hide');
         }
     }
+    getCopyFromOptions() {
+        const separator = { text: '\u2500\u2500\u2500\u2500\u2500\u2500', isDisabled: true };
+        const copyFromOptions = [];
+        copyFromOptions.push({ text: ( localizeWithPath(_moduleId, 22, "None")) });
+        if (this._templates.length) {
+            copyFromOptions.push({ ...separator, decoratorRight: ( localizeWithPath(_moduleId, 23, "Profile Templates")) });
+            for (const template of this._templates) {
+                copyFromOptions.push({ text: template.name, id: template.url, source: ( (URI.parse(template.url))) });
+            }
+        }
+        copyFromOptions.push({ ...separator, decoratorRight: ( localizeWithPath(_moduleId, 24, "Existing Profiles")) });
+        for (const profile of this.userDataProfilesService.profiles) {
+            copyFromOptions.push({ text: profile.name, id: profile.id, source: profile });
+        }
+        return copyFromOptions;
+    }
 };
 ProfileWidget = ( (__decorate([
     ( (__param(1, IHoverService))),
     ( (__param(2, IUserDataProfilesService))),
     ( (__param(3, IContextViewService))),
     ( (__param(4, IEditorProgressService))),
-    ( (__param(5, ICommandService))),
-    ( (__param(6, IInstantiationService)))
+    ( (__param(5, IInstantiationService)))
 ], ProfileWidget)));
 class ProfileResourceTreeElementDelegate {
     getTemplateId(element) {
-        if (!isString(element.element)) {
+        if (!element.element.resourceType) {
             return ProfileResourceChildTreeItemRenderer.TEMPLATE_ID;
         }
         if (element.root instanceof NewProfileElement) {
@@ -675,7 +740,7 @@ class ProfileResourceTreeElementDelegate {
         return ExistingProfileResourceTreeRenderer.TEMPLATE_ID;
     }
     getHeight(element) {
-        return 30;
+        return 22;
     }
 }
 let ProfileResourceTreeDataSource = class ProfileResourceTreeDataSource {
@@ -686,12 +751,24 @@ let ProfileResourceTreeDataSource = class ProfileResourceTreeDataSource {
         if (element instanceof AbstractUserDataProfileElement) {
             return true;
         }
-        if (isString(element.element)) {
-            if (element.root.getFlag(element.element)) {
+        if (element.element.resourceType) {
+            if (element.element.resourceType !== ProfileResourceType.Extensions && element.element.resourceType !== ProfileResourceType.Snippets) {
                 return false;
             }
             if (element.root instanceof NewProfileElement) {
-                return element.root.copyFrom !== undefined;
+                const resourceType = element.element.resourceType;
+                if (element.root.getFlag(resourceType)) {
+                    return true;
+                }
+                if (!element.root.hasResource(resourceType)) {
+                    return false;
+                }
+                if (element.root.copyFrom === undefined) {
+                    return false;
+                }
+                if (!element.root.getCopyFlag(resourceType)) {
+                    return false;
+                }
             }
             return true;
         }
@@ -699,23 +776,17 @@ let ProfileResourceTreeDataSource = class ProfileResourceTreeDataSource {
     }
     async getChildren(element) {
         if (element instanceof AbstractUserDataProfileElement) {
-            const resourceTypes = [
-                ProfileResourceType.Settings,
-                ProfileResourceType.Keybindings,
-                ProfileResourceType.Snippets,
-                ProfileResourceType.Tasks,
-                ProfileResourceType.Extensions
-            ];
+            const children = await element.getChildren();
             return (
-                 (resourceTypes.map(resourceType => ({ element: resourceType, root: element })))
+                 (children.map(e => ({ element: e, root: element })))
             );
         }
-        if (isString(element.element)) {
-            const progressRunner = this.editorProgressService.show(true);
+        if (element.element.resourceType) {
+            const progressRunner = this.editorProgressService.show(true, 500);
             try {
-                const extensions = await element.root.getChildren(element.element);
+                const extensions = await element.root.getChildren(element.element.resourceType);
                 return (
-                     (extensions.map(extension => ({ element: extension, root: element.root })))
+                     (extensions.map(e => ({ element: e, root: element.root })))
                 );
             }
             finally {
@@ -751,20 +822,27 @@ class AbstractProfileResourceTreeRenderer extends Disposable {
         templateData.disposables.dispose();
     }
 }
-class ExistingProfileResourceTreeRenderer extends AbstractProfileResourceTreeRenderer {
-    constructor() {
-        super(...arguments);
-        this.templateId = ExistingProfileResourceTreeRenderer.TEMPLATE_ID;
-    }
+let ExistingProfileResourceTreeRenderer = class ExistingProfileResourceTreeRenderer extends AbstractProfileResourceTreeRenderer {
+    static { ExistingProfileResourceTreeRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'ExistingProfileResourceTemplate'; }
+    constructor(instantiationService) {
+        super();
+        this.instantiationService = instantiationService;
+        this.templateId = ExistingProfileResourceTreeRenderer_1.TEMPLATE_ID;
+    }
     renderTemplate(parent) {
         const disposables = ( (new DisposableStore()));
         const container = append(parent, $('.profile-tree-item-container.existing-profile-resource-type-container'));
-        const checkbox = disposables.add(( (new Checkbox('', false, defaultCheckboxStyles))));
-        append(container, checkbox.domNode);
         const label = append(container, $('.profile-resource-type-label'));
-        const description = append(container, $('.profile-resource-type-description', undefined, ( localizeWithPath(_moduleId, 30, "Using Default Profile"))));
-        return { checkbox, label, description, disposables, elementDisposables: disposables.add(( (new DisposableStore()))) };
+        const inheritContainer = append(container, $('.inherit-container'));
+        const checkbox = disposables.add(( (new Checkbox('', false, defaultCheckboxStyles))));
+        append(inheritContainer, checkbox.domNode);
+        const actionsContainer = append(container, $('.profile-tree-item-actions-container'));
+        const actionBar = disposables.add(this.instantiationService.createInstance(WorkbenchToolBar, actionsContainer, {
+            hoverDelegate: disposables.add(createInstantHoverDelegate()),
+            highlightToggledItems: true
+        }));
+        return { checkbox, label, inheritContainer, actionBar, disposables, elementDisposables: disposables.add(( (new DisposableStore()))) };
     }
     renderElement({ element: profileResourceTreeElement }, index, templateData, height) {
         templateData.elementDisposables.clear();
@@ -774,31 +852,24 @@ class ExistingProfileResourceTreeRenderer extends AbstractProfileResourceTreeRen
                 'ExistingProfileResourceTreeRenderer can only render existing profile element'
             )));
         }
-        if (!isString(element)) {
-            throw ( (new Error(
-                'ExistingProfileResourceTreeRenderer can only render profile resource types'
-            )));
+        if (!isProfileResourceTypeElement(element)) {
+            throw ( (new Error('Invalid profile resource element')));
         }
-        templateData.label.textContent = this.getResourceTypeTitle(element);
+        templateData.label.textContent = this.getResourceTypeTitle(element.resourceType);
         if (root instanceof UserDataProfileElement && root.profile.isDefault) {
-            templateData.checkbox.checked = true;
-            templateData.checkbox.disable();
-            templateData.description.classList.add('hide');
+            templateData.checkbox.domNode.classList.add('hide');
         }
         else {
-            templateData.checkbox.enable();
-            const checked = !root.getFlag(element);
-            templateData.checkbox.checked = checked;
-            templateData.description.classList.toggle('hide', checked);
-            templateData.elementDisposables.add(templateData.checkbox.onChange(() => root.setFlag(element, !templateData.checkbox.checked)));
-            templateData.elementDisposables.add(root.onDidChange(e => {
-                if (e.flags) {
-                    templateData.description.classList.toggle('hide', !root.getFlag(element));
-                }
-            }));
+            templateData.checkbox.domNode.classList.remove('hide');
+            templateData.checkbox.checked = root.getFlag(element.resourceType);
+            templateData.elementDisposables.add(templateData.checkbox.onChange(() => root.setFlag(element.resourceType, templateData.checkbox.checked)));
         }
+        templateData.actionBar.setActions(element.action ? [element.action] : []);
     }
-}
+};
+ExistingProfileResourceTreeRenderer = ExistingProfileResourceTreeRenderer_1 = ( (__decorate([
+    ( (__param(0, IInstantiationService)))
+], ExistingProfileResourceTreeRenderer)));
 let NewProfileResourceTreeRenderer = class NewProfileResourceTreeRenderer extends AbstractProfileResourceTreeRenderer {
     static { NewProfileResourceTreeRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'NewProfileResourceTemplate'; }
@@ -813,16 +884,17 @@ let NewProfileResourceTreeRenderer = class NewProfileResourceTreeRenderer extend
         const container = append(parent, $('.profile-tree-item-container.new-profile-resource-type-container'));
         const labelContainer = append(container, $('.profile-resource-type-label-container'));
         const label = append(labelContainer, $('span.profile-resource-type-label'));
-        const selectBox = this._register(this.instantiationService.createInstance(SelectBox, [
-            { text: ( localizeWithPath(_moduleId, 31, "Empty")) },
-            { text: ( localizeWithPath(_moduleId, 32, "Copy")) },
-            { text: ( localizeWithPath(_moduleId, 33, "Use Default Profile")) }
-        ], 0, this.contextViewService, defaultSelectBoxStyles, {
+        const selectBox = this._register(this.instantiationService.createInstance(SelectBox, [], 0, this.contextViewService, defaultSelectBoxStyles, {
             useCustomDrawn: true,
         }));
         const selectContainer = append(container, $('.profile-select-container'));
         selectBox.render(selectContainer);
-        return { label, selectContainer, selectBox, disposables, elementDisposables: disposables.add(( (new DisposableStore()))) };
+        const actionsContainer = append(container, $('.profile-tree-item-actions-container'));
+        const actionBar = disposables.add(this.instantiationService.createInstance(WorkbenchToolBar, actionsContainer, {
+            hoverDelegate: disposables.add(createInstantHoverDelegate()),
+            highlightToggledItems: true
+        }));
+        return { label, selectContainer, selectBox, actionBar, disposables, elementDisposables: disposables.add(( (new DisposableStore()))) };
     }
     renderElement({ element: profileResourceTreeElement }, index, templateData, height) {
         templateData.elementDisposables.clear();
@@ -830,15 +902,35 @@ let NewProfileResourceTreeRenderer = class NewProfileResourceTreeRenderer extend
         if (!(root instanceof NewProfileElement)) {
             throw ( (new Error('NewProfileResourceTreeRenderer can only render new profile element')));
         }
-        if (!isString(element)) {
-            throw ( (new Error('NewProfileResourceTreeRenderer can only profile resoyrce types')));
+        if (!isProfileResourceTypeElement(element)) {
+            throw ( (new Error('Invalid profile resource element')));
         }
-        templateData.label.textContent = this.getResourceTypeTitle(element);
-        templateData.selectBox.select(root.getCopyFlag(element) ? 1 : root.getFlag(element) ? 2 : 0);
-        templateData.elementDisposables.add(templateData.selectBox.onDidSelect(option => {
-            root.setFlag(element, option.index === 2);
-            root.setCopyFlag(element, option.index === 1);
-        }));
+        templateData.label.textContent = this.getResourceTypeTitle(element.resourceType);
+        if (root.copyFrom && root.hasResource(element.resourceType)) {
+            const copyFromName = root.getCopyFromName();
+            templateData.selectBox.setOptions([
+                { text: ( localizeWithPath(_moduleId, 30, "Empty")) },
+                { text: copyFromName ? ( localizeWithPath(_moduleId, 31, "Copy ({0})", copyFromName)) : ( localizeWithPath(_moduleId, 32, "Copy")) },
+                { text: ( localizeWithPath(_moduleId, 33, "Use Default Profile")) }
+            ]);
+            templateData.selectBox.select(root.getCopyFlag(element.resourceType) ? 1 : root.getFlag(element.resourceType) ? 2 : 0);
+            templateData.elementDisposables.add(templateData.selectBox.onDidSelect(option => {
+                root.setFlag(element.resourceType, option.index === 2);
+                root.setCopyFlag(element.resourceType, option.index === 1);
+            }));
+        }
+        else {
+            templateData.selectBox.setOptions([
+                { text: ( localizeWithPath(_moduleId, 30, "Empty")) },
+                { text: ( localizeWithPath(_moduleId, 33, "Use Default Profile")) }
+            ]);
+            templateData.selectBox.select(root.getFlag(element.resourceType) ? 1 : 0);
+            templateData.elementDisposables.add(templateData.selectBox.onDidSelect(option => {
+                root.setFlag(element.resourceType, option.index === 1);
+            }));
+        }
+        templateData.selectBox.setEnabled(!root.disabled);
+        templateData.actionBar.setActions(element.action ? [element.action] : []);
     }
 };
 NewProfileResourceTreeRenderer = NewProfileResourceTreeRenderer_1 = ( (__decorate([
@@ -850,6 +942,7 @@ let ProfileResourceChildTreeItemRenderer = class ProfileResourceChildTreeItemRen
     static { this.TEMPLATE_ID = 'ProfileResourceChildTreeItemTemplate'; }
     constructor(instantiationService) {
         super();
+        this.instantiationService = instantiationService;
         this.templateId = ProfileResourceChildTreeItemRenderer_1.TEMPLATE_ID;
         this.labels = instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER);
         this.hoverDelegate = this._register(instantiationService.createInstance(WorkbenchHoverDelegate, 'mouse', false, {}));
@@ -860,15 +953,18 @@ let ProfileResourceChildTreeItemRenderer = class ProfileResourceChildTreeItemRen
         const checkbox = disposables.add(( (new Checkbox('', false, defaultCheckboxStyles))));
         append(container, checkbox.domNode);
         const resourceLabel = disposables.add(this.labels.create(container, { hoverDelegate: this.hoverDelegate }));
-        return { checkbox, resourceLabel, disposables, elementDisposables: disposables.add(( (new DisposableStore()))) };
+        const actionsContainer = append(container, $('.profile-tree-item-actions-container'));
+        const actionBar = disposables.add(this.instantiationService.createInstance(WorkbenchToolBar, actionsContainer, {
+            hoverDelegate: disposables.add(createInstantHoverDelegate()),
+            highlightToggledItems: true
+        }));
+        return { checkbox, resourceLabel, actionBar, disposables, elementDisposables: disposables.add(( (new DisposableStore()))) };
     }
     renderElement({ element: profileResourceTreeElement }, index, templateData, height) {
         templateData.elementDisposables.clear();
         const { element } = profileResourceTreeElement;
-        if (isString(element)) {
-            throw ( (new Error(
-                'NewProfileResourceTreeRenderer can only render profile resource child tree items'
-            )));
+        if (!isProfileResourceChildElement(element)) {
+            throw ( (new Error('Invalid profile resource element')));
         }
         if (element.checkbox) {
             templateData.checkbox.domNode.classList.remove('hide');
@@ -881,15 +977,15 @@ let ProfileResourceChildTreeItemRenderer = class ProfileResourceChildTreeItemRen
         else {
             templateData.checkbox.domNode.classList.add('hide');
         }
-        const resource = URI.revive(element.resourceUri);
         templateData.resourceLabel.setResource({
-            name: resource ? basename(resource) : element.label?.label,
-            description: isString(element.description) ? element.description : undefined,
-            resource
+            name: element.resource ? basename(element.resource) : element.label,
+            resource: element.resource
         }, {
             forceLabel: true,
-            hideIcon: !resource,
+            icon: element.icon,
+            hideIcon: !element.resource && !element.icon,
         });
+        templateData.actionBar.setActions(element.action ? [element.action] : []);
     }
 };
 ProfileResourceChildTreeItemRenderer = ProfileResourceChildTreeItemRenderer_1 = ( (__decorate([