提交 eb772d85 编写于 作者: A Alex Dima

Fixes #7474: Prevent cancelation of worker proxy object promise

上级 ff9bf527
...@@ -8,6 +8,7 @@ import {transformErrorForSerialization} from 'vs/base/common/errors'; ...@@ -8,6 +8,7 @@ import {transformErrorForSerialization} from 'vs/base/common/errors';
import {Disposable} from 'vs/base/common/lifecycle'; import {Disposable} from 'vs/base/common/lifecycle';
import {ErrorCallback, TPromise, ValueCallback} from 'vs/base/common/winjs.base'; import {ErrorCallback, TPromise, ValueCallback} from 'vs/base/common/winjs.base';
import {IWorker, IWorkerFactory} from './workerClient'; import {IWorker, IWorkerFactory} from './workerClient';
import {ShallowCancelThenPromise} from 'vs/base/common/async';
const INITIALIZE = '$initialize'; const INITIALIZE = '$initialize';
...@@ -229,7 +230,8 @@ export class SimpleWorkerClient<T> extends Disposable { ...@@ -229,7 +230,8 @@ export class SimpleWorkerClient<T> extends Disposable {
} }
public getProxyObject(): TPromise<T> { public getProxyObject(): TPromise<T> {
return this._lazyProxy; // Do not allow chaining promises to cancel the proxy creation
return new ShallowCancelThenPromise(this._lazyProxy);
} }
public getLastRequestTimestamp(): number { public getLastRequestTimestamp(): number {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册