@codingame/monaco-vscode-api 1.83.16 → 1.85.0-next.0

package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.d.ts

@@ -1,13 +1,16 @@
-import { ServiceIdentifier } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceIdentifier, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { Event } from '../../../../base/common/event.js';
-import { CloseDirection, IEditorPane, GroupIdentifier, IEditorPartOptions, IEditorPartOptionsChangeEvent, IActiveEditorChangeEvent, IEditorCloseEvent, IEditorWillMoveEvent, IEditorWillOpenEvent, IVisibleEditorPane, EditorsOrder, IFindEditorOptions, EditorInputWithOptions, IUntypedEditorInput, IMatchEditorOptions } from '../../../common/editor.js';
+import { CloseDirection, IEditorPane, GroupIdentifier, IActiveEditorChangeEvent, IEditorCloseEvent, IEditorWillMoveEvent, IEditorWillOpenEvent, IVisibleEditorPane, EditorsOrder, IFindEditorOptions, EditorInputWithOptions, IUntypedEditorInput, IMatchEditorOptions, IEditorPartOptions, IEditorPartOptionsChangeEvent, IToolbarActions } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IDimension } from '../../../../editor/common/core/dimension.js';
-import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IGroupModelChangeEvent } from '../../../common/editor/editorGroupModel.js';
+import { IRectangle } from '../../../../platform/window/common/window.js';
+import { IMenuChangeEvent } from '../../../../platform/actions/common/actions.js';
+import { DeepPartial } from '../../../../base/common/types.js';
 
 declare const enum GroupDirection {
     UP = 0,
@@ -26,24 +29,24 @@ declare const enum GroupLocation {
     PREVIOUS = 3
 }
 interface IFindGroupScope {
-    direction?: GroupDirection;
-    location?: GroupLocation;
+    readonly direction?: GroupDirection;
+    readonly location?: GroupLocation;
 }
 declare const enum GroupsArrangement {
     /**
-     * Make the current active group consume the maximum
-     * amount of space possible.
+     * Make the current active group consume the entire
+     * editor area.
      */
     MAXIMIZE = 0,
     /**
-     * Size all groups evenly.
+     * Make the current active group consume the maximum
+     * amount of space possible.
      */
-    EVEN = 1,
+    EXPAND = 1,
     /**
-     * Will behave like MINIMIZE_OTHERS if the active
-     * group is not already maximized and EVEN otherwise
+     * Size all groups evenly.
      */
-    TOGGLE = 2
+    EVEN = 2
 }
 interface GroupLayoutArgument {
     /**
@@ -52,22 +55,22 @@ interface GroupLayoutArgument {
      * If provided, their sum must be 1 to be applied
      * per row or column.
      */
-    size?: number;
+    readonly size?: number;
     /**
      * Editor groups  will be laid out orthogonal to the
      * parent orientation.
      */
-    groups?: GroupLayoutArgument[];
+    readonly groups?: GroupLayoutArgument[];
 }
 interface EditorGroupLayout {
     /**
      * The initial orientation of the editor groups at the root.
      */
-    orientation: GroupOrientation;
+    readonly orientation: GroupOrientation;
     /**
      * The editor groups at the root of the layout.
      */
-    groups: GroupLayoutArgument[];
+    readonly groups: GroupLayoutArgument[];
 }
 declare const enum MergeGroupMode {
     COPY_EDITORS = 0,
@@ -75,29 +78,29 @@ declare const enum MergeGroupMode {
 }
 interface IMergeGroupOptions {
     mode?: MergeGroupMode;
-    index?: number;
+    readonly index?: number;
 }
 interface ICloseEditorOptions {
-    preserveFocus?: boolean;
+    readonly preserveFocus?: boolean;
 }
 type ICloseEditorsFilter = {
-    except?: EditorInput;
-    direction?: CloseDirection;
-    savedOnly?: boolean;
-    excludeSticky?: boolean;
+    readonly except?: EditorInput;
+    readonly direction?: CloseDirection;
+    readonly savedOnly?: boolean;
+    readonly excludeSticky?: boolean;
 };
 interface ICloseAllEditorsOptions {
-    excludeSticky?: boolean;
+    readonly excludeSticky?: boolean;
 }
 interface IEditorReplacement {
-    editor: EditorInput;
-    replacement: EditorInput;
-    options?: IEditorOptions;
+    readonly editor: EditorInput;
+    readonly replacement: EditorInput;
+    readonly options?: IEditorOptions;
     /**
      * Skips asking the user for confirmation and doesn't
      * save the document. Only use this if you really need to!
      */
-    forceReplaceDirty?: boolean;
+    readonly forceReplaceDirty?: boolean;
 }
 declare const enum GroupsOrder {
     /**
@@ -122,10 +125,18 @@ interface IEditorSideGroup {
      */
     openEditor(editor: EditorInput, options?: IEditorOptions): Promise<IEditorPane | undefined>;
 }
-
-declare const IEditorGroupsService: ServiceIdentifier<IEditorGroupsService>;
-interface IEditorGroupsService {
-    readonly _serviceBrand: undefined;
+interface IEditorDropTargetDelegate {
+    /**
+     * A helper to figure out if the drop target contains the provided group.
+     */
+    containsGroup?(groupView: IEditorGroup): boolean;
+}
+/**
+ * The basic primitive to work with editor groups. This interface is both implemented
+ * by editor part component as well as the editor groups service that operates across
+ * all opened editor parts.
+ */
+interface IEditorGroupsContainer {
     /**
      * An event for when the active editor group changes. The active editor
      * group is the default location for new editors to open.
@@ -147,14 +158,6 @@ interface IEditorGroupsService {
      * An event for when a group gets activated.
      */
     readonly onDidActivateGroup: Event<IEditorGroup>;
-    /**
-     * An event for when the group container is layed out.
-     */
-    readonly onDidLayout: Event<IDimension>;
-    /**
-     * An event for when the group container is scrolled.
-     */
-    readonly onDidScroll: Event<void>;
     /**
      * An event for when the index of a group changes.
      */
@@ -164,9 +167,9 @@ interface IEditorGroupsService {
      */
     readonly onDidChangeGroupLocked: Event<IEditorGroup>;
     /**
-     * The size of the editor groups area.
+     * An event for when the maximized state of a group changes.
      */
-    readonly contentDimension: IDimension;
+    readonly onDidChangeGroupMaximized: Event<boolean>;
     /**
      * An active group is the default location for new editors to open.
      */
@@ -177,12 +180,13 @@ interface IEditorGroupsService {
      */
     readonly sideGroup: IEditorSideGroup;
     /**
-     * All groups that are currently visible in the editor area in the
-     * order of their creation (oldest first).
+     * All groups that are currently visible in the container in the order
+     * of their creation (oldest first).
      */
     readonly groups: readonly IEditorGroup[];
     /**
-     * The number of editor groups that are currently opened.
+     * The number of editor groups that are currently opened in the
+     * container.
      */
     readonly count: number;
     /**
@@ -190,38 +194,7 @@ interface IEditorGroupsService {
      */
     readonly orientation: GroupOrientation;
     /**
-     * A property that indicates when groups have been created
-     * and are ready to be used.
-     */
-    readonly isReady: boolean;
-    /**
-     * A promise that resolves when groups have been created
-     * and are ready to be used.
-     *
-     * Await this promise to safely work on the editor groups model
-     * (for example, install editor group listeners).
-     *
-     * Use the `whenRestored` property to await visible editors
-     * having fully resolved.
-     */
-    readonly whenReady: Promise<void>;
-    /**
-     * A promise that resolves when groups have been restored.
-     *
-     * For groups with active editor, the promise will resolve
-     * when the visible editor has finished to resolve.
-     *
-     * Use the `whenReady` property to not await editors to
-     * resolve.
-     */
-    readonly whenRestored: Promise<void>;
-    /**
-     * Find out if the editor group service has UI state to restore
-     * from a previous session.
-     */
-    readonly hasRestorableState: boolean;
-    /**
-     * Get all groups that are currently visible in the editor area.
+     * Get all groups that are currently visible in the container.
      *
      * @param order the order of the editors to use
      */
@@ -249,25 +222,25 @@ interface IEditorGroupsService {
         height: number;
     }): void;
     /**
-     * Arrange all groups according to the provided arrangement.
+     * Arrange all groups in the container according to the provided arrangement.
      */
-    arrangeGroups(arrangement: GroupsArrangement): void;
+    arrangeGroups(arrangement: GroupsArrangement, target?: IEditorGroup | GroupIdentifier): void;
     /**
-     * Applies the provided layout by either moving existing groups or creating new groups.
+     * Toggles the target goup size to maximize/unmaximize.
      */
-    applyLayout(layout: EditorGroupLayout): void;
+    toggleMaximizeGroup(group?: IEditorGroup | GroupIdentifier): void;
     /**
-     * Returns an editor layout describing the current grid
+     * Toggles the target goup size to expand/distribute even.
      */
-    getLayout(): EditorGroupLayout;
+    toggleExpandGroup(group?: IEditorGroup | GroupIdentifier): void;
     /**
-     * Enable or disable centered editor layout.
+     * Applies the provided layout by either moving existing groups or creating new groups.
      */
-    centerLayout(active: boolean): void;
+    applyLayout(layout: EditorGroupLayout): void;
     /**
-     * Find out if the editor layout is currently centered.
+     * Returns an editor layout of the container.
      */
-    isLayoutCentered(): boolean;
+    getLayout(): EditorGroupLayout;
     /**
      * Sets the orientation of the root group to be either vertical or horizontal.
      */
@@ -289,7 +262,7 @@ interface IEditorGroupsService {
      */
     findGroup(scope: IFindGroupScope, source?: IEditorGroup | GroupIdentifier, wrap?: boolean): IEditorGroup | undefined;
     /**
-     * Add a new group to the editor area. A new group is added by splitting a provided one in
+     * Add a new group to the container. A new group is added by splitting a provided one in
      * one of the four directions.
      *
      * @param location the group from which to split to add a new group
@@ -297,11 +270,11 @@ interface IEditorGroupsService {
      */
     addGroup(location: IEditorGroup | GroupIdentifier, direction: GroupDirection): IEditorGroup;
     /**
-     * Remove a group from the editor area.
+     * Remove a group from the container.
      */
     removeGroup(group: IEditorGroup | GroupIdentifier): void;
     /**
-     * Move a group to a new group in the editor area.
+     * Move a group to a new group in the container.
      *
      * @param group the group to move
      * @param location the group from which to split to add the moved group
@@ -322,11 +295,11 @@ interface IEditorGroupsService {
      */
     mergeGroup(group: IEditorGroup | GroupIdentifier, target: IEditorGroup | GroupIdentifier, options?: IMergeGroupOptions): IEditorGroup;
     /**
-     * Merge all editor groups into the active one.
+     * Merge all editor groups into the target one.
      */
-    mergeAllGroups(): IEditorGroup;
+    mergeAllGroups(target: IEditorGroup | GroupIdentifier): IEditorGroup;
     /**
-     * Copy a group to a new group in the editor area.
+     * Copy a group to a new group in the container.
      *
      * @param group the group to copy
      * @param location the group from which to split to add the copied group
@@ -341,10 +314,132 @@ interface IEditorGroupsService {
      * An event that notifies when editor part options change.
      */
     readonly onDidChangeEditorPartOptions: Event<IEditorPartOptionsChangeEvent>;
+    /**
+     * Allows to register a drag and drop target for editors
+     * on the provided `container`.
+     */
+    createEditorDropTarget(container: unknown, delegate: IEditorDropTargetDelegate): IDisposable;
+}
+/**
+ * An editor part is a viewer of editor groups. There can be multiple editor
+ * parts opened in multiple windows.
+ */
+interface IEditorPart extends IEditorGroupsContainer {
+    /**
+     * An event for when the editor part is layed out.
+     */
+    readonly onDidLayout: Event<IDimension>;
+    /**
+     * An event for when the editor part is scrolled.
+     */
+    readonly onDidScroll: Event<void>;
+    /**
+     * The size of the editor part.
+     */
+    readonly contentDimension: IDimension;
+    /**
+     * A property that indicates when groups have been created
+     * and are ready to be used in the editor part.
+     */
+    readonly isReady: boolean;
+    /**
+     * A promise that resolves when groups have been created
+     * and are ready to be used in the editor part.
+     *
+     * Await this promise to safely work on the editor groups model
+     * (for example, install editor group listeners).
+     *
+     * Use the `whenRestored` property to await visible editors
+     * having fully resolved.
+     */
+    readonly whenReady: Promise<void>;
+    /**
+     * A promise that resolves when groups have been restored in
+     * the editor part.
+     *
+     * For groups with active editor, the promise will resolve
+     * when the visible editor has finished to resolve.
+     *
+     * Use the `whenReady` property to not await editors to
+     * resolve.
+     */
+    readonly whenRestored: Promise<void>;
+    /**
+     * Find out if the editor part has UI state to restore
+     * from a previous session.
+     */
+    readonly hasRestorableState: boolean;
+    /**
+     * Enable or disable centered editor layout.
+     */
+    centerLayout(active: boolean): void;
+    /**
+     * Find out if the editor layout is currently centered.
+     */
+    isLayoutCentered(): boolean;
     /**
      * Enforce editor part options temporarily.
      */
-    enforcePartOptions(options: IEditorPartOptions): IDisposable;
+    enforcePartOptions(options: DeepPartial<IEditorPartOptions>): IDisposable;
+}
+interface IAuxiliaryEditorPart extends IEditorPart {
+    /**
+     * The identifier of the window the auxiliary editor part is contained in.
+     */
+    readonly windowId: number;
+    /**
+     * Close this auxiliary editor part after moving all
+     * editors of all groups back to the main editor part.
+     */
+    close(): void;
+}
+interface IAuxiliaryEditorPartCreateEvent {
+    readonly part: IAuxiliaryEditorPart;
+    readonly instantiationService: IInstantiationService;
+    readonly disposables: DisposableStore;
+}
+
+declare const IEditorGroupsService: ServiceIdentifier<IEditorGroupsService>;
+/**
+ * The main service to interact with editor groups across all opened editor parts.
+ */
+interface IEditorGroupsService extends IEditorGroupsContainer {
+    readonly _serviceBrand: undefined;
+    /**
+     * An event for when a new auxiliary editor part is created.
+     */
+    readonly onDidCreateAuxiliaryEditorPart: Event<IAuxiliaryEditorPartCreateEvent>;
+    /**
+     * Provides access to the currently active editor part.
+     */
+    readonly activePart: IEditorPart;
+    /**
+     * Provides access to the main window editor part.
+     */
+    readonly mainPart: IEditorPart;
+    /**
+     * Provides access to all editor parts.
+     */
+    readonly parts: ReadonlyArray<IEditorPart>;
+    /**
+     * Get the editor part that contains the group with the provided identifier.
+     */
+    getPart(group: IEditorGroup | GroupIdentifier): IEditorPart;
+    /**
+     * Get the editor part that is rooted in the provided container.
+     */
+    getPart(container: unknown): IEditorPart;
+    /**
+     * Opens a new window with a full editor part instantiated
+     * in there at the optional position and size on screen.
+     */
+    createAuxiliaryEditorPart(options?: {
+        bounds?: Partial<IRectangle>;
+    }): Promise<IAuxiliaryEditorPart>;
+}
+interface IActiveEditorActions {
+    readonly actions: IToolbarActions;
+    readonly onDidChange: Event<IMenuChangeEvent | void>;
 }
 interface IEditorGroup {
     /**
@@ -603,6 +698,10 @@ interface IEditorGroup {
      * Move keyboard focus into the group.
      */
     focus(): void;
+    /**
+     * Create the editor actions for the current active editor.
+     */
+    createEditorActions(disposables: DisposableStore): IActiveEditorActions;
 }
 
-export { type EditorGroupLayout, GroupDirection, type GroupLayoutArgument, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, type ICloseAllEditorsOptions, type ICloseEditorOptions, type ICloseEditorsFilter, type IEditorGroup, IEditorGroupsService, type IEditorReplacement, type IEditorSideGroup, type IFindGroupScope, type IMergeGroupOptions, MergeGroupMode };
+export { type EditorGroupLayout, GroupDirection, type GroupLayoutArgument, GroupLocation, GroupOrientation, GroupsArrangement, GroupsOrder, type IActiveEditorActions, type IAuxiliaryEditorPart, type IAuxiliaryEditorPartCreateEvent, type ICloseAllEditorsOptions, type ICloseEditorOptions, type ICloseEditorsFilter, type IEditorDropTargetDelegate, type IEditorGroup, type IEditorGroupsContainer, IEditorGroupsService, type IEditorPart, type IEditorReplacement, type IEditorSideGroup, type IFindGroupScope, type IMergeGroupOptions, MergeGroupMode };

package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.js

@@ -23,8 +23,8 @@ var GroupLocation;
 var GroupsArrangement;
 ( (function(GroupsArrangement) {
     GroupsArrangement[GroupsArrangement["MAXIMIZE"] = 0] = "MAXIMIZE";
-    GroupsArrangement[GroupsArrangement["EVEN"] = 1] = "EVEN";
-    GroupsArrangement[GroupsArrangement["TOGGLE"] = 2] = "TOGGLE";
+    GroupsArrangement[GroupsArrangement["EXPAND"] = 1] = "EXPAND";
+    GroupsArrangement[GroupsArrangement["EVEN"] = 2] = "EVEN";
 })(GroupsArrangement || (GroupsArrangement = {})));
 var MergeGroupMode;
 ( (function(MergeGroupMode) {

package/vscode/src/vs/workbench/services/editor/common/editorResolverService.d.ts

@@ -4,7 +4,7 @@ import { Event } from '../../../../base/common/event.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IResourceEditorInput, ITextResourceEditorInput } from '../../../../platform/editor/common/editor.js';
-import { IUntypedEditorInput, EditorInputWithOptionsAndGroup, IUntitledTextResourceEditorInput, IResourceDiffEditorInput, IResourceMergeEditorInput, EditorInputWithOptions } from '../../../common/editor.js';
+import { IUntypedEditorInput, EditorInputWithOptionsAndGroup, IUntitledTextResourceEditorInput, IResourceDiffEditorInput, IResourceMultiDiffEditorInput, IResourceMergeEditorInput, EditorInputWithOptions } from '../../../common/editor.js';
 import { IEditorGroup } from './editorGroupsService.js';
 import { PreferredGroup } from './editorService.js';
 import { AtLeastOne } from '../../../../base/common/types.js';
@@ -51,11 +51,13 @@ type EditorInputFactoryResult = EditorInputWithOptions | Promise<EditorInputWith
 type EditorInputFactoryFunction = (editorInput: IResourceEditorInput | ITextResourceEditorInput, group: IEditorGroup) => EditorInputFactoryResult;
 type UntitledEditorInputFactoryFunction = (untitledEditorInput: IUntitledTextResourceEditorInput, group: IEditorGroup) => EditorInputFactoryResult;
 type DiffEditorInputFactoryFunction = (diffEditorInput: IResourceDiffEditorInput, group: IEditorGroup) => EditorInputFactoryResult;
+type DiffListEditorInputFactoryFunction = (diffEditorInput: IResourceMultiDiffEditorInput, group: IEditorGroup) => EditorInputFactoryResult;
 type MergeEditorInputFactoryFunction = (mergeEditorInput: IResourceMergeEditorInput, group: IEditorGroup) => EditorInputFactoryResult;
 type EditorInputFactories = {
     createEditorInput?: EditorInputFactoryFunction;
     createUntitledEditorInput?: UntitledEditorInputFactoryFunction;
     createDiffEditorInput?: DiffEditorInputFactoryFunction;
+    createMultiDiffEditorInput?: DiffListEditorInputFactoryFunction;
     createMergeEditorInput?: MergeEditorInputFactoryFunction;
 };
 type EditorInputFactoryObject = AtLeastOne<EditorInputFactories>;
@@ -109,6 +111,10 @@ interface IEditorResolverService {
      * A set of all the editors that are registered to the editor resolver.
      */
     getEditors(): RegisteredEditorInfo[];
+    /**
+     * Get a complete list of editor associations.
+     */
+    getAllUserAssociations(): EditorAssociations;
 }
 
-export { type DiffEditorInputFactoryFunction, type EditorAssociation, type EditorAssociations, type EditorInputFactoryFunction, type EditorInputFactoryObject, IEditorResolverService, type MergeEditorInputFactoryFunction, type RegisteredEditorInfo, type RegisteredEditorOptions, RegisteredEditorPriority, type ResolvedEditor, ResolvedStatus, type UntitledEditorInputFactoryFunction };
+export { type DiffEditorInputFactoryFunction, type DiffListEditorInputFactoryFunction, type EditorAssociation, type EditorAssociations, type EditorInputFactoryFunction, type EditorInputFactoryObject, IEditorResolverService, type MergeEditorInputFactoryFunction, type RegisteredEditorInfo, type RegisteredEditorOptions, RegisteredEditorPriority, type ResolvedEditor, ResolvedStatus, type UntitledEditorInputFactoryFunction };

package/vscode/src/vs/workbench/services/editor/common/editorService.d.ts

@@ -4,9 +4,10 @@ import { IEditorCloseEvent, IVisibleEditorPane, EditorsOrder, IEditorIdentifier,
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { Event } from '../../../../base/common/event.js';
 import { IEditor, IDiffEditor } from '../../../../editor/common/editorCommon.js';
-import { IEditorGroup, ICloseEditorOptions } from './editorGroupsService.js';
+import { IEditorGroup, ICloseEditorOptions, IEditorGroupsContainer } from './editorGroupsService.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IGroupModelChangeEvent } from '../../../common/editor/editorGroupModel.js';
+import { DisposableStore } from '../../../../base/common/lifecycle.js';
 
 /**
  * Open an editor in the currently active group.
@@ -275,6 +276,12 @@ interface IEditorService {
      * @returns `true` if all editors reverted and `false` otherwise.
      */
     revertAll(options?: IRevertAllEditorsOptions): Promise<boolean>;
+    /**
+     * Create a scoped editor service that only operates on the provided
+     * editor group container. Use `main` to create a scoped editor service
+     * to the main editor group container of the main window.
+     */
+    createScoped(editorGroupsContainer: IEditorGroupsContainer | 'main', disposables: DisposableStore): IEditorService;
 }
 
 export { ACTIVE_GROUP, type ACTIVE_GROUP_TYPE, type IBaseSaveRevertAllEditorOptions, IEditorService, type IEditorsChangeEvent, type IOpenEditorsOptions, type IRevertAllEditorsOptions, type ISaveAllEditorsOptions, type ISaveEditorsOptions, type ISaveEditorsResult, type IUntypedEditorReplacement, type PreferredGroup, SIDE_GROUP, type SIDE_GROUP_TYPE };

package/vscode/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.js

@@ -121,13 +121,22 @@ let WorkspaceExtensionsConfigService = class WorkspaceExtensionsConfigService ex
     async addOrRemoveWorkspaceFolderRecommendation(extensionId, workspaceFolder, extensionsConfigContent, add) {
         const values = [];
         if (add) {
-            values.push({ path: ['recommendations'], value: [...(extensionsConfigContent.recommendations || []), extensionId] });
-            if (extensionsConfigContent.unwantedRecommendations && ( extensionsConfigContent.unwantedRecommendations.some(e => e === extensionId))) {
-                values.push({ path: ['unwantedRecommendations'], value: extensionsConfigContent.unwantedRecommendations.filter(e => e !== extensionId) });
+            if (Array.isArray(extensionsConfigContent.recommendations)) {
+                values.push({ path: ['recommendations', -1], value: extensionId });
+            }
+            else {
+                values.push({ path: ['recommendations'], value: [extensionId] });
+            }
+            const unwantedRecommendationEdit = this.getEditToRemoveValueFromArray(['unwantedRecommendations'], extensionsConfigContent.unwantedRecommendations, extensionId);
+            if (unwantedRecommendationEdit) {
+                values.push(unwantedRecommendationEdit);
             }
         }
         else if (extensionsConfigContent.recommendations) {
-            values.push({ path: ['recommendations'], value: extensionsConfigContent.recommendations.filter(e => e !== extensionId) });
+            const recommendationEdit = this.getEditToRemoveValueFromArray(['recommendations'], extensionsConfigContent.recommendations, extensionId);
+            if (recommendationEdit) {
+                values.push(recommendationEdit);
+            }
         }
         if (values.length) {
             return this.jsonEditingService.write(workspaceFolder.toResource(EXTENSIONS_CONFIG), values, true);
@@ -137,13 +146,23 @@ let WorkspaceExtensionsConfigService = class WorkspaceExtensionsConfigService ex
         const values = [];
         if (extensionsConfigContent) {
             if (add) {
-                values.push({ path: ['extensions', 'recommendations'], value: [...(extensionsConfigContent.recommendations || []), extensionId] });
-                if (extensionsConfigContent.unwantedRecommendations && ( extensionsConfigContent.unwantedRecommendations.some(e => e === extensionId))) {
-                    values.push({ path: ['extensions', 'unwantedRecommendations'], value: extensionsConfigContent.unwantedRecommendations.filter(e => e !== extensionId) });
+                const path = ['extensions', 'recommendations'];
+                if (Array.isArray(extensionsConfigContent.recommendations)) {
+                    values.push({ path: [...path, -1], value: extensionId });
+                }
+                else {
+                    values.push({ path, value: [extensionId] });
+                }
+                const unwantedRecommendationEdit = this.getEditToRemoveValueFromArray(['extensions', 'unwantedRecommendations'], extensionsConfigContent.unwantedRecommendations, extensionId);
+                if (unwantedRecommendationEdit) {
+                    values.push(unwantedRecommendationEdit);
                 }
             }
             else if (extensionsConfigContent.recommendations) {
-                values.push({ path: ['extensions', 'recommendations'], value: extensionsConfigContent.recommendations.filter(e => e !== extensionId) });
+                const recommendationEdit = this.getEditToRemoveValueFromArray(['extensions', 'recommendations'], extensionsConfigContent.recommendations, extensionId);
+                if (recommendationEdit) {
+                    values.push(recommendationEdit);
+                }
             }
         }
         else if (add) {
@@ -156,13 +175,23 @@ let WorkspaceExtensionsConfigService = class WorkspaceExtensionsConfigService ex
     async addOrRemoveWorkspaceFolderUnwantedRecommendation(extensionId, workspaceFolder, extensionsConfigContent, add) {
         const values = [];
         if (add) {
-            values.push({ path: ['unwantedRecommendations'], value: [...(extensionsConfigContent.unwantedRecommendations || []), extensionId] });
-            if (extensionsConfigContent.recommendations && ( extensionsConfigContent.recommendations.some(e => e === extensionId))) {
-                values.push({ path: ['recommendations'], value: extensionsConfigContent.recommendations.filter(e => e !== extensionId) });
+            const path = ['unwantedRecommendations'];
+            if (Array.isArray(extensionsConfigContent.unwantedRecommendations)) {
+                values.push({ path: [...path, -1], value: extensionId });
+            }
+            else {
+                values.push({ path, value: [extensionId] });
+            }
+            const recommendationEdit = this.getEditToRemoveValueFromArray(['recommendations'], extensionsConfigContent.recommendations, extensionId);
+            if (recommendationEdit) {
+                values.push(recommendationEdit);
             }
         }
         else if (extensionsConfigContent.unwantedRecommendations) {
-            values.push({ path: ['unwantedRecommendations'], value: extensionsConfigContent.unwantedRecommendations.filter(e => e !== extensionId) });
+            const unwantedRecommendationEdit = this.getEditToRemoveValueFromArray(['unwantedRecommendations'], extensionsConfigContent.unwantedRecommendations, extensionId);
+            if (unwantedRecommendationEdit) {
+                values.push(unwantedRecommendationEdit);
+            }
         }
         if (values.length) {
             return this.jsonEditingService.write(workspaceFolder.toResource(EXTENSIONS_CONFIG), values, true);
@@ -172,13 +201,23 @@ let WorkspaceExtensionsConfigService = class WorkspaceExtensionsConfigService ex
         const values = [];
         if (extensionsConfigContent) {
             if (add) {
-                values.push({ path: ['extensions', 'unwantedRecommendations'], value: [...(extensionsConfigContent.unwantedRecommendations || []), extensionId] });
-                if (extensionsConfigContent.recommendations && ( extensionsConfigContent.recommendations.some(e => e === extensionId))) {
-                    values.push({ path: ['extensions', 'recommendations'], value: extensionsConfigContent.recommendations.filter(e => e !== extensionId) });
+                const path = ['extensions', 'unwantedRecommendations'];
+                if (Array.isArray(extensionsConfigContent.recommendations)) {
+                    values.push({ path: [...path, -1], value: extensionId });
+                }
+                else {
+                    values.push({ path, value: [extensionId] });
+                }
+                const recommendationEdit = this.getEditToRemoveValueFromArray(['extensions', 'recommendations'], extensionsConfigContent.recommendations, extensionId);
+                if (recommendationEdit) {
+                    values.push(recommendationEdit);
                 }
             }
             else if (extensionsConfigContent.unwantedRecommendations) {
-                values.push({ path: ['extensions', 'unwantedRecommendations'], value: extensionsConfigContent.unwantedRecommendations.filter(e => e !== extensionId) });
+                const unwantedRecommendationEdit = this.getEditToRemoveValueFromArray(['extensions', 'unwantedRecommendations'], extensionsConfigContent.unwantedRecommendations, extensionId);
+                if (unwantedRecommendationEdit) {
+                    values.push(unwantedRecommendationEdit);
+                }
             }
         }
         else if (add) {
@@ -243,6 +282,13 @@ let WorkspaceExtensionsConfigService = class WorkspaceExtensionsConfigService ex
             unwantedRecommendations: distinct(( (extensionsConfigContent.unwantedRecommendations || []).map(e => e.toLowerCase())))
         };
     }
+    getEditToRemoveValueFromArray(path, array, value) {
+        const index = array?.indexOf(value);
+        if (index !== undefined && index !== -1) {
+            return { path: [...path, index], value: undefined };
+        }
+        return undefined;
+    }
 };
 WorkspaceExtensionsConfigService = ( __decorate([
     ( __param(0, IWorkspaceContextService)),