fix microsoft#198608 (microsoft#199672)

Author: sandy081

src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.ts

@@ -5,7 +5,7 @@
 
 import { distinct, flatten } from 'vs/base/common/arrays';
 import { Emitter, Event } from 'vs/base/common/event';
-import { parse } from 'vs/base/common/json';
+import { JSONPath, parse } from 'vs/base/common/json';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
 import { FileKind, IFileService } from 'vs/platform/files/common/files';
@@ -145,12 +145,20 @@ export class WorkspaceExtensionsConfigService extends Disposable implements IWor
 	private async addOrRemoveWorkspaceFolderRecommendation(extensionId: string, workspaceFolder: IWorkspaceFolder, extensionsConfigContent: IExtensionsConfigContent, add: boolean): Promise<void> {
 		const values: IJSONValue[] = [];
 		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) {
@@ -162,12 +170,21 @@ export class WorkspaceExtensionsConfigService extends Disposable implements IWor
 		const values: IJSONValue[] = [];
 		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: JSONPath = ['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) {
 			values.push({ path: ['extensions'], value: { recommendations: [extensionId] } });
@@ -181,12 +198,21 @@ export class WorkspaceExtensionsConfigService extends Disposable implements IWor
 	private async addOrRemoveWorkspaceFolderUnwantedRecommendation(extensionId: string, workspaceFolder: IWorkspaceFolder, extensionsConfigContent: IExtensionsConfigContent, add: boolean): Promise<void> {
 		const values: IJSONValue[] = [];
 		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: JSONPath = ['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);
@@ -197,12 +223,21 @@ export class WorkspaceExtensionsConfigService extends Disposable implements IWor
 		const values: IJSONValue[] = [];
 		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: JSONPath = ['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) {
 			values.push({ path: ['extensions'], value: { unwantedRecommendations: [extensionId] } });
@@ -265,6 +300,14 @@ export class WorkspaceExtensionsConfigService extends Disposable implements IWor
 		};
 	}
 
+	private getEditToRemoveValueFromArray(path: JSONPath, array: string[] | undefined, value: string): IJSONValue | undefined {
+		const index = array?.indexOf(value);
+		if (index !== undefined && index !== -1) {
+			return { path: [...path, index], value: undefined };
+		}
+		return undefined;
+	}
+
 }
 
 registerSingleton(IWorkspaceExtensionsConfigService, WorkspaceExtensionsConfigService, InstantiationType.Delayed);