properly spec error data, #32766

microsoft · Aug 18, 2017 · dc69d8b · dc69d8b
1 parent 69c9ede
commit dc69d8b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git 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
@@ -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);
 	}
 }