@codingame/monaco-vscode-user-data-profile-service-override 32.0.2 → 34.0.0

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

@@ -223,15 +223,15 @@ let AbstractUserDataProfileElement = class AbstractUserDataProfileElement extend
     }
     validate() {
         if (!this.name) {
-            this.message = ( localize(15511, "Profile name is required and must be a non-empty value."));
+            this.message = ( localize(15850, "Profile name is required and must be a non-empty value."));
             return;
         }
         if (this.shouldValidateName() && this.name !== this.getInitialName() && ( this.userDataProfilesService.profiles.some(p => p.name === this.name))) {
-            this.message = ( localize(15512, "Profile with name {0} already exists.", this.name));
+            this.message = ( localize(15851, "Profile with name {0} already exists.", this.name));
             return;
         }
         if (this.flags && this.flags.settings && this.flags.keybindings && this.flags.tasks && this.flags.snippets && this.flags.extensions) {
-            this.message = ( localize(15513, "The profile should contain at least one configuration."));
+            this.message = ( localize(15852, "The profile should contain at least one configuration."));
             return;
         }
         this.message = undefined;
@@ -254,7 +254,7 @@ let AbstractUserDataProfileElement = class AbstractUserDataProfileElement extend
                     resourceType: r,
                     openAction: children.length ? toAction({
                         id: "_open",
-                        label: ( localize(15514, "Open to the Side")),
+                        label: ( localize(15853, "Open to the Side")),
                         class: ThemeIcon.asClassName(Codicon.goToFile),
                         run: () => children[0]?.openAction?.run()
                     }) : undefined
@@ -301,7 +301,7 @@ let AbstractUserDataProfileElement = class AbstractUserDataProfileElement extend
             icon: child.themeIcon,
             openAction: toAction({
                 id: "_openChild",
-                label: ( localize(15514, "Open to the Side")),
+                label: ( localize(15853, "Open to the Side")),
                 class: ThemeIcon.asClassName(Codicon.goToFile),
                 run: async () => {
                     if (child.parent.type === ProfileResourceType.Extensions) {
@@ -504,7 +504,7 @@ let UserDataProfileElement = class UserDataProfileElement extends AbstractUserDa
             const children = await this.instantiationService.createInstance(ExtensionsResourceExportTreeItem, this.profile).getChildren();
             return (children.map(child => this.toUserDataProfileResourceChildElement(child, undefined, [{
                 id: "applyToAllProfiles",
-                label: ( localize(15515, "Apply Extension to all Profiles")),
+                label: ( localize(15854, "Apply Extension to all Profiles")),
                 checked: child.applicationScoped,
                 enabled: true,
                 class: "",
@@ -674,7 +674,7 @@ let NewProfileElement = class NewProfileElement extends AbstractUserDataProfileE
             }
             if (isUserDataProfile(this.copyFrom)) {
                 if (this.defaultName === this.name) {
-                    this.name = this.defaultName = ( localize(15516, "{0} (Copy)", this.copyFrom.name));
+                    this.name = this.defaultName = ( localize(15855, "{0} (Copy)", this.copyFrom.name));
                 }
                 if (this.defaultIcon === this.icon) {
                     this.icon = this.defaultIcon = this.copyFrom.icon;
@@ -710,7 +710,7 @@ let NewProfileElement = class NewProfileElement extends AbstractUserDataProfileE
         }
     }
     getNewProfileName() {
-        const name = ( localize(15517, "Untitled"));
+        const name = ( localize(15856, "Untitled"));
         const nameRegEx = ( new RegExp(`${name}\\s(\\d+)`));
         let nameIndex = 0;
         for (const profile of this.userDataProfilesService.profiles) {
@@ -950,11 +950,11 @@ let UserDataProfilesEditorModel = class UserDataProfilesEditorModel extends Edit
     }
     createProfileElement(profile) {
         const disposables = ( new DisposableStore());
-        const activateAction = disposables.add(( new Action("userDataProfile.activate", ( localize(15518, "Use this Profile for Current Window")), ThemeIcon.asClassName(Codicon.check), true, () => this.userDataProfileManagementService.switchProfile(profileElement.profile))));
-        const copyFromProfileAction = disposables.add(( new Action("userDataProfile.copyFromProfile", ( localize(15519, "Duplicate...")), ThemeIcon.asClassName(Codicon.copy), true, () => this.createNewProfile(profileElement.profile))));
-        const exportAction = disposables.add(( new Action("userDataProfile.export", ( localize(15520, "Export...")), ThemeIcon.asClassName(Codicon.export), true, () => this.userDataProfileImportExportService.exportProfile(profile))));
-        const deleteAction = disposables.add(( new Action("userDataProfile.delete", ( localize(15521, "Delete")), ThemeIcon.asClassName(Codicon.trash), true, () => this.removeProfile(profileElement.profile))));
-        const newWindowAction = disposables.add(( new Action("userDataProfile.newWindow", ( localize(15522, "Open New Window with this Profile")), ThemeIcon.asClassName(Codicon.emptyWindow), true, () => this.openWindow(profileElement.profile))));
+        const activateAction = disposables.add(( new Action("userDataProfile.activate", ( localize(15857, "Use this Profile for Current Window")), ThemeIcon.asClassName(Codicon.check), true, () => this.userDataProfileManagementService.switchProfile(profileElement.profile))));
+        const copyFromProfileAction = disposables.add(( new Action("userDataProfile.copyFromProfile", ( localize(15858, "Duplicate...")), ThemeIcon.asClassName(Codicon.copy), true, () => this.createNewProfile(profileElement.profile))));
+        const exportAction = disposables.add(( new Action("userDataProfile.export", ( localize(15859, "Export...")), ThemeIcon.asClassName(Codicon.export), true, () => this.userDataProfileImportExportService.exportProfile(profile))));
+        const deleteAction = disposables.add(( new Action("userDataProfile.delete", ( localize(15860, "Delete")), ThemeIcon.asClassName(Codicon.trash), true, () => this.removeProfile(profileElement.profile))));
+        const newWindowAction = disposables.add(( new Action("userDataProfile.newWindow", ( localize(15861, "Open New Window with this Profile")), ThemeIcon.asClassName(Codicon.emptyWindow), true, () => this.openWindow(profileElement.profile))));
         const primaryActions = [];
         primaryActions.push(activateAction);
         primaryActions.push(newWindowAction);
@@ -982,11 +982,11 @@ let UserDataProfilesEditorModel = class UserDataProfilesEditorModel extends Edit
             const result = await this.dialogService.confirm({
                 type: "info",
                 message: ( localize(
-                    15523,
+                    15862,
                     "A new profile is already being created. Do you want to discard it and create a new one?"
                 )),
-                primaryButton: ( localize(15524, "Discard & Create")),
-                cancelButton: ( localize(15525, "Cancel"))
+                primaryButton: ( localize(15863, "Discard & Create")),
+                cancelButton: ( localize(15864, "Cancel"))
             });
             if (!result.confirmed) {
                 return;
@@ -1007,18 +1007,18 @@ let UserDataProfilesEditorModel = class UserDataProfilesEditorModel extends Edit
             disposables.add(toDisposable(() => cancellationTokenSource.dispose(true)));
             const primaryActions = [];
             const secondaryActions = [];
-            const createAction = disposables.add(( new Action("userDataProfile.create", ( localize(15526, "Create")), undefined, true, () => this.saveNewProfile(false, cancellationTokenSource.token))));
+            const createAction = disposables.add(( new Action("userDataProfile.create", ( localize(15865, "Create")), undefined, true, () => this.saveNewProfile(false, cancellationTokenSource.token))));
             primaryActions.push(createAction);
             if (isWeb && copyFrom instanceof URI && isProfileURL(copyFrom)) {
-                primaryActions.push(disposables.add(( new Action("userDataProfile.createInDesktop", ( localize(15527, "Create in {0}", this.productService.nameLong)), undefined, true, () => this.openerService.open(copyFrom, {
+                primaryActions.push(disposables.add(( new Action("userDataProfile.createInDesktop", ( localize(15866, "Create in {0}", this.productService.nameLong)), undefined, true, () => this.openerService.open(copyFrom, {
                     openExternal: true
                 })))));
             }
-            const cancelAction = disposables.add(( new Action("userDataProfile.cancel", ( localize(15525, "Cancel")), ThemeIcon.asClassName(Codicon.trash), true, () => this.discardNewProfile())));
+            const cancelAction = disposables.add(( new Action("userDataProfile.cancel", ( localize(15864, "Cancel")), ThemeIcon.asClassName(Codicon.trash), true, () => this.discardNewProfile())));
             secondaryActions.push(cancelAction);
-            const previewProfileAction = disposables.add(( new Action("userDataProfile.preview", ( localize(15528, "Preview")), ThemeIcon.asClassName(Codicon.openPreview), true, () => this.previewNewProfile(cancellationTokenSource.token))));
+            const previewProfileAction = disposables.add(( new Action("userDataProfile.preview", ( localize(15867, "Preview")), ThemeIcon.asClassName(Codicon.openPreview), true, () => this.previewNewProfile(cancellationTokenSource.token))));
             secondaryActions.push(previewProfileAction);
-            const exportAction = disposables.add(( new Action("userDataProfile.export", ( localize(15520, "Export...")), ThemeIcon.asClassName(Codicon.export), isUserDataProfile(copyFrom), () => this.exportNewProfile(cancellationTokenSource.token))));
+            const exportAction = disposables.add(( new Action("userDataProfile.export", ( localize(15859, "Export...")), ThemeIcon.asClassName(Codicon.export), isUserDataProfile(copyFrom), () => this.exportNewProfile(cancellationTokenSource.token))));
             this.newProfileElement = disposables.add(this.instantiationService.createInstance(
                 NewProfileElement,
                 copyFrom,
@@ -1028,9 +1028,9 @@ let UserDataProfilesEditorModel = class UserDataProfilesEditorModel extends Edit
             const updateCreateActionLabel = () => {
                 if (createAction.enabled) {
                     if (this.newProfileElement?.copyFrom && ( this.userDataProfilesService.profiles.some(p => !p.isInternal && p.name === this.newProfileElement?.name))) {
-                        createAction.label = ( localize(15529, "Replace"));
+                        createAction.label = ( localize(15868, "Replace"));
                     } else {
-                        createAction.label = ( localize(15526, "Create"));
+                        createAction.label = ( localize(15865, "Create"));
                     }
                 }
             };
@@ -1200,9 +1200,9 @@ let UserDataProfilesEditorModel = class UserDataProfilesEditorModel extends Edit
     async removeProfile(profile) {
         const result = await this.dialogService.confirm({
             type: "info",
-            message: ( localize(15530, "Are you sure you want to delete the profile '{0}'?", profile.name)),
-            primaryButton: ( localize(15521, "Delete")),
-            cancelButton: ( localize(15525, "Cancel"))
+            message: ( localize(15869, "Are you sure you want to delete the profile '{0}'?", profile.name)),
+            primaryButton: ( localize(15860, "Delete")),
+            cancelButton: ( localize(15864, "Cancel"))
         });
         if (result.confirmed) {
             await this.userDataProfileManagementService.removeProfile(profile);

package/vscode/src/vs/workbench/services/userDataProfile/browser/extensionsResource.js

@@ -227,7 +227,7 @@ let ExtensionsResource = class ExtensionsResource {
                                 return;
                             }
                             progress?.(( localize(
-                                17160,
+                                17507,
                                 "Installing extension {0}...",
                                 installExtensionInfo.extension.displayName ?? installExtensionInfo.extension.identifier.id
                             )));
@@ -322,7 +322,7 @@ class ExtensionsResourceTreeItem {
         this.type = ProfileResourceType.Extensions;
         this.handle = ProfileResourceType.Extensions;
         this.label = {
-            label: ( localize(17161, "Extensions"))
+            label: ( localize(17508, "Extensions"))
         };
         this.collapsibleState = TreeItemCollapsibleState.Expanded;
         this.contextValue = ProfileResourceType.Extensions;
@@ -340,7 +340,7 @@ class ExtensionsResourceTreeItem {
             label: {
                 label: e.displayName || e.identifier.id
             },
-            description: e.applicationScoped ? ( localize(17162, "All Profiles")) : undefined,
+            description: e.applicationScoped ? ( localize(17509, "All Profiles")) : undefined,
             collapsibleState: TreeItemCollapsibleState.None,
             checkbox: that.checkbox ? {
                 get isChecked() {
@@ -353,9 +353,9 @@ class ExtensionsResourceTreeItem {
                         that.excludedExtensions.add(e.identifier.id.toLowerCase());
                     }
                 },
-                tooltip: ( localize(17163, "Select {0} Extension", e.displayName || e.identifier.id)),
+                tooltip: ( localize(17510, "Select {0} Extension", e.displayName || e.identifier.id)),
                 accessibilityInformation: {
-                    label: ( localize(17163, "Select {0} Extension", e.displayName || e.identifier.id))
+                    label: ( localize(17510, "Select {0} Extension", e.displayName || e.identifier.id))
                 }
             } : undefined,
             themeIcon: Codicon.extensions,

package/vscode/src/vs/workbench/services/userDataProfile/browser/globalStateResource.js

@@ -89,7 +89,7 @@ class GlobalStateResourceTreeItem {
         this.type = ProfileResourceType.GlobalState;
         this.handle = ProfileResourceType.GlobalState;
         this.label = {
-            label: ( localize(17164, "UI State"))
+            label: ( localize(17511, "UI State"))
         };
         this.collapsibleState = TreeItemCollapsibleState.Collapsed;
     }

package/vscode/src/vs/workbench/services/userDataProfile/browser/keybindingsResource.js

@@ -81,7 +81,7 @@ let KeybindingsResourceTreeItem = class KeybindingsResourceTreeItem {
         this.type = ProfileResourceType.Keybindings;
         this.handle = ProfileResourceType.Keybindings;
         this.label = {
-            label: ( localize(17165, "Keyboard Shortcuts"))
+            label: ( localize(17512, "Keyboard Shortcuts"))
         };
         this.collapsibleState = TreeItemCollapsibleState.Expanded;
     }

package/vscode/src/vs/workbench/services/userDataProfile/browser/mcpProfileResource.js

@@ -76,7 +76,7 @@ let McpResourceTreeItem = class McpResourceTreeItem {
         this.type = ProfileResourceType.Mcp;
         this.handle = ProfileResourceType.Mcp;
         this.label = {
-            label: ( localize(17166, "MCP Servers"))
+            label: ( localize(17513, "MCP Servers"))
         };
         this.collapsibleState = TreeItemCollapsibleState.Expanded;
     }

package/vscode/src/vs/workbench/services/userDataProfile/browser/settingsResource.js

@@ -105,7 +105,7 @@ let SettingsResourceTreeItem = class SettingsResourceTreeItem {
         this.type = ProfileResourceType.Settings;
         this.handle = ProfileResourceType.Settings;
         this.label = {
-            label: ( localize(17167, "Settings"))
+            label: ( localize(17514, "Settings"))
         };
         this.collapsibleState = TreeItemCollapsibleState.Expanded;
     }

package/vscode/src/vs/workbench/services/userDataProfile/browser/snippetsResource.d.ts

@@ -2,6 +2,7 @@ import { ResourceSet } from "@codingame/monaco-vscode-api/vscode/vs/base/common/
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IUserDataProfile, ProfileResourceType } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile";
 import { ITreeItemCheckboxState, TreeItemCollapsibleState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views";
@@ -11,13 +12,15 @@ export declare class SnippetsResourceInitializer implements IProfileResourceInit
     private readonly userDataProfileService;
     private readonly fileService;
     private readonly uriIdentityService;
-    constructor(userDataProfileService: IUserDataProfileService, fileService: IFileService, uriIdentityService: IUriIdentityService);
+    private readonly logService;
+    constructor(userDataProfileService: IUserDataProfileService, fileService: IFileService, uriIdentityService: IUriIdentityService, logService: ILogService);
     initialize(content: string): Promise<void>;
 }
 export declare class SnippetsResource implements IProfileResource {
     private readonly fileService;
     private readonly uriIdentityService;
-    constructor(fileService: IFileService, uriIdentityService: IUriIdentityService);
+    private readonly logService;
+    constructor(fileService: IFileService, uriIdentityService: IUriIdentityService, logService: ILogService);
     getContent(profile: IUserDataProfile, excluded?: ResourceSet): Promise<string>;
     apply(content: string, profile: IUserDataProfile): Promise<void>;
     private getSnippets;

package/vscode/src/vs/workbench/services/userDataProfile/browser/snippetsResource.js

@@ -6,31 +6,51 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { FileOperationError, FileOperationResult } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { ProfileResourceType } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile';
 import { API_OPEN_EDITOR_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorCommands';
 import { TreeItemCollapsibleState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 
+function toSnippetResource(extUri, snippetsHome, key) {
+    const resource = extUri.joinPath(snippetsHome, key);
+    if (!extUri.isEqualOrParent(resource, snippetsHome) || extUri.isEqual(resource, snippetsHome)) {
+        return undefined;
+    }
+    return resource;
+}
 let SnippetsResourceInitializer = class SnippetsResourceInitializer {
-    constructor(userDataProfileService, fileService, uriIdentityService) {
+    constructor(userDataProfileService, fileService, uriIdentityService, logService) {
         this.userDataProfileService = userDataProfileService;
         this.fileService = fileService;
         this.uriIdentityService = uriIdentityService;
+        this.logService = logService;
     }
     async initialize(content) {
         const snippetsContent = JSON.parse(content);
         for (const key in snippetsContent.snippets) {
-            const resource = this.uriIdentityService.extUri.joinPath(this.userDataProfileService.currentProfile.snippetsHome, key);
+            const resource = toSnippetResource(
+                this.uriIdentityService.extUri,
+                this.userDataProfileService.currentProfile.snippetsHome,
+                key
+            );
+            if (!resource) {
+                this.logService.warn(
+                    `SnippetsResourceInitializer: Ignoring snippet with key '${key}' as it escapes the snippets folder.`
+                );
+                continue;
+            }
             await this.fileService.writeFile(resource, VSBuffer.fromString(snippetsContent.snippets[key]));
         }
     }
 };
-SnippetsResourceInitializer = ( __decorate([( __param(0, IUserDataProfileService)), ( __param(1, IFileService)), ( __param(2, IUriIdentityService))], SnippetsResourceInitializer));
+SnippetsResourceInitializer = ( __decorate([( __param(0, IUserDataProfileService)), ( __param(1, IFileService)), ( __param(2, IUriIdentityService)), ( __param(3, ILogService))], SnippetsResourceInitializer));
 let SnippetsResource = class SnippetsResource {
-    constructor(fileService, uriIdentityService) {
+    constructor(fileService, uriIdentityService, logService) {
         this.fileService = fileService;
         this.uriIdentityService = uriIdentityService;
+        this.logService = logService;
     }
     async getContent(profile, excluded) {
         const snippets = await this.getSnippets(profile, excluded);
@@ -41,7 +61,13 @@ let SnippetsResource = class SnippetsResource {
     async apply(content, profile) {
         const snippetsContent = JSON.parse(content);
         for (const key in snippetsContent.snippets) {
-            const resource = this.uriIdentityService.extUri.joinPath(profile.snippetsHome, key);
+            const resource = toSnippetResource(this.uriIdentityService.extUri, profile.snippetsHome, key);
+            if (!resource) {
+                this.logService.warn(
+                    `SnippetsResource: Ignoring snippet with key '${key}' as it escapes the snippets folder.`
+                );
+                continue;
+            }
             await this.fileService.writeFile(resource, VSBuffer.fromString(snippetsContent.snippets[key]));
         }
     }
@@ -81,7 +107,7 @@ let SnippetsResource = class SnippetsResource {
         return snippets;
     }
 };
-SnippetsResource = ( __decorate([( __param(0, IFileService)), ( __param(1, IUriIdentityService))], SnippetsResource));
+SnippetsResource = ( __decorate([( __param(0, IFileService)), ( __param(1, IUriIdentityService)), ( __param(2, ILogService))], SnippetsResource));
 let SnippetsResourceTreeItem = class SnippetsResourceTreeItem {
     constructor(profile, instantiationService, uriIdentityService) {
         this.profile = profile;
@@ -89,7 +115,7 @@ let SnippetsResourceTreeItem = class SnippetsResourceTreeItem {
         this.uriIdentityService = uriIdentityService;
         this.type = ProfileResourceType.Snippets;
         this.label = {
-            label: ( localize(17168, "Snippets"))
+            label: ( localize(17515, "Snippets"))
         };
         this.collapsibleState = TreeItemCollapsibleState.Collapsed;
         this.excludedSnippets = ( new ResourceSet());
@@ -119,7 +145,7 @@ let SnippetsResourceTreeItem = class SnippetsResourceTreeItem {
                 },
                 accessibilityInformation: {
                     label: ( localize(
-                        17169,
+                        17516,
                         "Select Snippet {0}",
                         this.uriIdentityService.extUri.basename(resource)
                     ))

package/vscode/src/vs/workbench/services/userDataProfile/browser/tasksResource.js

@@ -76,7 +76,7 @@ let TasksResourceTreeItem = class TasksResourceTreeItem {
         this.type = ProfileResourceType.Tasks;
         this.handle = ProfileResourceType.Tasks;
         this.label = {
-            label: ( localize(17170, "Tasks"))
+            label: ( localize(17517, "Tasks"))
         };
         this.collapsibleState = TreeItemCollapsibleState.Expanded;
     }