Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #54295, fix #54369

Browse Source
This commit is contained in:
Benjamin Pasero
2018-07-16 07:57:39 +02:00
parent 6babef9410
commit db39621bf8
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/vs/workbench/api/node/extHostProgress.ts
View File

@@ -11,7 +11,6 @@ import { IExtensionDescription } from 'vs/workbench/services/extensions/common/e
import { Progress } from 'vs/platform/progress/common/progress';
import { localize } from 'vs/nls';
import { CancellationTokenSource, CancellationToken } from 'vs/base/common/cancellation';
import { debounce } from 'vs/base/common/decorators';
import { IProgressStep } from 'vs/workbench/services/progress/common/progress';
export class ExtHostProgress implements ExtHostProgressShape {
@@ -69,22 +68,37 @@ export class ExtHostProgress implements ExtHostProgressShape {
}
}
function mergeProgress(result: IProgressStep, currentValue: IProgressStep): IProgressStep {
result.message = currentValue.message;
if (typeof currentValue.increment === 'number') {
result.increment = currentValue.increment;
}
return result;
}
class ProgressCallback extends Progress<IProgressStep> {
private throttledProgressStep: IProgressStep;
constructor(private _proxy: MainThreadProgressShape, private _handle: number) {
super(p => this.throttledReport(p));
}
@debounce(100, (result: IProgressStep, currentValue: IProgressStep) => mergeProgress(result, currentValue), () => Object.create(null))
throttledReport(p: IProgressStep): void {
this._proxy.$progressReport(this._handle, p);
private throttledReport(p: IProgressStep): void {
// Throttle progress over the duration of 100ms
if (!this.throttledProgressStep) {
this.throttledProgressStep = p;
setTimeout(() => {
this._proxy.$progressReport(this._handle, this.throttledProgressStep);
this.throttledProgressStep = void 0;
}, 100);
}
// If throttled, merge the progress step into the existing one
else {
this.throttledProgressStep.message = p.message;
if (typeof p.increment === 'number') {
if (typeof this.throttledProgressStep.increment === 'number') {
this.throttledProgressStep.increment += p.increment;
} else {
this.throttledProgressStep.increment = p.increment;
}
}
}
}
}
}