diff --git a/src/vs/base/parts/ipc/common/ipc.ts b/src/vs/base/parts/ipc/common/ipc.ts index 51bc034c083d5..7f607bd136013 100644 --- a/src/vs/base/parts/ipc/common/ipc.ts +++ b/src/vs/base/parts/ipc/common/ipc.ts @@ -1109,7 +1109,7 @@ export namespace ProxyChannel { properties?: Map; } - export function toService(channel: IChannel, options?: ICreateProxyServiceOptions): T { + export function toService(channel: IChannel, options?: ICreateProxyServiceOptions): T { const disableMarshalling = options && options.disableMarshalling; return new Proxy({}, { diff --git a/src/vs/editor/browser/config/editorConfiguration.ts b/src/vs/editor/browser/config/editorConfiguration.ts index 89f191b75ed01..58474ac936306 100644 --- a/src/vs/editor/browser/config/editorConfiguration.ts +++ b/src/vs/editor/browser/config/editorConfiguration.ts @@ -291,7 +291,7 @@ class EditorOptionsUtil { if (Array.isArray(a) || Array.isArray(b)) { return (Array.isArray(a) && Array.isArray(b) ? arrays.equals(a, b) : false); } - if (Object.keys(a).length !== Object.keys(b).length) { + if (Object.keys(a as unknown as object).length !== Object.keys(b as unknown as object).length) { return false; } for (const key in a) { diff --git a/src/vs/editor/browser/services/webWorker.ts b/src/vs/editor/browser/services/webWorker.ts index a88c165a7582f..c853e3220eca5 100644 --- a/src/vs/editor/browser/services/webWorker.ts +++ b/src/vs/editor/browser/services/webWorker.ts @@ -13,7 +13,7 @@ import { ILanguageConfigurationService } from 'vs/editor/common/languages/langua * Create a new web worker that has model syncing capabilities built in. * Specify an AMD module to load that will `create` an object that will be proxied. */ -export function createWebWorker(modelService: IModelService, languageConfigurationService: ILanguageConfigurationService, opts: IWebWorkerOptions): MonacoWebWorker { +export function createWebWorker(modelService: IModelService, languageConfigurationService: ILanguageConfigurationService, opts: IWebWorkerOptions): MonacoWebWorker { return new MonacoWebWorkerImpl(modelService, languageConfigurationService, opts); } @@ -61,7 +61,7 @@ export interface IWebWorkerOptions { keepIdleModels?: boolean; } -class MonacoWebWorkerImpl extends EditorWorkerClient implements MonacoWebWorker { +class MonacoWebWorkerImpl extends EditorWorkerClient implements MonacoWebWorker { private readonly _foreignModuleId: string; private readonly _foreignModuleHost: { [method: string]: Function } | null; diff --git a/src/vs/editor/standalone/browser/standaloneEditor.ts b/src/vs/editor/standalone/browser/standaloneEditor.ts index f6f4600ed03f7..04e0f6fd2cadc 100644 --- a/src/vs/editor/standalone/browser/standaloneEditor.ts +++ b/src/vs/editor/standalone/browser/standaloneEditor.ts @@ -178,7 +178,7 @@ export function onDidChangeModelLanguage(listener: (e: { readonly model: ITextMo * Create a new web worker that has model syncing capabilities built in. * Specify an AMD module to load that will `create` an object that will be proxied. */ -export function createWebWorker(opts: IWebWorkerOptions): MonacoWebWorker { +export function createWebWorker(opts: IWebWorkerOptions): MonacoWebWorker { return actualCreateWebWorker(StandaloneServices.get(IModelService), StandaloneServices.get(ILanguageConfigurationService), opts); } diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index 50d118f740f48..1d3dca33a504b 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -973,7 +973,7 @@ declare namespace monaco.editor { * Create a new web worker that has model syncing capabilities built in. * Specify an AMD module to load that will `create` an object that will be proxied. */ - export function createWebWorker(opts: IWebWorkerOptions): MonacoWebWorker; + export function createWebWorker(opts: IWebWorkerOptions): MonacoWebWorker; /** * Colorize the contents of `domNode` using attribute `data-lang`. diff --git a/src/vs/platform/ipc/electron-sandbox/services.ts b/src/vs/platform/ipc/electron-sandbox/services.ts index 8c78c98f03bc1..b2e63aaebf4c4 100644 --- a/src/vs/platform/ipc/electron-sandbox/services.ts +++ b/src/vs/platform/ipc/electron-sandbox/services.ts @@ -11,7 +11,7 @@ import { createDecorator, ServiceIdentifier } from 'vs/platform/instantiation/co type ChannelClientCtor = { new(channel: IChannel): T }; type Remote = { getChannel(channelName: string): IChannel }; -abstract class RemoteServiceStub { +abstract class RemoteServiceStub { constructor( channelName: string, options: IRemoteServiceWithChannelClientOptions | IRemoteServiceWithProxyOptions | undefined, @@ -55,7 +55,7 @@ export interface IMainProcessService { registerChannel(channelName: string, channel: IServerChannel): void; } -class MainProcessRemoteServiceStub extends RemoteServiceStub { +class MainProcessRemoteServiceStub extends RemoteServiceStub { constructor(channelName: string, options: IRemoteServiceWithChannelClientOptions | IRemoteServiceWithProxyOptions | undefined, @IMainProcessService ipcService: IMainProcessService) { super(channelName, options, ipcService); } @@ -81,7 +81,7 @@ export interface ISharedProcessService { notifyRestored(): void; } -class SharedProcessRemoteServiceStub extends RemoteServiceStub { +class SharedProcessRemoteServiceStub extends RemoteServiceStub { constructor(channelName: string, options: IRemoteServiceWithChannelClientOptions | IRemoteServiceWithProxyOptions | undefined, @ISharedProcessService ipcService: ISharedProcessService) { super(channelName, options, ipcService); } diff --git a/src/vs/workbench/api/common/extHostExtensionService.ts b/src/vs/workbench/api/common/extHostExtensionService.ts index 3042ed465c31a..b3ff5c0c2b4aa 100644 --- a/src/vs/workbench/api/common/extHostExtensionService.ts +++ b/src/vs/workbench/api/common/extHostExtensionService.ts @@ -611,7 +611,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme } // Require the test runner via node require from the provided path - const testRunner: ITestRunner | INewTestRunner | undefined = await this._loadCommonJSModule(null, extensionTestsLocationURI, new ExtensionActivationTimesBuilder(false)); + const testRunner = await this._loadCommonJSModule(null, extensionTestsLocationURI, new ExtensionActivationTimesBuilder(false)); if (!testRunner || typeof testRunner.run !== 'function') { throw new Error(nls.localize('extensionTestError', "Path {0} does not point to a valid extension test runner.", extensionTestsLocationURI.toString())); @@ -848,7 +848,7 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme protected abstract _beforeAlmostReadyToRunExtensions(): Promise; protected abstract _getEntryPoint(extensionDescription: IExtensionDescription): string | undefined; - protected abstract _loadCommonJSModule(extensionId: ExtensionIdentifier | null, module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise; + protected abstract _loadCommonJSModule(extensionId: ExtensionIdentifier | null, module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise; public abstract $setRemoteEnvironment(env: { [key: string]: string | null }): Promise; } @@ -897,7 +897,7 @@ export interface IExtHostExtensionService extends AbstractExtHostExtensionServic getRemoteConnectionData(): IRemoteConnectionData | null; } -export class Extension implements vscode.Extension { +export class Extension implements vscode.Extension { #extensionService: IExtHostExtensionService; #originExtensionId: ExtensionIdentifier; diff --git a/src/vs/workbench/api/worker/extHostExtensionService.ts b/src/vs/workbench/api/worker/extHostExtensionService.ts index 4927fc3be3e0a..68c7c8349109d 100644 --- a/src/vs/workbench/api/worker/extHostExtensionService.ts +++ b/src/vs/workbench/api/worker/extHostExtensionService.ts @@ -55,7 +55,7 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService { return extensionDescription.browser; } - protected async _loadCommonJSModule(extensionId: ExtensionIdentifier | null, module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise { + protected async _loadCommonJSModule(extensionId: ExtensionIdentifier | null, module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise { module = module.with({ path: ensureSuffix(module.path, '.js') }); if (extensionId) { performance.mark(`code/extHost/willFetchExtensionCode/${extensionId.value}`);