index a68e020f9f..b4ee8a5886 100644

@@ -88,7 +88,7 @@ class RemoteAuthoritiesImpl {

if (host && host.indexOf(':') !== -1) {

host = `[${host}]`;

}

const connectionToken = this._connectionTokens[authority];

let query = `path=${encodeURIComponent(uri.path)}`;

if (typeof connectionToken === 'string') {

@@ -96,8 +96,8 @@ class RemoteAuthoritiesImpl {

}

return URI.from({

scheme: platform.isWeb ? this._preferredWebSchema : Schemas.vscodeRemoteResource,

query

});

}

index 5a631e0b39..8a2b1518d6 100644

@@ -59,6 +59,17 @@ if (typeof navigator === 'object' && !isElectronRenderer) {

_isWeb = true;

_locale = navigator.language;

_language = _locale;

} else if (typeof process === 'object') {

_isWindows = (process.platform === 'win32');

_isMacintosh = (process.platform === 'darwin');

index c52f7b3774..5a7e7f579e 100644

@@ -110,7 +110,10 @@ export function sanitizeProcessEnvironment(env: IProcessEnvironment, ...preserve

/^ELECTRON_.+$/,

/^GOOGLE_API_KEY$/,

/^VSCODE_.+$/,

];

const envKeys = Object.keys(env);

envKeys

index 2c64061da7..c0ef8faedd 100644

@@ -128,7 +128,10 @@ function factory(nodeRequire, path, fs, perf) {

function getLanguagePackConfigurations(userDataPath) {

const configFile = path.join(userDataPath, 'languagepacks.json');

try {

} catch (err) {

// Do nothing. If we can't read the file we have no

// language pack config.

index a599f5a7eb..ec7ccd43f8 100644

@@ -298,35 +298,6 @@ class WorkspaceProvider implements IWorkspaceProvider {

let workspace: IWorkspace;

let payload = Object.create(null);

// If no workspace is provided through the URL, check for config attribute from server

if (!foundWorkspace) {

if (config.folderUri) {

index abd1e33b18..bf75952ce1 100644

@@ -37,6 +37,8 @@ export interface ParsedArgs {

logExtensionHostCommunication?: boolean;

'extensions-dir'?: string;

'builtin-extensions-dir'?: string;

extensionDevelopmentPath?: string[]; // // undefined or array of 1 or more local paths or URIs

extensionTestsPath?: string; // either a local path or a URI

'extension-development-confirm-save'?: boolean;

@@ -147,6 +149,8 @@ export interface IEnvironmentService extends IUserHomeProvider {

disableExtensions: boolean | string[];

builtinExtensionsPath: string;

extensionsPath?: string;

extensionDevelopmentLocationURI?: URI[];

extensionTestsLocationURI?: URI;

logExtensionHostCommunication?: boolean;

index e68e0647c3..49a5aae2fa 100644

@@ -55,6 +55,8 @@ export const OPTIONS: OptionDescriptions<Required<ParsedArgs>> = {

'extensions-dir': { type: 'string', deprecates: 'extensionHomePath', cat: 'e', args: 'dir', description: localize('extensionHomePath', "Set the root path for extensions.") },

'builtin-extensions-dir': { type: 'string' },

'list-extensions': { type: 'boolean', cat: 'e', description: localize('listExtensions', "List the installed extensions.") },

'show-versions': { type: 'boolean', cat: 'e', description: localize('showVersions', "Show versions of installed extensions, when using --list-extension.") },

'category': { type: 'string', cat: 'e', description: localize('category', "Filters installed extensions by provided category, when using --list-extension.") },

@@ -310,4 +312,3 @@ export function buildHelpMessage(productName: string, executableName: string, ve

export function buildVersionMessage(version: string | undefined, commit: string | undefined): string {

return `${version || localize('unknownVersion', "Unknown version")}\n${commit || localize('unknownCommit', "Unknown commit")}\n${process.arch}`;

}

index 0428e1e888..9b3cddcb3a 100644

@@ -197,6 +197,13 @@ export class EnvironmentService implements IEnvironmentService {

return path.join(this.userHome, product.dataFolderName, 'extensions');

}

@memoize

get extensionDevelopmentLocationURI(): URI[] | undefined {

const s = this._args.extensionDevelopmentPath;

index 5b05650591..dc5140410e 100644

@@ -743,11 +743,15 @@ export class ExtensionManagementService extends Disposable implements IExtension

private scanSystemExtensions(): Promise<ILocalExtension[]> {

this.logService.trace('Started scanning system extensions');

if (this.environmentService.isBuilt) {

return systemExtensionsPromise;

}

@@ -769,9 +773,17 @@ export class ExtensionManagementService extends Disposable implements IExtension

.then(([systemExtensions, devSystemExtensions]) => [...systemExtensions, ...devSystemExtensions]);

}

private scanUserExtensions(excludeOutdated: boolean): Promise<ILocalExtension[]> {

this.logService.trace('Started scanning user extensions');

.then(([uninstalled, extensions]) => {

extensions = extensions.filter(e => !uninstalled[new ExtensionIdentifierWithVersion(e.identifier, e.manifest.version).key()]);

if (excludeOutdated) {

@@ -786,6 +798,12 @@ export class ExtensionManagementService extends Disposable implements IExtension

private scanExtensions(root: string, type: ExtensionType): Promise<ILocalExtension[]> {

const limiter = new Limiter<any>(10);

return pfs.readdir(root)

.then(extensionsFolders => Promise.all<ILocalExtension>(extensionsFolders.map(extensionFolder => limiter.queue(() => this.scanExtension(extensionFolder, root, type)))))

.then(extensions => extensions.filter(e => e && e.identifier));

}

@@ -824,7 +842,7 @@ export class ExtensionManagementService extends Disposable implements IExtension

private async removeUninstalledExtensions(): Promise<void> {

const uninstalled = await this.getUninstalledExtensions();

const installed: Set<string> = new Set<string>();

for (const e of extensions) {

if (!uninstalled[new ExtensionIdentifierWithVersion(e.identifier, e.manifest.version).key()]) {

@@ -843,7 +861,7 @@ export class ExtensionManagementService extends Disposable implements IExtension

}

private removeOutdatedExtensions(): Promise<void> {

.then(extensions => {

const toRemove: ILocalExtension[] = [];

index 804d113856..4b651e5c77 100644

@@ -22,11 +22,19 @@ if (isWeb) {

if (Object.keys(product).length === 0) {

assign(product, {

version: '1.41.0-dev',

nameLong: 'Visual Studio Code Web Dev',

nameShort: 'VSCode Web Dev',

urlProtocol: 'code-oss'

});

}

}

// Node: AMD loader

@@ -36,7 +44,7 @@ else if (typeof require !== 'undefined' && typeof require.__$__nodeRequire === '

const rootPath = path.dirname(getPathFromAmdModule(require, ''));

product = assign({}, require.__$__nodeRequire(path.join(rootPath, 'product.json')) as IProductConfiguration);

// Running out of sources

if (env['VSCODE_DEV']) {

@@ -48,7 +56,8 @@ else if (typeof require !== 'undefined' && typeof require.__$__nodeRequire === '

}

assign(product, {

});

}

index 120fd66644..52547bdb0e 100644

@@ -16,6 +16,7 @@ export interface IProductService extends Readonly<IProductConfiguration> {

export interface IProductConfiguration {

readonly version: string;

readonly date?: string;

readonly quality?: string;

readonly commit?: string;

index d0f6e6b18a..1966fd297d 100644

@@ -205,7 +205,8 @@ export class BrowserSocketFactory implements ISocketFactory {

}

connect(host: string, port: number, query: string, callback: IConnectCallback): void {

const errorListener = socket.onError((err) => callback(err, undefined));

socket.onOpen(() => {

errorListener.dispose();

@@ -213,6 +214,3 @@ export class BrowserSocketFactory implements ISocketFactory {

});

}

}

index 81ec255e65..c94829fc6a 100644

@@ -16,7 +16,7 @@ export const IRequestService = createDecorator<IRequestService>('requestService'

export interface IRequestService {

_serviceBrand: undefined;

resolveProxy(url: string): Promise<string | undefined>;

}

index ad44dcbc33..7a7b5261ff 100644

@@ -57,7 +57,7 @@ export class RequestService extends Disposable implements IRequestService {

this.authorization = config.http && config.http.proxyAuthorization;

}

this.logService.trace('RequestService#request', options.url);

const { proxyUrl, strictSSL } = this;

@@ -70,7 +70,7 @@ export class RequestService extends Disposable implements IRequestService {

options.headers = assign(options.headers || {}, { 'Proxy-Authorization': this.authorization });

}

}

private async getNodeRequest(options: IRequestOptions): Promise<IRawRequestFunction> {

@@ -79,7 +79,7 @@ export class RequestService extends Disposable implements IRequestService {

return module.request;

}

return new Promise<IRequestContext>(async (c, e) => {

let req: http.ClientRequest;

@@ -114,7 +114,7 @@ export class RequestService extends Disposable implements IRequestService {

} else {

let stream: streams.ReadableStream<Uint8Array> = res;

stream = res.pipe(createGunzip());

}

index d8bf464fed..748715da3b 100644

import { Event, Emitter } from 'vs/base/common/event';

import { timeout } from 'vs/base/common/async';

import { IConfigurationService, getMigratedSettingValue } from 'vs/platform/configuration/common/configuration';

import product from 'vs/platform/product/common/product';

import { IUpdateService, State, StateType, AvailableForDownload, UpdateType } from 'vs/platform/update/common/update';

import { IEnvironmentService } from 'vs/platform/environment/common/environment';

@@ -44,7 +43,7 @@ export abstract class AbstractUpdateService implements IUpdateService {

}

constructor(

@IConfigurationService protected configurationService: IConfigurationService,

@IEnvironmentService private readonly environmentService: IEnvironmentService,

@IRequestService protected requestService: IRequestService,

@@ -156,15 +155,8 @@ export abstract class AbstractUpdateService implements IUpdateService {

this.logService.trace('update#quitAndInstall(): before lifecycle quit()');

this.logService.trace('update#quitAndInstall(): running raw#quitAndInstall()');

this.doQuitAndInstall();

return Promise.resolve(undefined);

}

index e69aa80159..2960d00456 100644

@@ -62,6 +62,7 @@ import './mainThreadTunnelService';

import './mainThreadAuthentication';

import './mainThreadTimeline';

import 'vs/workbench/api/common/apiCommands';

export class ExtensionPoints implements IWorkbenchContribution {

index 91045fcda6..d93d3286d8 100644

@@ -72,6 +72,7 @@ import { IExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelServ

import { IExtHostApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';

import { ExtHostAuthentication } from 'vs/workbench/api/common/extHostAuthentication';

import { ExtHostTimeline } from 'vs/workbench/api/common/extHostTimeline';

export interface IExtensionApiFactory {

(extension: IExtensionDescription, registry: ExtensionDescriptionRegistry, configProvider: ExtHostConfigProvider): typeof vscode;

@@ -93,6 +94,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I

const extHostLogService = accessor.get(ILogService);

const extHostTunnelService = accessor.get(IExtHostTunnelService);

const extHostApiDeprecation = accessor.get(IExtHostApiDeprecationService);

// register addressable instances

rpcProtocol.set(ExtHostContext.ExtHostLogService, <ExtHostLogServiceShape><any>extHostLogService);

@@ -101,6 +103,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I

rpcProtocol.set(ExtHostContext.ExtHostExtensionService, extensionService);

rpcProtocol.set(ExtHostContext.ExtHostStorage, extHostStorage);

rpcProtocol.set(ExtHostContext.ExtHostTunnelService, extHostTunnelService);

// automatically create and register addressable instances

const extHostDecorations = rpcProtocol.set(ExtHostContext.ExtHostDecorations, accessor.get(IExtHostDecorations));

index 55130ff918..032534b23e 100644

@@ -667,6 +667,16 @@ export interface MainThreadLabelServiceShape extends IDisposable {

$unregisterResourceLabelFormatter(handle: number): void;

}

export interface MainThreadSearchShape extends IDisposable {

$registerFileSearchProvider(handle: number, scheme: string): void;

$registerTextSearchProvider(handle: number, scheme: string): void;

@@ -1498,7 +1508,8 @@ export const MainContext = {

MainThreadLabelService: createMainId<MainThreadLabelServiceShape>('MainThreadLabelService'),

MainThreadTheming: createMainId<MainThreadThemingShape>('MainThreadTheming'),

MainThreadTunnelService: createMainId<MainThreadTunnelServiceShape>('MainThreadTunnelService'),

};

export const ExtHostContext = {

@@ -1536,5 +1547,6 @@ export const ExtHostContext = {

ExtHostTheming: createMainId<ExtHostThemingShape>('ExtHostTheming'),

ExtHostTunnelService: createMainId<ExtHostTunnelServiceShape>('ExtHostTunnelService'),

ExtHostAuthentication: createMainId<ExtHostAuthenticationShape>('ExtHostAuthentication'),

};

index 978bf32fcd..a63954cce0 100644

import * as nls from 'vs/nls';

import * as path from 'vs/base/common/path';

import { Barrier } from 'vs/base/common/async';

import { dispose, toDisposable, DisposableStore } from 'vs/base/common/lifecycle';

import { TernarySearchTree } from 'vs/base/common/map';

@@ -33,6 +33,7 @@ import { IExtensionStoragePaths } from 'vs/workbench/api/common/extHostStoragePa

import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';

import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';

import { IExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelService';

interface ITestRunner {

/** Old test runner API, as exported from `vscode/lib/testrunner` */

@@ -78,6 +79,7 @@ export abstract class AbstractExtHostExtensionService implements ExtHostExtensio

protected readonly _extHostConfiguration: ExtHostConfiguration;

protected readonly _logService: ILogService;

protected readonly _extHostTunnelService: IExtHostTunnelService;

protected readonly _mainThreadWorkspaceProxy: MainThreadWorkspaceShape;

protected readonly _mainThreadTelemetryProxy: MainThreadTelemetryShape;

@@ -107,7 +109,8 @@ export abstract class AbstractExtHostExtensionService implements ExtHostExtensio

@ILogService logService: ILogService,

@IExtHostInitDataService initData: IExtHostInitDataService,

@IExtensionStoragePaths storagePath: IExtensionStoragePaths,

) {

this._hostUtils = hostUtils;

this._extHostContext = extHostContext;

@@ -116,6 +119,7 @@ export abstract class AbstractExtHostExtensionService implements ExtHostExtensio

this._extHostWorkspace = extHostWorkspace;

this._extHostConfiguration = extHostConfiguration;

this._logService = logService;

this._extHostTunnelService = extHostTunnelService;

this._disposables = new DisposableStore();

@@ -341,14 +345,14 @@ export abstract class AbstractExtHostExtensionService implements ExtHostExtensio

const activationTimesBuilder = new ExtensionActivationTimesBuilder(reason.startup);

return Promise.all([

this._loadExtensionContext(extensionDescription)

]).then(values => {

return AbstractExtHostExtensionService._callActivate(this._logService, extensionDescription.identifier, values[0], values[1], activationTimesBuilder);

});

}

private _loadExtensionContext(extensionDescription: IExtensionDescription): Promise<vscode.ExtensionContext> {

index 72ad75d63e..8c4edee5e3 100644

@@ -29,6 +29,8 @@ import { ExtHostLogService } from 'vs/workbench/api/node/extHostLogService';

import { IExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelService';

import { ExtHostTunnelService } from 'vs/workbench/api/node/extHostTunnelService';

import { IExtHostApiDeprecationService, ExtHostApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';

// register singleton services

registerSingleton(ILogService, ExtHostLogService);

@@ -47,3 +49,19 @@ registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths);

registerSingleton(IExtHostExtensionService, ExtHostExtensionService);

registerSingleton(IExtHostStorage, ExtHostStorage);

registerSingleton(IExtHostTunnelService, ExtHostTunnelService);

index a1c3e50ffd..910627aaf9 100644

@@ -13,6 +13,8 @@ import { ExtHostDownloadService } from 'vs/workbench/api/node/extHostDownloadSer

import { CLIServer } from 'vs/workbench/api/node/extHostCLIServer';

import { URI } from 'vs/base/common/uri';

import { Schemas } from 'vs/base/common/network';

class NodeModuleRequireInterceptor extends RequireInterceptor {

@@ -76,7 +78,10 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {

};

}

if (module.scheme !== Schemas.file) {

throw new Error(`Cannot load URI: '${module}', must be of file-scheme`);

}

index afdd6bf398..ac91318ce3 100644

import * as path from 'vs/base/common/path';

import { URI } from 'vs/base/common/uri';

import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';

import { IExtensionStoragePaths } from 'vs/workbench/api/common/extHostStoragePaths';

import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService';

import { withNullAsUndefined } from 'vs/base/common/types';

import { ILogService } from 'vs/platform/log/common/log';

export class ExtensionStoragePaths implements IExtensionStoragePaths {

@@ -26,6 +27,7 @@ export class ExtensionStoragePaths implements IExtensionStoragePaths {

constructor(

@IExtHostInitDataService initData: IExtHostInitDataService,

@ILogService private readonly _logService: ILogService,

) {

this._workspace = withNullAsUndefined(initData.workspace);

this._environment = initData.environment;

@@ -54,21 +56,25 @@ export class ExtensionStoragePaths implements IExtensionStoragePaths {

const storageName = this._workspace.id;

const storagePath = path.join(this._environment.appSettingsHome.fsPath, 'workspaceStorage', storageName);

if (exists) {

return storagePath;

}

try {

);

return storagePath;

index 4781f22676..25143a97c0 100644

@@ -9,6 +9,9 @@ import { AbstractExtHostExtensionService } from 'vs/workbench/api/common/extHost

import { endsWith } from 'vs/base/common/strings';

import { URI } from 'vs/base/common/uri';

import { RequireInterceptor } from 'vs/workbench/api/common/extHostRequireInterceptor';

class WorkerRequireInterceptor extends RequireInterceptor {

@@ -41,7 +44,14 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {

await this._fakeModules.install();

}

module = module.with({ path: ensureSuffix(module.path, '.js') });

const response = await fetch(module.toString(true));

@@ -57,7 +67,7 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {

const _exports = {};

const _module = { exports: _exports };

const _require = (request: string) => {

if (result === undefined) {

throw new Error(`Cannot load module '${request}'`);

}

index 94e7052574..7e5563b417 100644

@@ -49,6 +49,7 @@ import { IndexedDBLogProvider } from 'vs/workbench/services/log/browser/indexedD

import { InMemoryLogProvider } from 'vs/workbench/services/log/common/inMemoryLogProvider';

import { isWorkspaceToOpen, isFolderToOpen } from 'vs/platform/windows/common/windows';

import { getWorkspaceIdentifier } from 'vs/workbench/services/workspaces/browser/workspaces';

class BrowserMain extends Disposable {

@@ -85,6 +86,7 @@ class BrowserMain extends Disposable {

// Startup

workbench.startup();

}

private registerListeners(workbench: Workbench, storageService: BrowserStorageService): void {

index c509716fc4..e416413084 100644

@@ -15,6 +15,7 @@ import { ParsedExpression, IExpression, parse } from 'vs/base/common/glob';

import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';

import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';

import { withNullAsUndefined } from 'vs/base/common/types';

export class ResourceContextKey extends Disposable implements IContextKey<URI> {

@@ -63,7 +64,8 @@ export class ResourceContextKey extends Disposable implements IContextKey<URI> {

set(value: URI | null) {

if (!ResourceContextKey._uriEquals(this._resourceKey.get(), value)) {

this._resourceKey.set(value);

this._filenameKey.set(value ? basename(value) : null);

this._langIdKey.set(value ? this._modeService.getModeIdByFilepathOrFirstLine(value) : null);

this._extensionKey.set(value ? extname(value) : null);

index 63c9af47e2..021358fef9 100644

if (data.endpoint) {

try {

const endpointUrl = new URL(data.endpoint);

} catch (e) {

console.error('Could not rewrite csp');

}

index f67f9aa064..add754cd5a 100644

@@ -122,11 +122,12 @@ export class DialogService implements IDialogService {

async about(): Promise<void> {

const detail = nls.localize('aboutDetail',

this.productService.version || 'Unknown',

this.productService.commit || 'Unknown',

this.productService.date || 'Unknown',

);

const { choice } = await this.show(Severity.Info, this.productService.nameLong, [nls.localize('copy', "Copy"), nls.localize('ok', "OK")], { detail, cancelId: 1 });

index 1bf4cfad2a..924a2fcd87 100644

@@ -195,8 +195,8 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment

@memoize

get webviewExternalEndpoint(): string {

}

@memoize

@@ -249,6 +249,8 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment

installSourcePath!: string;

builtinExtensionsPath!: string;

globalStorageHome!: string;

workspaceStorageHome!: string;

index fe891a042e..21d0d4bf61 100644

@@ -119,6 +119,7 @@ export class ExtensionService extends AbstractExtensionService implements IExten

} else {

// remote: only enabled and none-web'ish extension

remoteEnv.extensions = remoteEnv.extensions.filter(extension => this._isEnabled(extension) && !canExecuteOnWeb(extension, this._productService, this._configService));

this._checkEnableProposedApi(remoteEnv.extensions);

index 9e8352ac88..2d1cb0a107 100644

@@ -32,7 +32,8 @@ export function canExecuteOnWorkspace(manifest: IExtensionManifest, productServi

export function canExecuteOnWeb(manifest: IExtensionManifest, productService: IProductService, configurationService: IConfigurationService): boolean {

const extensionKind = getExtensionKind(manifest, productService, configurationService);

}

export function getExtensionKind(manifest: IExtensionManifest, productService: IProductService, configurationService: IConfigurationService): ExtensionKind[] {

index 0f35c54431..32fff09b18 100644

@@ -53,12 +53,13 @@ const args = minimist(process.argv.slice(2), {

const Module = require.__$__nodeRequire('module') as any;

const originalLoad = Module._load;

if (request === 'natives') {

throw new Error('Either the extension or a NPM dependency is using the "natives" node module which is unsupported as it can cause a crash of the extension host. Click [here](https://go.microsoft.com/fwlink/?linkid=871887) to find out more');

}

};

})();

@@ -131,8 +132,11 @@ function _createExtHostProtocol(): Promise<IMessagePassingProtocol> {

// Wait for rich client to reconnect

protocol.onSocketClose(() => {

});

}

}

index bbb72e9511..63f1f6ff46 100644

@@ -18,11 +18,12 @@ import { IExtensionStoragePaths } from 'vs/workbench/api/common/extHostStoragePa

import { IExtHostExtensionService } from 'vs/workbench/api/common/extHostExtensionService';

import { IExtHostStorage, ExtHostStorage } from 'vs/workbench/api/common/extHostStorage';

import { ExtHostExtensionService } from 'vs/workbench/api/worker/extHostExtensionService';

import { ILogService } from 'vs/platform/log/common/log';

import { ExtHostLogService } from 'vs/workbench/api/worker/extHostLogService';

import { IExtHostTunnelService, ExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelService';

import { IExtHostApiDeprecationService, ExtHostApiDeprecationService, } from 'vs/workbench/api/common/extHostApiDeprecationService';

// register singleton services

registerSingleton(ILogService, ExtHostLogService);

@@ -37,23 +38,9 @@ registerSingleton(IExtHostStorage, ExtHostStorage);

registerSingleton(IExtHostExtensionService, ExtHostExtensionService);

registerSingleton(IExtHostSearch, ExtHostSearch);

registerSingleton(IExtHostTunnelService, ExtHostTunnelService);

registerSingleton(IExtHostTerminalService, WorkerExtHostTerminalService);

registerSingleton(IExtHostTask, WorkerExtHostTask);

registerSingleton(IExtHostDebugService, WorkerExtHostDebugService);

index 99394090da..4891e0fece 100644

import { createChannelSender } from 'vs/base/parts/ipc/node/ipc';

import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';

import { registerSingleton } from 'vs/platform/instantiation/common/extensions';

export class LocalizationsService {

_serviceBrand: undefined;

constructor(

) {

}

}

index b8f6558b2c..7aeafe6e0e 100644

import { IChannel } from 'vs/base/parts/ipc/common/ipc';

import { Event, Emitter } from 'vs/base/common/event';

import { IUpdateService, State } from 'vs/platform/update/common/update';

import { registerSingleton } from 'vs/platform/instantiation/common/extensions';

export class NativeUpdateService implements IUpdateService {

@@ -21,8 +21,9 @@ export class NativeUpdateService implements IUpdateService {

private channel: IChannel;

// always set this._state as the state changes

this.onStateChange(state => this._state = state);

index 0719b361e0..3a4c5cefe8 100644

@@ -34,11 +34,14 @@ import 'vs/workbench/services/textfile/browser/browserTextFileService';

import 'vs/workbench/services/keybinding/browser/keymapService';

import 'vs/workbench/services/extensions/browser/extensionService';

import 'vs/workbench/services/extensionManagement/common/extensionManagementServerService';

import 'vs/workbench/services/configurationResolver/browser/configurationResolverService';

import 'vs/workbench/services/credentials/browser/credentialsService';

import 'vs/workbench/services/url/browser/urlService';

import 'vs/workbench/contrib/tags/browser/workspaceTagsService';

import 'vs/workbench/services/workspaces/browser/workspacesService';

import 'vs/workbench/services/workspaces/browser/workspaceEditingService';