Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-29 00:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

move mainThreadExtensionService, #70319

Browse Source
This commit is contained in:
Johannes Rieken
2019-03-20 15:42:13 +01:00
parent a2f31e1cd6
commit 2f157c7e45
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/api/electron-browser/mainThreadExtensionService.ts → src/vs/workbench/api/browser/mainThreadExtensionService.ts
+2 -5
View File
@@ -8,7 +8,6 @@ import Severity from 'vs/base/common/severity';
import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
import { IExtHostContext, MainContext, MainThreadExtensionServiceShape } from 'vs/workbench/api/common/extHost.protocol';
import { IExtensionService, ExtensionActivationError } from 'vs/workbench/services/extensions/common/extensions';
import { ExtensionService } from 'vs/workbench/services/extensions/electron-browser/extensionService';
import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
import { INotificationService } from 'vs/platform/notification/common/notification';
import { localize } from 'vs/nls';
@@ -21,7 +20,7 @@ import { IExtensionsWorkbenchService, IExtension } from 'vs/workbench/contrib/ex
@extHostNamedCustomer(MainContext.MainThreadExtensionService)
export class MainThreadExtensionService implements MainThreadExtensionServiceShape {
private readonly _extensionService: ExtensionService;
private readonly _extensionService: IExtensionService;
private readonly _notificationService: INotificationService;
private readonly _extensionsWorkbenchService: IExtensionsWorkbenchService;
private readonly _windowService: IWindowService;
@@ -33,9 +32,7 @@ export class MainThreadExtensionService implements MainThreadExtensionServiceSha
@IExtensionsWorkbenchService extensionsWorkbenchService: IExtensionsWorkbenchService,
@IWindowService windowService: IWindowService
) {
if (extensionService instanceof ExtensionService) {
this._extensionService = extensionService;
}
this._extensionService = extensionService;
this._notificationService = notificationService;
this._extensionsWorkbenchService = extensionsWorkbenchService;
this._windowService = windowService;
src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
+1 -1
View File
@@ -50,7 +50,7 @@ import '../browser/mainThreadWindow';
import '../browser/mainThreadWorkspace';
import './mainThreadComments';
import './mainThreadConsole';
import './mainThreadExtensionService';
import '../browser/mainThreadExtensionService';
import './mainThreadTask';
import './mainThreadWebview';
import 'vs/workbench/api/node/apiCommands';
src/vs/workbench/services/extensions/common/extensions.ts
+13 -1
View File
@@ -218,6 +218,13 @@ export interface IExtensionService extends ICpuProfilerTarget {
* Stops the extension host.
*/
stopExtensionHost(): void;
_logOrShowMessage(severity: Severity, msg: string): void;
_activateById(extensionId: ExtensionIdentifier, activationEvent: string): Promise<void>;
_onWillActivateExtension(extensionId: ExtensionIdentifier): void;
_onDidActivateExtension(extensionId: ExtensionIdentifier, startup: boolean, codeLoadingTime: number, activateCallTime: number, activateResolvedTime: number, activationEvent: string): void;
_onExtensionRuntimeError(extensionId: ExtensionIdentifier, err: Error): void;
}
export interface ICpuProfilerTarget {
@@ -278,4 +285,9 @@ export class NullExtensionService implements IExtensionService {
stopExtensionHost(): void { }
canAddExtension(): boolean { return false; }
canRemoveExtension(): boolean { return false; }
}
_logOrShowMessage(_severity: Severity, _msg: string): void { }
_activateById(_extensionId: ExtensionIdentifier, _activationEvent: string): Promise<void> { return Promise.resolve(); }
_onWillActivateExtension(_extensionId: ExtensionIdentifier): void { }
_onDidActivateExtension(_extensionId: ExtensionIdentifier, _startup: boolean, _codeLoadingTime: number, _activateCallTime: number, _activateResolvedTime: number, _activationEvent: string): void { }
_onExtensionRuntimeError(_extensionId: ExtensionIdentifier, _err: Error): void { }
}