From dc69d8bf6d14c59ecbfcfede3a816c6eb95c57a1 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 18 Aug 2017 15:02:19 +0200
Subject: [PATCH] properly spec error data,  #32766

---
 src/vs/base/common/errors.ts                             | 9 +++++++++
 .../workbench/api/electron-browser/mainThreadErrors.ts   | 9 ++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/vs/base/common/errors.ts b/src/vs/base/common/errors.ts
index 568a6baee1a..18d8cad519c 100644
--- a/src/vs/base/common/errors.ts
+++ b/src/vs/base/common/errors.ts
@@ -152,6 +152,15 @@ export function onUnexpectedPromiseError<T>(promise: TPromise<T>): TPromise<T |
 	return promise.then(null, onUnexpectedError);
 }
 
+export interface SerializedError {
+	readonly $isError: true;
+	readonly name: string;
+	readonly message: string;
+	readonly stack: string;
+}
+
+export function transformErrorForSerialization(error: Error): SerializedError;
+export function transformErrorForSerialization(error: any): any;
 export function transformErrorForSerialization(error: any): any {
 	if (error instanceof Error) {
 		let { name, message } = error;
diff --git a/src/vs/workbench/api/electron-browser/mainThreadErrors.ts b/src/vs/workbench/api/electron-browser/mainThreadErrors.ts
index c2ee7a0baa2..25ee026c2b1 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadErrors.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadErrors.ts
@@ -14,7 +14,14 @@ export class MainThreadErrors implements MainThreadErrorsShape {
 	public dispose(): void {
 	}
 
-	public $onUnexpectedExtHostError(err: any): void {
+	public $onUnexpectedExtHostError(err: any | errors.SerializedError): void {
+		if (err.$isError) {
+			const { name, message, stack } = err;
+			err = new Error();
+			err.name = name;
+			err.message = message;
+			err.stack = stack;
+		}
 		errors.onUnexpectedError(err);
 	}
 }