add runtimeErrors to extension status

This commit is contained in:
Johannes Rieken
2017-11-29 14:42:33 +01:00
parent 367c44da19
commit 159f0ea25e
6 changed files with 32 additions and 5 deletions

View File

@@ -15,11 +15,11 @@ export class MainThreadErrors implements MainThreadErrorsShape {
//
}
$onUnexpectedError(err: any | SerializedError, extensionId: string | undefined): void {
$onUnexpectedError(err: any | SerializedError): void {
if (err.$isError) {
const { name, message, stack } = err;
err = new Error();
err.message = extensionId ? `[${extensionId}] ${message}` : message;
err.message = message;
err.name = name;
err.stack = stack;
}

View File

@@ -9,6 +9,7 @@ import { IExtensionService } from 'vs/platform/extensions/common/extensions';
import { MainThreadExtensionServiceShape, MainContext, IExtHostContext } from '../node/extHost.protocol';
import { ExtensionService } from 'vs/workbench/services/extensions/electron-browser/extensionService';
import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
import { SerializedError } from 'vs/base/common/errors';
@extHostNamedCustomer(MainContext.MainThreadExtensionService)
export class MainThreadExtensionService implements MainThreadExtensionServiceShape {
@@ -33,6 +34,13 @@ export class MainThreadExtensionService implements MainThreadExtensionServiceSha
$onExtensionActivated(extensionId: string, startup: boolean, codeLoadingTime: number, activateCallTime: number, activateResolvedTime: number, activationEvent: string): void {
this._extensionService._onExtensionActivated(extensionId, startup, codeLoadingTime, activateCallTime, activateResolvedTime, activationEvent);
}
$onExtensionRuntimeError(extensionId: string, data: SerializedError): void {
const error = new Error();
error.name = data.name;
error.message = data.message;
error.stack = data.stack;
this._extensionService._onExtensionRuntimeError(extensionId, error);
}
$onExtensionActivationFailed(extensionId: string): void {
}
$addMessage(extensionId: string, severity: Severity, message: string): void {

View File

@@ -239,7 +239,7 @@ export interface MainThreadTreeViewsShape extends IDisposable {
}
export interface MainThreadErrorsShape extends IDisposable {
$onUnexpectedError(err: any | SerializedError, extensionId: string | undefined): void;
$onUnexpectedError(err: any | SerializedError): void;
}
export interface MainThreadLanguageFeaturesShape extends IDisposable {
@@ -352,6 +352,7 @@ export interface MainThreadExtensionServiceShape extends IDisposable {
$localShowMessage(severity: Severity, msg: string): void;
$onExtensionActivated(extensionId: string, startup: boolean, codeLoadingTime: number, activateCallTime: number, activateResolvedTime: number, activationEvent: string): void;
$onExtensionActivationFailed(extensionId: string): void;
$onExtensionRuntimeError(extensionId: string, error: SerializedError): void;
$addMessage(extensionId: string, severity: Severity, message: string): void;
}