maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into electron-16.x.y

Browse source
This commit is contained in:
deepak1556 2021-11-22 18:56:53 +09:00
parent 9aed22ce2d 6b07ef8a34
commit 7ada167103
3 changed files with 17 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/vs/base/parts/ipc/common/ipc.net.ts
View file

@ -7,7 +7,6 @@ import { VSBuffer } from 'vs/base/common/buffer';
import { Emitter, Event } from 'vs/base/common/event';
import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
import * as platform from 'vs/base/common/platform';
import * as process from 'vs/base/common/process';
import { IIPCLogger, IMessagePassingProtocol, IPCClient } from 'vs/base/parts/ipc/common/ipc';
export const enum SocketCloseEventType {
@ -484,7 +483,7 @@ export class BufferedEmitter<T> {
// it is important to deliver these messages after this call, but before
// other messages have a chance to be received (to guarantee in order delivery)
// that's why we're using here nextTick and not other types of timeouts
process.nextTick(() => this._deliverMessages());
queueMicrotask(() => this._deliverMessages());
},
onLastListenerRemove: () => {
this._hasListeners = false;

39
src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts
View file

@ -92,30 +92,23 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost
}
const forceHTTPS = (location.protocol === 'https:');
const webEndpointUrlTemplate = this._productService.webEndpointUrlTemplate;
const commit = this._productService.commit;
const quality = this._productService.quality;
if (webEndpointUrlTemplate && commit && quality) {
const baseUrl = (
webEndpointUrlTemplate
.replace('{{uuid}}', generateUuid())
.replace('{{commit}}', commit)
.replace('{{quality}}', quality)
);
const base = (
forceHTTPS
? `${baseUrl}/out/vs/workbench/services/extensions/worker/httpsWebWorkerExtensionHostIframe.html`
: `${baseUrl}/out/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html`
);
let uniqueWebWorkerExtensionHostOrigin = true;
if (this._environmentService.options && typeof this._environmentService.options.__uniqueWebWorkerExtensionHostOrigin !== 'undefined') {
uniqueWebWorkerExtensionHostOrigin = this._environmentService.options.__uniqueWebWorkerExtensionHostOrigin;
}
if (uniqueWebWorkerExtensionHostOrigin) {
const webEndpointUrlTemplate = this._productService.webEndpointUrlTemplate;
const commit = this._productService.commit;
const quality = this._productService.quality;
if (webEndpointUrlTemplate && commit && quality) {
const baseUrl = (
webEndpointUrlTemplate
.replace('{{uuid}}', generateUuid())
.replace('{{commit}}', commit)
.replace('{{quality}}', quality)
);
const base = (
forceHTTPS
? `${baseUrl}/out/vs/workbench/services/extensions/worker/httpsWebWorkerExtensionHostIframe.html`
: `${baseUrl}/out/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html`
);
return base + suffix;
}
return base + suffix;
}
if (this._productService.webEndpointUrl) {

7
src/vs/workbench/workbench.web.api.ts
View file

@ -364,13 +364,6 @@ interface IWorkbenchConstructionOptions {
*/
readonly webWorkerExtensionHostIframeSrc?: string;
/**
* [TEMPORARY]: This will be removed soon.
* Use an unique origin for the web worker extension host.
* Defaults to true.
*/
readonly __uniqueWebWorkerExtensionHostOrigin?: boolean;
/**
* A factory for web sockets.
*/