Skip to content

Commit c842995

Browse files
jriekenjrieken
committed
debt - remove duplicated types
1 parent 86dce61 commit c842995

3 files changed

Lines changed: 11 additions & 27 deletions

File tree

‎src/vs/workbench/api/common/extHostExtensionActivator.ts‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,19 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import * as nls from 'vs/nls';
7+
import * as vscode from 'vscode';
78
import { IDisposable } from 'vs/base/common/lifecycle';
89
import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/common/extensionDescriptionRegistry';
910
import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
1011
import { ExtensionActivationError, MissingDependencyError } from 'vs/workbench/services/extensions/common/extensions';
1112

1213
const NO_OP_VOID_PROMISE = Promise.resolve<void>(undefined);
1314

14-
export interface IExtensionMemento {
15-
get<T>(key: string): T | undefined;
16-
get<T>(key: string, defaultValue: T): T;
17-
update(key: string, value: any): Promise<void>;
18-
}
19-
20-
export interface IExtensionContext {
21-
subscriptions: IDisposable[];
22-
workspaceState: IExtensionMemento;
23-
globalState: IExtensionMemento;
24-
extensionPath: string;
25-
storagePath: string;
26-
globalStoragePath: string;
27-
asAbsolutePath(relativePath: string): string;
28-
readonly logPath: string;
29-
}
30-
3115
/**
3216
* Represents the source code (module) of an extension.
3317
*/
3418
export interface IExtensionModule {
35-
activate?(ctx: IExtensionContext): Promise<IExtensionAPI>;
19+
activate?(ctx: vscode.ExtensionContext): Promise<IExtensionAPI>;
3620
deactivate?(): void;
3721
}
3822

‎src/vs/workbench/api/common/extHostExtensionService.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { URI } from 'vs/base/common/uri';
1313
import { ILogService } from 'vs/platform/log/common/log';
1414
import { ExtHostExtensionServiceShape, IInitData, MainContext, MainThreadExtensionServiceShape, MainThreadTelemetryShape, MainThreadWorkspaceShape, IResolveAuthorityResult } from 'vs/workbench/api/common/extHost.protocol';
1515
import { ExtHostConfiguration, IExtHostConfiguration } from 'vs/workbench/api/common/extHostConfiguration';
16-
import { ActivatedExtension, EmptyExtension, ExtensionActivatedByAPI, ExtensionActivatedByEvent, ExtensionActivationReason, ExtensionActivationTimes, ExtensionActivationTimesBuilder, ExtensionsActivator, IExtensionAPI, IExtensionContext, IExtensionModule, HostExtension, ExtensionActivationTimesFragment } from 'vs/workbench/api/common/extHostExtensionActivator';
16+
import { ActivatedExtension, EmptyExtension, ExtensionActivatedByAPI, ExtensionActivatedByEvent, ExtensionActivationReason, ExtensionActivationTimes, ExtensionActivationTimesBuilder, ExtensionsActivator, IExtensionAPI, IExtensionModule, HostExtension, ExtensionActivationTimesFragment } from 'vs/workbench/api/common/extHostExtensionActivator';
1717
import { ExtHostStorage, IExtHostStorage } from 'vs/workbench/api/common/extHostStorage';
1818
import { ExtHostWorkspace, IExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
1919
import { ExtensionActivationError } from 'vs/workbench/services/extensions/common/extensions';
@@ -331,11 +331,11 @@ export abstract class AbstractExtHostExtensionService implements ExtHostExtensio
331331
this._logService.info(`ExtensionService#_doActivateExtension ${extensionDescription.identifier.value} ${JSON.stringify(reason)}`);
332332

333333
const activationTimesBuilder = new ExtensionActivationTimesBuilder(reason.startup);
334-
return Promise.all<any>([
335-
this._loadCommonJSModule(joinPath(extensionDescription.extensionLocation, extensionDescription.main), activationTimesBuilder),
334+
return Promise.all([
335+
this._loadCommonJSModule<IExtensionModule>(joinPath(extensionDescription.extensionLocation, extensionDescription.main), activationTimesBuilder),
336336
this._loadExtensionContext(extensionDescription)
337337
]).then(values => {
338-
return AbstractExtHostExtensionService._callActivate(this._logService, extensionDescription.identifier, <IExtensionModule>values[0], <IExtensionContext>values[1], activationTimesBuilder);
338+
return AbstractExtHostExtensionService._callActivate(this._logService, extensionDescription.identifier, values[0], values[1], activationTimesBuilder);
339339
});
340340
}
341341

@@ -353,7 +353,7 @@ export abstract class AbstractExtHostExtensionService implements ExtHostExtensio
353353
this._storagePath.whenReady
354354
]).then(() => {
355355
const that = this;
356-
return Object.freeze(<IExtensionContext>{
356+
return Object.freeze<vscode.ExtensionContext>({
357357
globalState,
358358
workspaceState,
359359
subscriptions: [],
@@ -366,7 +366,7 @@ export abstract class AbstractExtHostExtensionService implements ExtHostExtensio
366366
});
367367
}
368368

369-
private static _callActivate(logService: ILogService, extensionId: ExtensionIdentifier, extensionModule: IExtensionModule, context: IExtensionContext, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<ActivatedExtension> {
369+
private static _callActivate(logService: ILogService, extensionId: ExtensionIdentifier, extensionModule: IExtensionModule, context: vscode.ExtensionContext, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<ActivatedExtension> {
370370
// Make sure the extension's surface is not undefined
371371
extensionModule = extensionModule || {
372372
activate: undefined,
@@ -378,7 +378,7 @@ export abstract class AbstractExtHostExtensionService implements ExtHostExtensio
378378
});
379379
}
380380

381-
private static _callActivateOptional(logService: ILogService, extensionId: ExtensionIdentifier, extensionModule: IExtensionModule, context: IExtensionContext, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<IExtensionAPI> {
381+
private static _callActivateOptional(logService: ILogService, extensionId: ExtensionIdentifier, extensionModule: IExtensionModule, context: vscode.ExtensionContext, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<IExtensionAPI> {
382382
if (typeof extensionModule.activate === 'function') {
383383
try {
384384
activationTimesBuilder.activateCallStart();

‎src/vs/workbench/api/common/extHostMemento.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6+
import * as vscode from 'vscode';
67
import { IDisposable } from 'vs/base/common/lifecycle';
7-
import { IExtensionMemento } from 'vs/workbench/api/common/extHostExtensionActivator';
88
import { ExtHostStorage } from 'vs/workbench/api/common/extHostStorage';
99

10-
export class ExtensionMemento implements IExtensionMemento {
10+
export class ExtensionMemento implements vscode.Memento {
1111

1212
private readonly _id: string;
1313
private readonly _shared: boolean;

0 commit comments

Comments
 (0)