From 16577239fe2a51f05a0387eedaab9ef566b32a3a Mon Sep 17 00:00:00 2001
From: Mikhail Bodrov <connormiha@wisebits.com>
Date: Mon, 25 Sep 2023 10:37:55 +0300
Subject: [PATCH] fix: simplified map+flat

---
 src/vs/base/common/lifecycle.ts                             | 3 +--
 src/vs/workbench/api/browser/mainThreadNotebookKernels.ts   | 2 +-
 src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts  | 6 +++---
 .../contrib/codeActions/browser/codeActionsContribution.ts  | 4 ++--
 .../common/aiRelatedInformationService.ts                   | 3 +--
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/vs/base/common/lifecycle.ts b/src/vs/base/common/lifecycle.ts
index 9dff9590abb..4b621529946 100644
--- a/src/vs/base/common/lifecycle.ts
+++ b/src/vs/base/common/lifecycle.ts
@@ -103,8 +103,7 @@ export class DisposableTracker implements IDisposableTracker {
 
 		const leaking = [...this.livingDisposables.entries()]
 			.filter(([, v]) => v.source !== null && !this.getRootParent(v, rootParentCache).isSingleton)
-			.map(([k]) => k)
-			.flat();
+			.flatMap(([k]) => k);
 
 		return leaking;
 	}
diff --git a/src/vs/workbench/api/browser/mainThreadNotebookKernels.ts b/src/vs/workbench/api/browser/mainThreadNotebookKernels.ts
index 512e611c499..f85d1d111b8 100644
--- a/src/vs/workbench/api/browser/mainThreadNotebookKernels.ts
+++ b/src/vs/workbench/api/browser/mainThreadNotebookKernels.ts
@@ -43,7 +43,7 @@ abstract class MainThreadKernel implements INotebookKernel {
 	}
 
 	public get preloadProvides() {
-		return this.preloads.map(p => p.provides).flat();
+		return this.preloads.flatMap(p => p.provides);
 	}
 
 	constructor(data: INotebookKernelDto2, private _languageService: ILanguageService) {
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts
index 9f895d8b8a7..f0948975790 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts
@@ -52,7 +52,7 @@ class RenameOperation implements IFileOperation {
 	) { }
 
 	get uris() {
-		return this._edits.map(edit => [edit.newUri, edit.oldUri]).flat();
+		return this._edits.flatMap(edit => [edit.newUri, edit.oldUri]);
 	}
 
 	async perform(token: CancellationToken): Promise<IFileOperation> {
@@ -106,7 +106,7 @@ class CopyOperation implements IFileOperation {
 	) { }
 
 	get uris() {
-		return this._edits.map(edit => [edit.newUri, edit.oldUri]).flat();
+		return this._edits.flatMap(edit => [edit.newUri, edit.oldUri]);
 	}
 
 	async perform(token: CancellationToken): Promise<IFileOperation> {
@@ -297,7 +297,7 @@ class FileUndoRedoElement implements IWorkspaceUndoRedoElement {
 		readonly operations: IFileOperation[],
 		readonly confirmBeforeUndo: boolean
 	) {
-		this.resources = operations.map(op => op.uris).flat();
+		this.resources = operations.flatMap(op => op.uris);
 	}
 
 	async undo(): Promise<void> {
diff --git a/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.ts b/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.ts
index bd0c4c4393c..a575e81bd1b 100644
--- a/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.ts
+++ b/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.ts
@@ -74,7 +74,7 @@ export class CodeActionsContribution extends Disposable implements IWorkbenchCon
 		super();
 
 		codeActionsExtensionPoint.setHandler(extensionPoints => {
-			this._contributedCodeActions = extensionPoints.map(x => x.value).flat();
+			this._contributedCodeActions = extensionPoints.flatMap(x => x.value);
 			this.updateConfigurationSchema(this._contributedCodeActions);
 			this._onDidChangeContributions.fire();
 		});
@@ -143,7 +143,7 @@ export class CodeActionsContribution extends Disposable implements IWorkbenchCon
 		};
 
 		const getActions = (ofKind: CodeActionKind): ContributedCodeAction[] => {
-			const allActions = this._contributedCodeActions.map(desc => desc.actions).flat();
+			const allActions = this._contributedCodeActions.flatMap(desc => desc.actions);
 
 			const out = new Map<string, ContributedCodeAction>();
 			for (const action of allActions) {
diff --git a/src/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformationService.ts b/src/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformationService.ts
index cd4e247b59e..8c814e419a2 100644
--- a/src/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformationService.ts
+++ b/src/vs/workbench/services/aiRelatedInformation/common/aiRelatedInformationService.ts
@@ -91,8 +91,7 @@ export class AiRelatedInformationService implements IAiRelatedInformationService
 			}
 			const result = results
 				.filter(r => r.status === 'fulfilled')
-				.map(r => (r as PromiseFulfilledResult<RelatedInformationResult[]>).value)
-				.flat();
+				.flatMap(r => (r as PromiseFulfilledResult<RelatedInformationResult[]>).value);
 			return result;
 		} finally {
 			stopwatch.stop();