diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js

index 6bb695db68..7f6c5cd3cb 100644

--- a/build/gulpfile.vscode.js

+++ b/build/gulpfile.vscode.js

@@ -47,24 +47,28 @@ const nodeModules = ['electron', 'original-fs']

// Build

const vscodeEntryPoints = _.flatten([

- buildfile.entrypoint('vs/workbench/workbench.desktop.main'),

+ buildfile.entrypoint('vs/workbench/workbench.web.api'),

+ buildfile.entrypoint('vs/server/src/node/cli'),

buildfile.base,

buildfile.serviceWorker,

- buildfile.workbenchDesktop,

- buildfile.code

+ buildfile.workbenchWeb,

+ buildfile.workerExtensionHost,

+ buildfile.keyboardMaps,

]);

const vscodeResources = [

- 'out-build/main.js',

- 'out-build/cli.js',

- 'out-build/driver.js',

+ 'out-build/vs/server/main.js',

+ 'out-build/vs/server/src/node/uriTransformer.js',

+ 'out-build/vs/code/browser/workbench/**',

+ 'out-build/vs/server/src/media/*',

+ 'out-build/vs/workbench/services/extensions/worker/extensionHostWorkerMain.js',

+ '!out-build/vs/server/doc/**',

'out-build/bootstrap.js',

'out-build/bootstrap-fork.js',

'out-build/bootstrap-amd.js',

'out-build/bootstrap-window.js',

'out-build/paths.js',

'out-build/vs/**/*.{svg,png,html}',

- '!out-build/vs/code/browser/**/*.html',

'out-build/vs/base/common/performance.js',

'out-build/vs/base/node/languagePacks.js',

'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}',

@@ -79,11 +83,7 @@ const vscodeResources = [

'out-build/vs/workbench/contrib/welcome/walkThrough/**/*.md',

'out-build/vs/platform/files/**/*.exe',

'out-build/vs/platform/files/**/*.md',

- 'out-build/vs/code/electron-browser/workbench/**',

- 'out-build/vs/code/electron-browser/sharedProcess/sharedProcess.js',

- 'out-build/vs/code/electron-browser/issue/issueReporter.js',

- 'out-build/vs/code/electron-browser/processExplorer/processExplorer.js',

- '!**/test/**'

+ '!**/test/**',

];

const optimizeVSCodeTask = task.define('optimize-vscode', task.series(

@@ -627,4 +627,3 @@ function getSettingsSearchBuildId(packageJson) {

throw new Error('Could not determine build number: ' + e.toString());

}

}

-

diff --git a/src/vs/base/browser/mouseEvent.ts b/src/vs/base/browser/mouseEvent.ts

index 4c7295e3b9..b0af2cdd62 100644

--- a/src/vs/base/browser/mouseEvent.ts

+++ b/src/vs/base/browser/mouseEvent.ts

@@ -160,6 +160,8 @@ export class StandardWheelEvent {

this.deltaY = e1.wheelDeltaY / 120;

} else if (typeof e2.VERTICAL_AXIS !== 'undefined' && e2.axis === e2.VERTICAL_AXIS) {

this.deltaY = -e2.detail / 3;

+ } else if (browser.isFirefox) {

+ this.deltaY = -e.deltaY / 3;

} else {

this.deltaY = -e.deltaY / 40;

}

@@ -173,6 +175,8 @@ export class StandardWheelEvent {

}

} else if (typeof e2.HORIZONTAL_AXIS !== 'undefined' && e2.axis === e2.HORIZONTAL_AXIS) {

this.deltaX = -e.detail / 3;

+ } else if (browser.isFirefox) {

+ this.deltaX = -e.deltaX / 3;

} else {

this.deltaX = -e.deltaX / 40;

}

diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts

index 4f93e06df0..ae63e64a7f 100644

--- a/src/vs/base/common/network.ts

+++ b/src/vs/base/common/network.ts

@@ -48,7 +48,7 @@ export namespace Schemas {

export const command: string = 'command';

- export const vscodeRemote: string = 'vscode-remote';

+ export const vscodeRemote: string = 'code-server';

export const vscodeRemoteResource: string = 'vscode-remote-resource';

@@ -82,13 +82,11 @@ class RemoteAuthoritiesImpl {

}

public rewrite(authority: string, path: string): URI {

- const host = this._hosts[authority];

- const port = this._ports[authority];

const connectionToken = this._connectionTokens[authority];

return URI.from({

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

- authority: `${host}:${port}`,

- path: `/vscode-remote-resource`,

+ authority: window.location.host,

+ path: `${window.location.pathname.replace(/\/+$/, '')}/vscode-remote-resource`,

query: `path=${encodeURIComponent(path)}&tkn=${encodeURIComponent(connectionToken)}`

});

}

diff --git a/src/vs/base/common/platform.ts b/src/vs/base/common/platform.ts

index 07759dffe5..9148d7c1f0 100644

--- a/src/vs/base/common/platform.ts

+++ b/src/vs/base/common/platform.ts

@@ -54,8 +54,18 @@ if (typeof navigator === 'object' && !isElectronRenderer) {

_isMacintosh = _userAgent.indexOf('Macintosh') >= 0;

_isLinux = _userAgent.indexOf('Linux') >= 0;

_isWeb = true;

- _locale = navigator.language;

- _language = _locale;

+ _locale = LANGUAGE_DEFAULT;

+ _language = LANGUAGE_DEFAULT;

+ const rawNlsConfig = typeof document !== 'undefined'

+ && document.getElementById('vscode-remote-nls-configuration')!.getAttribute('data-settings')!;

+ if (rawNlsConfig) {

+ try {

+ const nlsConfig: NLSConfig = JSON.parse(rawNlsConfig);

+ _locale = nlsConfig.locale;

+ _translationsConfigFile = nlsConfig._translationsConfigFile;

+ _language = nlsConfig.availableLanguages['*'] || LANGUAGE_DEFAULT;

+ } catch (error) { /* Oh well. */ }

+ }

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

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

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

diff --git a/src/vs/base/node/languagePacks.js b/src/vs/base/node/languagePacks.js

index 3ae24454cb..d637d02855 100644

--- a/src/vs/base/node/languagePacks.js

+++ b/src/vs/base/node/languagePacks.js

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

function getLanguagePackConfigurations(userDataPath) {

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

try {

- return nodeRequire(configFile);

+ return JSON.parse(fs.readFileSync(configFile, "utf8"));

} catch (err) {

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

// language pack config.

diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html

index 44f67f0a0b..50d29b1e87 100644

--- a/src/vs/code/browser/workbench/workbench.html

+++ b/src/vs/code/browser/workbench/workbench.html

@@ -18,10 +18,12 @@

<!-- Workarounds/Hacks (remote user data uri) -->

<meta id="vscode-remote-user-data-uri" data-settings="{{REMOTE_USER_DATA_URI}}">

+ <meta id="vscode-remote-nls-configuration" data-settings="{{NLS_CONFIGURATION}}">

<!-- Workbench Icon/Manifest/CSS -->

- <link rel="icon" href="/favicon.ico" type="image/x-icon" />

- <link rel="manifest" href="/manifest.json">

+ <link rel="icon" href="./favicon.ico" type="image/x-icon" />

+ <link rel="manifest" href="./manifest.json">

+ <link rel="apple-touch-icon" href="./static/out/vs/server/src/media/code-server.png" />

<link data-name="vs/workbench/workbench.web.api" rel="stylesheet" href="./static/out/vs/workbench/workbench.web.api.css">

</head>

diff --git a/src/vs/code/browser/workbench/workbench.js b/src/vs/code/browser/workbench/workbench.js

index 2f09f53e43..0f5eef1c9e 100644

--- a/src/vs/code/browser/workbench/workbench.js

+++ b/src/vs/code/browser/workbench/workbench.js

@@ -8,24 +8,53 @@

(function () {

+ const basePath = window.location.pathname.replace(/\/+$/, '');

+ const base = window.location.origin + basePath;

+ const options = JSON.parse(document.getElementById('vscode-workbench-web-configuration').getAttribute('data-settings'));

+ options.webviewEndpoint = `${base}/webview/`;

+ let nlsConfig;

+ try {

+ nlsConfig = JSON.parse(document.getElementById('vscode-remote-nls-configuration').getAttribute('data-settings'));

+ if (nlsConfig._resolvedLanguagePackCoreLocation) {

+ const bundles = Object.create(null);

+ nlsConfig.loadBundle = (bundle, language, cb) => {

+ let result = bundles[bundle];

+ if (result) {

+ return cb(undefined, result);

+ }

+ // FIXME: Only works if path separators are /.

+ const path = nlsConfig._resolvedLanguagePackCoreLocation

+ + '/' + bundle.replace(/\//g, '!') + '.nls.json';

+ fetch(`${base}/resource/?path=${encodeURIComponent(path)}`)

+ .then((response) => response.json())

+ .then((json) => {

+ bundles[bundle] = json;

+ cb(undefined, json);

+ })

+ .catch(cb);

+ };

+ }

+ } catch (error) { /* Probably fine. */ }

+

/** @type any */

const amdLoader = require;

+ const staticBase = base + `/static${options.productConfiguration && options.productConfiguration.commit ? `-${options.productConfiguration.commit}` : ''}`;

amdLoader.config({

- baseUrl: `${window.location.origin}/static/out`,

+ baseUrl: `${staticBase}/out`,

paths: {

- 'vscode-textmate': `${window.location.origin}/static/node_modules/vscode-textmate/release/main`,

- 'onigasm-umd': `${window.location.origin}/static/node_modules/onigasm-umd/release/main`,

- 'xterm': `${window.location.origin}/static/node_modules/xterm/lib/xterm.js`,

- 'xterm-addon-search': `${window.location.origin}/static/node_modules/xterm-addon-search/lib/xterm-addon-search.js`,

- 'xterm-addon-web-links': `${window.location.origin}/static/node_modules/xterm-addon-web-links/lib/xterm-addon-web-links.js`,

- 'semver-umd': `${window.location.origin}/static/node_modules/semver-umd/lib/semver-umd.js`,

- '@microsoft/applicationinsights-web': `${window.location.origin}/static/node_modules/@microsoft/applicationinsights-web/dist/applicationinsights-web.js`,

- }

+ 'vscode-textmate': `${staticBase}/node_modules/vscode-textmate/release/main`,

+ 'onigasm-umd': `${staticBase}/node_modules/onigasm-umd/release/main`,

+ 'xterm': `${staticBase}/node_modules/xterm/lib/xterm.js`,

+ 'xterm-addon-search': `${staticBase}/node_modules/xterm-addon-search/lib/xterm-addon-search.js`,

+ 'xterm-addon-web-links': `${staticBase}/node_modules/xterm-addon-web-links/lib/xterm-addon-web-links.js`,

+ 'semver-umd': `${staticBase}/node_modules/semver-umd/lib/semver-umd.js`,

+ '@microsoft/applicationinsights-web': `${staticBase}/node_modules/@microsoft/applicationinsights-web/dist/applicationinsights-web.js`,

+ },

+ 'vs/nls': nlsConfig

});

amdLoader(['vs/workbench/workbench.web.api'], function (api) {

- const options = JSON.parse(document.getElementById('vscode-workbench-web-configuration').getAttribute('data-settings'));

api.create(document.body, options);

});

})();

diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts

index 3b45568e1b..aebe04ccfe 100644

--- a/src/vs/platform/environment/common/environment.ts

+++ b/src/vs/platform/environment/common/environment.ts

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

// Web flags

'web-user-data-dir'?: string;

+ 'extra-extensions-dir'?: string | string[];

+ 'extra-builtin-extensions-dir'?: string | string[];

}

export const IEnvironmentService = createDecorator<IEnvironmentService>('environmentService');

@@ -162,4 +164,6 @@ export interface IEnvironmentService {

driverVerbose: boolean;

galleryMachineIdResource?: URI;

+ extraExtensionPaths: string[];

+ extraBuiltinExtensionPaths: string[];

}

diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts

index a07c4c8f48..028ed19657 100644

--- a/src/vs/platform/environment/node/environmentService.ts

+++ b/src/vs/platform/environment/node/environmentService.ts

@@ -264,6 +264,15 @@ export class EnvironmentService implements IEnvironmentService {

get driverHandle(): string | undefined { return this._args['driver']; }

get driverVerbose(): boolean { return !!this._args['driver-verbose']; }

+ @memoize get extraExtensionPaths(): string[] {

+ return this.arrayify(this._args['extra-extensions-dir']).map((p) => <string>parsePathArg(p, process));

+ }

+ @memoize get extraBuiltinExtensionPaths(): string[] {

+ return this.arrayify(this._args['extra-builtin-extensions-dir']).map((p) => <string>parsePathArg(p, process));

+ }

+ private arrayify<T>(arg: T | T[] = []): T[] {

+ return (Array.isArray(arg) ? arg : [arg]).filter((p) => !!p);

+ }

constructor(private _args: ParsedArgs, private _execPath: string) {

if (!process.env['VSCODE_LOGS']) {

diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts

index 7d0b568fc7..23ab257b42 100644

--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts

+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts

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

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

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

- const systemExtensionsPromise = this.scanExtensions(this.systemExtensionsPath, ExtensionType.System)

- .then(result => {

- this.logService.trace('Scanned system extensions:', result.length);

- return result;

- });

+ const systemExtensionsPromise = Promise.all([

+ this.scanExtensions(this.systemExtensionsPath, ExtensionType.System),

+ ...this.environmentService.extraBuiltinExtensionPaths

+ .map((path) => this.scanExtensions(path, ExtensionType.System))

+ ]).then((results) => {

+ const result = results.reduce((flat, current) => flat.concat(current), []);

+ this.logService.info('Scanned system extensions:', result.length);

+ return result;

+ });

if (this.environmentService.isBuilt) {

return systemExtensionsPromise;

}

@@ -757,9 +761,16 @@ export class ExtensionManagementService extends Disposable implements IExtension

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

}

+ private scanAllUserExtensions(folderName: string, type: ExtensionType): Promise<ILocalExtension[]> {

+ return Promise.all([

+ this.scanExtensions(folderName, type),

+ ...this.environmentService.extraExtensionPaths.map((p) => this.scanExtensions(p, ExtensionType.User))

+ ]).then((results) => results.reduce((flat, current) => flat.concat(current), []));

+ }

+

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

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

- return Promise.all([this.getUninstalledExtensions(), this.scanExtensions(this.extensionsPath, ExtensionType.User)])

+ return Promise.all([this.getUninstalledExtensions(), this.scanAllUserExtensions(this.extensionsPath, ExtensionType.User)])

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

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

if (excludeOutdated) {

@@ -774,6 +785,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)

+ .catch((error) => {

+ if (error.code !== 'ENOENT') {

+ throw error;

+ }

+ return [];

+ })

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

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

}

@@ -812,7 +829,7 @@ export class ExtensionManagementService extends Disposable implements IExtension

private async removeUninstalledExtensions(): Promise<void> {

const uninstalled = await this.getUninstalledExtensions();

- const extensions = await this.scanExtensions(this.extensionsPath, ExtensionType.User); // All user extensions

+ const extensions = await this.scanAllUserExtensions(this.extensionsPath, ExtensionType.User); // All user extensions

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

for (const e of extensions) {

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

@@ -831,7 +848,7 @@ export class ExtensionManagementService extends Disposable implements IExtension

}

private removeOutdatedExtensions(): Promise<void> {

- return this.scanExtensions(this.extensionsPath, ExtensionType.User) // All user extensions

+ return this.scanAllUserExtensions(this.extensionsPath, ExtensionType.User) // All user extensions

.then(extensions => {

const toRemove: ILocalExtension[] = [];

diff --git a/src/vs/platform/localizations/electron-browser/localizationsService.ts b/src/vs/platform/localizations/electron-browser/localizationsService.ts

index add4dfb2fc..18fc71df51 100644

--- a/src/vs/platform/localizations/electron-browser/localizationsService.ts

+++ b/src/vs/platform/localizations/electron-browser/localizationsService.ts

@@ -6,7 +6,7 @@

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

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

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

-import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';

+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';

import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';

export class LocalizationsService implements ILocalizationsService {

@@ -15,8 +15,8 @@ export class LocalizationsService implements ILocalizationsService {

private channel: IChannel;

- constructor(@ISharedProcessService sharedProcessService: ISharedProcessService) {

- this.channel = sharedProcessService.getChannel('localizations');

+ constructor(@IRemoteAgentService remoteAgentService: IRemoteAgentService) {

+ this.channel = remoteAgentService.getConnection()!.getChannel('localizations');

}

get onDidLanguagesChange(): Event<void> { return this.channel.listen('onDidLanguagesChange'); }

diff --git a/src/vs/platform/log/common/logIpc.ts b/src/vs/platform/log/common/logIpc.ts

index 9f68b645b6..1e224cc29a 100644

--- a/src/vs/platform/log/common/logIpc.ts

+++ b/src/vs/platform/log/common/logIpc.ts

@@ -26,6 +26,7 @@ export class LogLevelSetterChannel implements IServerChannel {

call(_: unknown, command: string, arg?: any): Promise<any> {

switch (command) {

case 'setLevel': this.service.setLevel(arg); return Promise.resolve();

+ case 'getLevel': return Promise.resolve(this.service.getLevel());

}

throw new Error(`Call not found: ${command}`);

@@ -43,6 +44,10 @@ export class LogLevelSetterChannelClient {

setLevel(level: LogLevel): void {

this.channel.call('setLevel', level);

}

+

+ getLevel(): Promise<LogLevel> {

+ return this.channel.call('getLevel');

+ }

}

export class FollowerLogService extends DelegatedLogService implements ILogService {

diff --git a/src/vs/platform/product/node/package.ts b/src/vs/platform/product/node/package.ts

index d39c5877d6..c189d6f19f 100644

--- a/src/vs/platform/product/node/package.ts

+++ b/src/vs/platform/product/node/package.ts

@@ -9,6 +9,7 @@ import { getPathFromAmdModule } from 'vs/base/common/amd';

export interface IPackageConfiguration {

name: string;

version: string;

+ codeServerVersion: string;

}

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

diff --git a/src/vs/platform/remote/browser/browserSocketFactory.ts b/src/vs/platform/remote/browser/browserSocketFactory.ts

index 6b24ec0781..43dd9c12c8 100644

--- a/src/vs/platform/remote/browser/browserSocketFactory.ts

+++ b/src/vs/platform/remote/browser/browserSocketFactory.ts

@@ -133,7 +133,7 @@ export class BrowserSocketFactory implements ISocketFactory {

}

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

- const socket = this._webSocketFactory.create(`ws://${host}:${port}/?${query}&skipWebSocketFrames=false`);

+ const socket = this._webSocketFactory.create(`${window.location.protocol === 'https:' ? 'wss' : 'ws'}://${window.location.host}${window.location.pathname}?${query}&skipWebSocketFrames=false`);

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

socket.onOpen(() => {

errorListener.dispose();

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

});

}

}

-

-

-

diff --git a/src/vs/platform/update/electron-browser/updateService.ts b/src/vs/platform/update/electron-browser/updateService.ts

index bd8fa6cc18..cf6108a57b 100644

--- a/src/vs/platform/update/electron-browser/updateService.ts

+++ b/src/vs/platform/update/electron-browser/updateService.ts

@@ -6,7 +6,7 @@

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 { IMainProcessService } from 'vs/platform/ipc/electron-browser/mainProcessService';

+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';

import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';

export class UpdateService implements IUpdateService {

@@ -21,8 +21,8 @@ export class UpdateService implements IUpdateService {

private channel: IChannel;

- constructor(@IMainProcessService mainProcessService: IMainProcessService) {

- this.channel = mainProcessService.getChannel('update');

+ constructor(@IRemoteAgentService mainProcessService: IRemoteAgentService) {

+ this.channel = mainProcessService.getConnection()!.getChannel('update');

// always set this._state as the state changes

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

diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts

index d789bf4e09..e25c9c9d6a 100644

--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts

+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts

@@ -6,7 +6,6 @@

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 { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';

import product from 'vs/platform/product/node/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(

- @ILifecycleService private readonly lifecycleService: ILifecycleService,

+ _placeholder: any, // To prevent errors from the extending classes.

@IConfigurationService protected configurationService: IConfigurationService,

@IEnvironmentService private readonly environmentService: IEnvironmentService,

@IRequestService protected requestService: IRequestService,

@@ -55,7 +54,7 @@ export abstract class AbstractUpdateService implements IUpdateService {

return;

}

- if (!product.updateUrl || !product.commit) {

+ if (!product.commit) {

this.logService.info('update#ctor - updates are disabled as there is no update URL');

return;

}

@@ -93,7 +92,7 @@ export abstract class AbstractUpdateService implements IUpdateService {

}

private getProductQuality(updateMode: string): string | undefined {

- return updateMode === 'none' ? undefined : product.quality;

+ return updateMode === 'none' ? undefined : 'unused';

}

private scheduleCheckForUpdates(delay = 60 * 60 * 1000): Promise<void> {

@@ -152,15 +151,15 @@ export abstract class AbstractUpdateService implements IUpdateService {

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

- this.lifecycleService.quit(true /* from update */).then(vetod => {

- this.logService.trace(`update#quitAndInstall(): after lifecycle quit() with veto: ${vetod}`);

- if (vetod) {

- return;

- }

+ // this.lifecycleService.quit(true /* from update */).then(vetod => {

+ // this.logService.trace(`update#quitAndInstall(): after lifecycle quit() with veto: ${vetod}`);

+ // if (vetod) {

+ // return;

+ // }

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

this.doQuitAndInstall();

- });

+ // });

return Promise.resolve(undefined);

}

diff --git a/src/vs/workbench/api/browser/extensionHost.contribution.ts b/src/vs/workbench/api/browser/extensionHost.contribution.ts

index 2905c52411..303ddf211f 100644

--- a/src/vs/workbench/api/browser/extensionHost.contribution.ts

+++ b/src/vs/workbench/api/browser/extensionHost.contribution.ts

@@ -57,6 +57,7 @@ import './mainThreadComments';

import './mainThreadTask';

import './mainThreadLabelService';

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

+import 'vs/server/src/browser/mainThreadNodeProxy';

export class ExtensionPoints implements IWorkbenchContribution {

diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts

index c5fd74ffe7..e972b03f79 100644

--- a/src/vs/workbench/api/common/extHost.api.impl.ts

+++ b/src/vs/workbench/api/common/extHost.api.impl.ts

@@ -68,6 +68,7 @@ import { ILogService } from 'vs/platform/log/common/log';

import { IURITransformerService } from 'vs/workbench/api/common/extHostUriTransformerService';

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

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

+import { IExtHostNodeProxy } from 'vs/server/src/browser/extHostNodeProxy';

export interface IExtensionApiFactory {

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

@@ -87,6 +88,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I

const rpcProtocol = accessor.get(IExtHostRpcService);

const extHostStorage = accessor.get(IExtHostStorage);

const extHostLogService = accessor.get(ILogService);

+ const extHostNodeProxy = accessor.get(IExtHostNodeProxy);

// register addressable instances

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

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

rpcProtocol.set(ExtHostContext.ExtHostConfiguration, extHostConfiguration);

rpcProtocol.set(ExtHostContext.ExtHostExtensionService, extensionService);

rpcProtocol.set(ExtHostContext.ExtHostStorage, extHostStorage);

+ rpcProtocol.set(ExtHostContext.ExtHostNodeProxy, extHostNodeProxy);

// automatically create and register addressable instances

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

diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts

index a6ac9b8086..c0027b8f74 100644

--- a/src/vs/workbench/api/common/extHost.protocol.ts

+++ b/src/vs/workbench/api/common/extHost.protocol.ts

@@ -614,6 +614,10 @@ export interface MainThreadLabelServiceShape extends IDisposable {

$unregisterResourceLabelFormatter(handle: number): void;

}

+export interface MainThreadNodeProxyShape extends IDisposable {

+ $send(message: string): void;

+}

+

export interface MainThreadSearchShape extends IDisposable {

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

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

@@ -844,6 +848,13 @@ export interface ExtHostLabelServiceShape {

$registerResourceLabelFormatter(formatter: ResourceLabelFormatter): IDisposable;

}

+export interface ExtHostNodeProxyShape {

+ $onMessage(message: string): void;

+ $onClose(): void;

+ $onDown(): void;

+ $onUp(): void;

+}

+

export interface ExtHostSearchShape {

$provideFileSearchResults(handle: number, session: number, query: search.IRawQuery, token: CancellationToken): Promise<search.ISearchCompleteStats>;

$provideTextSearchResults(handle: number, session: number, query: search.IRawTextQuery, token: CancellationToken): Promise<search.ISearchCompleteStats>;

@@ -1351,7 +1362,8 @@ export const MainContext = {

MainThreadSearch: createMainId<MainThreadSearchShape>('MainThreadSearch'),

MainThreadTask: createMainId<MainThreadTaskShape>('MainThreadTask'),

MainThreadWindow: createMainId<MainThreadWindowShape>('MainThreadWindow'),

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

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

+ MainThreadNodeProxy: createMainId<MainThreadNodeProxyShape>('MainThreadNodeProxy')

};

export const ExtHostContext = {

@@ -1385,5 +1397,6 @@ export const ExtHostContext = {

ExtHostStorage: createMainId<ExtHostStorageShape>('ExtHostStorage'),

ExtHostUrls: createExtId<ExtHostUrlsShape>('ExtHostUrls'),

ExtHostOutputService: createMainId<ExtHostOutputServiceShape>('ExtHostOutputService'),

- ExtHosLabelService: createMainId<ExtHostLabelServiceShape>('ExtHostLabelService')

+ ExtHosLabelService: createMainId<ExtHostLabelServiceShape>('ExtHostLabelService'),

+ ExtHostNodeProxy: createMainId<ExtHostNodeProxyShape>('ExtHostNodeProxy')

};

diff --git a/src/vs/workbench/api/common/extHostExtensionService.ts b/src/vs/workbench/api/common/extHostExtensionService.ts

index 8c903a6027..7199c1e467 100644

--- a/src/vs/workbench/api/common/extHostExtensionService.ts

+++ b/src/vs/workbench/api/common/extHostExtensionService.ts

@@ -5,7 +5,7 @@

import * as nls from 'vs/nls';

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

-import { originalFSPath, joinPath } from 'vs/base/common/resources';

+import { originalFSPath } from 'vs/base/common/resources';

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

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

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

@@ -32,6 +32,7 @@ import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitData

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

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

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

+import { IExtHostNodeProxy } from 'vs/server/src/browser/extHostNodeProxy';

interface ITestRunner {

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

@@ -75,6 +76,7 @@ export abstract class AbstractExtHostExtensionService implements ExtHostExtensio

protected readonly _extHostWorkspace: ExtHostWorkspace;

protected readonly _extHostConfiguration: ExtHostConfiguration;

protected readonly _logService: ILogService;

+ protected readonly _nodeProxy: IExtHostNodeProxy;

protected readonly _mainThreadWorkspaceProxy: MainThreadWorkspaceShape;

protected readonly _mainThreadTelemetryProxy: MainThreadTelemetryShape;

@@ -103,7 +105,8 @@ export abstract class AbstractExtHostExtensionService implements ExtHostExtensio

@IExtHostConfiguration extHostConfiguration: IExtHostConfiguration,

@ILogService logService: ILogService,

@IExtHostInitDataService initData: IExtHostInitDataService,

- @IExtensionStoragePaths storagePath: IExtensionStoragePaths

+ @IExtensionStoragePaths storagePath: IExtensionStoragePaths,

+ @IExtHostNodeProxy nodeProxy: IExtHostNodeProxy,

) {

this._hostUtils = hostUtils;

this._extHostContext = extHostContext;

@@ -112,6 +115,7 @@ export abstract class AbstractExtHostExtensionService implements ExtHostExtensio

this._extHostWorkspace = extHostWorkspace;

this._extHostConfiguration = extHostConfiguration;

this._logService = logService;

+ this._nodeProxy = nodeProxy;

this._disposables = new DisposableStore();

this._mainThreadWorkspaceProxy = this._extHostContext.getProxy(MainContext.MainThreadWorkspace);

@@ -331,15 +335,15 @@ export abstract class AbstractExtHostExtensionService implements ExtHostExtensio

this._logService.info(`ExtensionService#_doActivateExtension ${extensionDescription.identifier.value} ${JSON.stringify(reason)}`);

const activationTimesBuilder = new ExtensionActivationTimesBuilder(reason.startup);

- return Promise.all<any>([

- this._loadCommonJSModule(joinPath(extensionDescription.extensionLocation, extensionDescription.main), activationTimesBuilder),

+ return Promise.all([

+ this._loadCommonJSModule<IExtensionModule>(extensionDescription, activationTimesBuilder),

this._loadExtensionContext(extensionDescription)

]).then(values => {

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

});

}

- protected abstract _loadCommonJSModule<T>(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T>;

+ protected abstract _loadCommonJSModule<T>(module: URI | IExtensionDescription, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T>;

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

diff --git a/src/vs/workbench/api/node/extHost.services.ts b/src/vs/workbench/api/node/extHost.services.ts

index a227d8a67b..92553a976c 100644

--- a/src/vs/workbench/api/node/extHost.services.ts

+++ b/src/vs/workbench/api/node/extHost.services.ts

@@ -26,6 +26,8 @@ import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionS

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

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

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

+import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';

+import { IExtHostNodeProxy } from 'vs/server/src/browser/extHostNodeProxy';

// register singleton services

registerSingleton(ILogService, ExtHostLogService);

@@ -42,3 +44,19 @@ registerSingleton(IExtHostSearch, ExtHostSearch);

registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths);

registerSingleton(IExtHostExtensionService, ExtHostExtensionService);

registerSingleton(IExtHostStorage, ExtHostStorage);

+

+function NotImplementedProxy<T>(name: ServiceIdentifier<T>): { new(): T } {

+ return <any>class {

+ constructor() {

+ return new Proxy({}, {

+ get(target: any, prop: string | number) {

+ if (target[prop]) {

+ return target[prop];

+ }

+ throw new Error(`Not Implemented: ${name}->${String(prop)}`);

+ }

+ });

+ }

+ };

+}

+registerSingleton(IExtHostNodeProxy, class extends NotImplementedProxy(IExtHostNodeProxy) {});

diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts

index 8e96e6738e..5a3a48101a 100644

--- a/src/vs/workbench/api/node/extHostExtensionService.ts

+++ b/src/vs/workbench/api/node/extHostExtensionService.ts

@@ -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';

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

+import { joinPath } from 'vs/base/common/resources';

class NodeModuleRequireInterceptor extends RequireInterceptor {

@@ -75,7 +77,10 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {

};

}

- protected _loadCommonJSModule<T>(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {

+ protected _loadCommonJSModule<T>(module: URI | IExtensionDescription, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {

+ if (!URI.isUri(module)) {

+ module = joinPath(module.extensionLocation, module.main!);

+ }

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

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

}

diff --git a/src/vs/workbench/api/worker/extHostExtensionService.ts b/src/vs/workbench/api/worker/extHostExtensionService.ts

index 4fcb6db76f..b6c92528f4 100644

--- a/src/vs/workbench/api/worker/extHostExtensionService.ts

+++ b/src/vs/workbench/api/worker/extHostExtensionService.ts

@@ -10,6 +10,9 @@ import { endsWith, startsWith } from 'vs/base/common/strings';

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

import { joinPath } from 'vs/base/common/resources';

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

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

+import { fromTar } from 'vs/server/node_modules/@coder/requirefs/out/requirefs';

+import { Client } from 'vs/server/node_modules/@coder/node-browser/out/client/client';

class ExportsTrap {

@@ -105,7 +108,44 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {

await this._fakeModules.install();

}

- protected _loadCommonJSModule<T>(module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {

+ protected async _loadCommonJSModule<T>(module: URI | IExtensionDescription, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T> {

+ if (!URI.isUri(module) && module.extensionKind !== 'web') {

+ const fetchUri = URI.from({

+ scheme: self.location.protocol.replace(':', ''),

+ authority: self.location.host,

+ path: `${self.location.pathname.replace(/\/static.*\/out\/vs\/workbench\/services\/extensions\/worker\/extensionHostWorkerMain.js$/, '')}/tar`,

+ query: `path=${encodeURIComponent(module.extensionLocation.path)}`,

+ });

+ const response = await fetch(fetchUri.toString(true));

+ if (response.status !== 200) {

+ throw new Error(`Failed to download extension '${module.extensionLocation.path}'`);

+ }

+ const client = new Client(this._nodeProxy, { logger: this._logService });

+ const init = await client.handshake();

+ const buffer = new Uint8Array(await response.arrayBuffer());

+ const rfs = fromTar(buffer);

+ (<any>self).global = self;

+ rfs.provide('vscode', this._fakeModules.getModule('vscode', module.extensionLocation));

+ Object.keys(client.modules).forEach((key) => {

+ const mod = (client.modules as any)[key];

+ if (key === 'process') {

+ (<any>self).process = mod;

+ (<any>self).process.env = init.env;

+ return;

+ }

+

+ rfs.provide(key, mod);

+ switch (key) {

+ case 'buffer':

+ (<any>self).Buffer = mod.Buffer;

+ break;

+ case 'timers':

+ (<any>self).setImmediate = mod.setImmediate;

+ break;

+ }

+ });

+ return rfs.require('.');

+ }

(<any>self).window = self; // <- that's improper but might help extensions that aren't authored correctly

@@ -132,6 +172,9 @@ export class ExtHostExtensionService extends AbstractExtHostExtensionService {

return trap.claim();

};

+ if (!URI.isUri(module)) {

+ module = joinPath(module.extensionLocation, module.main!);

+ }

try {

activationTimesBuilder.codeLoadingStart();

diff --git a/src/vs/workbench/browser/dnd.ts b/src/vs/workbench/browser/dnd.ts

index b99f800164..bf44f1d9c4 100644

--- a/src/vs/workbench/browser/dnd.ts

+++ b/src/vs/workbench/browser/dnd.ts

@@ -32,6 +32,7 @@ import { IRecentFile } from 'vs/platform/history/common/history';

import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';

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

import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';

+import { IUploadService } from 'vs/server/src/browser/upload';

export interface IDraggedResource {

resource: URI;

@@ -166,14 +167,15 @@ export class ResourcesDropHandler {

@IUntitledEditorService private readonly untitledEditorService: IUntitledEditorService,

@IEditorService private readonly editorService: IEditorService,

@IConfigurationService private readonly configurationService: IConfigurationService,

- @IWorkspaceEditingService private readonly workspaceEditingService: IWorkspaceEditingService

+ @IWorkspaceEditingService private readonly workspaceEditingService: IWorkspaceEditingService,

+ @IUploadService private readonly uploadService: IUploadService,

) {

}

async handleDrop(event: DragEvent, resolveTargetGroup: () => IEditorGroup | undefined, afterDrop: (targetGroup: IEditorGroup | undefined) => void, targetIndex?: number): Promise<void> {

const untitledOrFileResources = extractResources(event).filter(r => this.fileService.canHandleResource(r.resource) || r.resource.scheme === Schemas.untitled);

if (!untitledOrFileResources.length) {

- return;

+ return this.uploadService.handleDrop(event, resolveTargetGroup, afterDrop, targetIndex);

}

// Make the window active to handle the drop properly within

diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts

index 2e1e63986f..563c4b2472 100644

--- a/src/vs/workbench/browser/layout.ts

+++ b/src/vs/workbench/browser/layout.ts

@@ -260,7 +260,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi

if (visible !== this.state.menuBar.toggled) {

this.state.menuBar.toggled = visible;

- if (this.state.fullscreen && (this.state.menuBar.visibility === 'toggle' || this.state.menuBar.visibility === 'default')) {

+ if (this.state.menuBar.visibility === 'toggle' || (this.state.fullscreen && this.state.menuBar.visibility === 'default')) {

this._onTitleBarVisibilityChange.fire();

if (this.workbenchGrid instanceof SerializableGrid) {

@@ -563,13 +563,13 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi

case Parts.TITLEBAR_PART:

if (getTitleBarStyle(this.configurationService, this.environmentService) === 'native') {

return false;

- } else if (!this.state.fullscreen) {

- return true;

+ } else if (this.state.menuBar.visibility === 'default') {

+ return !this.state.fullscreen || this.state.menuBar.toggled;

} else if (isMacintosh && isNative) {

return false;

} else if (this.state.menuBar.visibility === 'visible') {

return true;

- } else if (this.state.menuBar.visibility === 'toggle' || this.state.menuBar.visibility === 'default') {

+ } else if (this.state.menuBar.visibility === 'toggle') {

return this.state.menuBar.toggled;

}

diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts

index f5944ce974..66bedce55c 100644

--- a/src/vs/workbench/browser/web.main.ts

+++ b/src/vs/workbench/browser/web.main.ts

@@ -45,6 +45,7 @@ import { FileLogService } from 'vs/platform/log/common/fileLogService';

import { toLocalISOString } from 'vs/base/common/date';

import { IndexedDBLogProvider } from 'vs/workbench/services/log/browser/indexedDBLogProvider';

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

+import { initialize } from 'vs/server/src/browser/client';

class CodeRendererMain extends Disposable {

@@ -94,6 +95,7 @@ class CodeRendererMain extends Disposable {

// Startup

workbench.startup();

+ await initialize(services.serviceCollection);

}

private restoreBaseTheme(): void {

@@ -204,6 +206,7 @@ class CodeRendererMain extends Disposable {

const channel = connection.getChannel<IChannel>(REMOTE_FILE_SYSTEM_CHANNEL_NAME);

const remoteFileSystemProvider = this._register(new RemoteExtensionsFileSystemProvider(channel, remoteAgentService.getEnvironment()));

fileService.registerProvider(Schemas.vscodeRemote, remoteFileSystemProvider);

+ fileService.registerProvider(Schemas.file, remoteFileSystemProvider);

if (!this.configuration.userDataProvider) {

const remoteUserDataUri = this.getRemoteUserDataUri();

diff --git a/src/vs/workbench/browser/web.simpleservices.ts b/src/vs/workbench/browser/web.simpleservices.ts

index 895a8a0393..e9fa627fba 100644

--- a/src/vs/workbench/browser/web.simpleservices.ts

+++ b/src/vs/workbench/browser/web.simpleservices.ts

@@ -33,6 +33,7 @@ import { localize } from 'vs/nls';

import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';

// tslint:disable-next-line: import-patterns

import { IWorkspaceStatsService, Tags } from 'vs/workbench/contrib/stats/common/workspaceStats';

+import { withQuery } from 'vs/server/src/browser/client';

//#region Update

@@ -64,7 +65,7 @@ export class SimpleUpdateService implements IUpdateService {

}

}

-registerSingleton(IUpdateService, SimpleUpdateService);

+// registerSingleton(IUpdateService, SimpleUpdateService);

//#endregion

@@ -285,7 +286,10 @@ export class SimpleWindowService extends Disposable implements IWindowService {

for (let i = 0; i < _uris.length; i++) {

const uri = _uris[i];

if ('folderUri' in uri) {

- const newAddress = `${document.location.origin}/?folder=${uri.folderUri.path}`;

+ const newAddress = withQuery(window.location.toString(), {

+ folder: uri.folderUri.path,

+ workspace: undefined,

+ });

if (openFolderInNewWindow) {

window.open(newAddress);

} else {

@@ -293,7 +297,10 @@ export class SimpleWindowService extends Disposable implements IWindowService {

}

}

if ('workspaceUri' in uri) {

- const newAddress = `${document.location.origin}/?workspace=${uri.workspaceUri.path}`;

+ const newAddress = withQuery(window.location.toString(), {

+ folder: undefined,

+ workspace: uri.workspaceUri.path,

+ });

if (openFolderInNewWindow) {

window.open(newAddress);

} else {

diff --git a/src/vs/workbench/buildfile.web.js b/src/vs/workbench/buildfile.web.js

index 47a8453302..4a7a8c7775 100644

--- a/src/vs/workbench/buildfile.web.js

+++ b/src/vs/workbench/buildfile.web.js

@@ -20,5 +20,8 @@ function createModuleDescription(name, exclude) {

exports.collectModules = function () {

return [

createModuleDescription('vs/workbench/contrib/output/common/outputLinkComputer', ['vs/base/common/worker/simpleWorker', 'vs/editor/common/services/editorSimpleWorker']),

+ createModuleDescription('vs/platform/files/node/watcher/unix/watcherApp', []),

+ createModuleDescription('vs/platform/files/node/watcher/nsfw/watcherApp', []),

+ createModuleDescription('vs/workbench/services/extensions/node/extensionHostProcess', []),

];

};

diff --git a/src/vs/workbench/contrib/files/browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts

index 19fcd5b0ac..30df54ac1a 100644

--- a/src/vs/workbench/contrib/files/browser/files.contribution.ts

+++ b/src/vs/workbench/contrib/files/browser/files.contribution.ts

@@ -224,7 +224,7 @@ configurationRegistry.registerConfiguration({

'files.exclude': {

'type': 'object',

'markdownDescription': nls.localize('exclude', "Configure glob patterns for excluding files and folders. For example, the files explorer decides which files and folders to show or hide based on this setting. Read more about glob patterns [here](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options)."),

- 'default': { '**/.git': true, '**/.svn': true, '**/.hg': true, '**/CVS': true, '**/.DS_Store': true },

+ 'default': { '**/.git': true, '**/.svn': true, '**/.hg': true, '**/CVS': true, '**/.DS_Store': true, '**/.code-server-partial-upload-*': true },

'scope': ConfigurationScope.RESOURCE,

'additionalProperties': {

'anyOf': [

diff --git a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts

index 0c368120df..6396d2316b 100644

--- a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts

+++ b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts

@@ -47,6 +47,7 @@ import { IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/work

import { findValidPasteFileTarget } from 'vs/workbench/contrib/files/browser/fileActions';

import { FuzzyScore, createMatches } from 'vs/base/common/filters';

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

+import { IUploadService } from 'vs/server/src/browser/upload';

export class ExplorerDelegate implements IListVirtualDelegate<ExplorerItem> {

@@ -450,7 +451,8 @@ export class FileDragAndDrop implements ITreeDragAndDrop<ExplorerItem> {

@IInstantiationService private instantiationService: IInstantiationService,

@ITextFileService private textFileService: ITextFileService,

@IWindowService private windowService: IWindowService,

- @IWorkspaceEditingService private workspaceEditingService: IWorkspaceEditingService

+ @IWorkspaceEditingService private workspaceEditingService: IWorkspaceEditingService,

+ @IUploadService private readonly uploadService: IUploadService,

) {

this.toDispose = [];

@@ -612,6 +614,7 @@ export class FileDragAndDrop implements ITreeDragAndDrop<ExplorerItem> {

private async handleExternalDrop(data: DesktopDragAndDropData, target: ExplorerItem, originalEvent: DragEvent): Promise<void> {

+ return this.uploadService.handleExternalDrop(data, target, originalEvent);

const droppedResources = extractResources(originalEvent, true);

// Check for dropped external files to be folders

const result = await this.fileService.resolveAll(droppedResources);

diff --git a/src/vs/workbench/contrib/remote/common/remote.contribution.ts b/src/vs/workbench/contrib/remote/common/remote.contribution.ts

index 404f5a2a78..a04c825fa2 100644

--- a/src/vs/workbench/contrib/remote/common/remote.contribution.ts

+++ b/src/vs/workbench/contrib/remote/common/remote.contribution.ts

@@ -79,7 +79,8 @@ class RemoteChannelsContribution extends Disposable implements IWorkbenchContrib

const connection = remoteAgentService.getConnection();

if (connection) {

const logLevelClient = new LogLevelSetterChannelClient(connection.getChannel('loglevel'));

- logLevelClient.setLevel(logService.getLevel());

+ logLevelClient.getLevel().then((level) => logService.setLevel(level));

+ logLevelClient.onDidChangeLogLevel((level) => logService.setLevel(level));

this._register(logService.onDidChangeLogLevel(level => logLevelClient.setLevel(level)));

}

}

diff --git a/src/vs/workbench/contrib/resources/browser/resourceServiceWorker.ts b/src/vs/workbench/contrib/resources/browser/resourceServiceWorker.ts

index 3534ef147d..773f711863 100644

--- a/src/vs/workbench/contrib/resources/browser/resourceServiceWorker.ts

+++ b/src/vs/workbench/contrib/resources/browser/resourceServiceWorker.ts