From b64a4ae1aa32f0562c47a55bc473c0d240766e58 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Fri, 15 Jan 2021 17:35:25 +0100
Subject: [PATCH] Scaffold `MessageOptions.useCustom`

---
 src/vs/vscode.proposed.d.ts                              | 7 +++++++
 src/vs/workbench/api/browser/mainThreadMessageService.ts | 1 +
 src/vs/workbench/api/common/extHost.protocol.ts          | 1 +
 src/vs/workbench/api/common/extHostMessageService.ts     | 6 ++++++
 4 files changed, 15 insertions(+)

diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index 59df165ca02..95f1ede0e40 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -133,6 +133,13 @@ declare module 'vscode' {
 
 	//#region @alexdima - resolvers
 
+	export interface MessageOptions {
+		/**
+		 * Do not render a native message box.
+		 */
+		useCustom?: boolean;
+	}
+
 	export interface RemoteAuthorityResolverContext {
 		resolveAttempt: number;
 	}
diff --git a/src/vs/workbench/api/browser/mainThreadMessageService.ts b/src/vs/workbench/api/browser/mainThreadMessageService.ts
index c956da47b95..134d8488dfd 100644
--- a/src/vs/workbench/api/browser/mainThreadMessageService.ts
+++ b/src/vs/workbench/api/browser/mainThreadMessageService.ts
@@ -33,6 +33,7 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
 
 	$showMessage(severity: Severity, message: string, options: MainThreadMessageOptions, commands: { title: string; isCloseAffordance: boolean; handle: number; }[]): Promise<number | undefined> {
 		if (options.modal) {
+			// TODO: Handle options.useCustom
 			return this._showModalMessage(severity, message, commands);
 		} else {
 			return this._showMessage(severity, message, commands, options.extension);
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
index 9ed524ac3b5..b2a4e235b00 100644
--- a/src/vs/workbench/api/common/extHost.protocol.ts
+++ b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -420,6 +420,7 @@ export interface MainThreadLanguagesShape extends IDisposable {
 export interface MainThreadMessageOptions {
 	extension?: IExtensionDescription;
 	modal?: boolean;
+	useCustom?: boolean;
 }
 
 export interface MainThreadMessageServiceShape extends IDisposable {
diff --git a/src/vs/workbench/api/common/extHostMessageService.ts b/src/vs/workbench/api/common/extHostMessageService.ts
index ff75e2f3393..847a27a2b5e 100644
--- a/src/vs/workbench/api/common/extHostMessageService.ts
+++ b/src/vs/workbench/api/common/extHostMessageService.ts
@@ -8,6 +8,7 @@ import type * as vscode from 'vscode';
 import { MainContext, MainThreadMessageServiceShape, MainThreadMessageOptions, IMainContext } from './extHost.protocol';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { ILogService } from 'vs/platform/log/common/log';
+import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
 
 function isMessageItem(item: any): item is vscode.MessageItem {
 	return item && item.title;
@@ -37,9 +38,14 @@ export class ExtHostMessageService {
 			items = [optionsOrFirstItem, ...rest];
 		} else {
 			options.modal = optionsOrFirstItem && optionsOrFirstItem.modal;
+			options.useCustom = optionsOrFirstItem && optionsOrFirstItem.useCustom;
 			items = rest;
 		}
 
+		if (options.useCustom) {
+			checkProposedApiEnabled(extension);
+		}
+
 		const commands: { title: string; isCloseAffordance: boolean; handle: number; }[] = [];
 
 		for (let handle = 0; handle < items.length; handle++) {
-- 
GitLab